Merge lp:~zorba-coders/zorba/bug-1188061 into lp:zorba/stack-module

[Luis Rodriguez Gonzalez]

Update to 3.0 module guidelines; make JSON-ready.

[Chris Hillery (ceejatec)]

Looks pretty good so far! A couple questions for Matthias since he wrote the style guide:

1. Is this the correct way to use <p> for splitting doc paragraphs - wrapping them in <p>...</p> ? Or should there be single <p /> elements between paragraphs?

2. Is this the correct way to refer to error codes? I think there's supposed to be an actual module constant for each code, right? And then @error should list the constant?

review: Needs Information

[Chris Hillery (ceejatec)]

Also, Luis: Have you done any investigation to ensure that the documentation is reasonable? In particular is the header comment clear, clean, and possibly have an example or two?

And, can you verify that all reasonably-possible error conditions are documented? At least, are there any other XQuery error codes thrown by the module functions (or from the module C++ code, if any)?

[Luis Rodriguez Gonzalez (kuraru)]

The documentation has several mentions to tests that are included but no
textual representations are made, Should I move some of the examples to the
code instead of sending the user to check the tests?
Aside from that the documentation seems to be pretty straight forward and
all the errors that I can think for each case seems to be covered.

Thanks,
Luis.

2013/6/14 Chris Hillery <email address hidden>

> Also, Luis: Have you done any investigation to ensure that the
> documentation is reasonable? In particular is the header comment clear,
> clean, and possibly have an example or two?
>
> And, can you verify that all reasonably-possible error conditions are
> documented? At least, are there any other XQuery error codes thrown by the
> module functions (or from the module C++ code, if any)?
> --
> https://code.launchpad.net/~zorba-coders/zorba/bug-1188061/+merge/169553
> You proposed lp:~zorba-coders/zorba/bug-1188061 for merging.
>

--

"The significant problems we face cannot be solved by the same level of
thinking that created them." -- Albert Einstein

[lp:~zorba-coders/zorba/bug-1188061]

14. By Luis Rodriguez Gonzalez on 2013-06-17

Header fixed

[Chris Hillery (ceejatec)]

> The documentation has several mentions to tests that are included but no
> textual representations are made, Should I move some of the examples to the
> code instead of sending the user to check the tests?

No, the @example tags are better. The examples will be included in the documentation when the website is generated, but by having them under the test/ directory they're actually executed as part of the RQ, so we know they actually work.

[Chris Hillery (ceejatec)]

Luis - thanks for getting to this module so quickly. Based on this you've raised some coding-guideline issues, such as the use of <p/> and error codes. After discussion with Matthias, I've proposed some clarifications to the coding guidelines document on the Wiki; please take a look and update this proposal accordingly. Thanks!

[Chris Hillery (ceejatec)]

After that, I'm afraid we've got some more substantive changes to be made to JSON-ify this module. I'll update the bug with details. If you'd like, we could merge this first pass (after you've addressed the coding guidelines issues) and then have a separate proposal for the JSONiq updates; otherwise you can continue working on this branch.

[Chris Hillery (ceejatec)]

review: Needs Fixing

[lp:~zorba-coders/zorba/bug-1188061]

15. By Luis Rodriguez Gonzalez on 2013-06-21

Added the ability to manage JSON structures and added a JSON test case

16. By Luis Rodriguez Gonzalez on 2013-07-05

Fixed documentation and code issues. Also added several new testcases

[Luis Rodriguez Gonzalez (kuraru)]

> After that, I'm afraid we've got some more substantive changes to be made to
> JSON-ify this module. I'll update the bug with details. If you'd like, we
> could merge this first pass (after you've addressed the coding guidelines
> issues) and then have a separate proposal for the JSONiq updates; otherwise
> you can continue working on this branch.

I worked in the changes, please check it, also added some testcases for the new behavior.

[lp:~zorba-coders/zorba/bug-1188061]

17. By Luis Rodriguez Gonzalez on 2013-07-05

Forgot to add the new testcases

18. By Luis Rodriguez Gonzalez on 2013-07-05

Added another testcase to test mixed content (JSON and XML)

19. By Luis Rodriguez Gonzalez on 2013-07-05

Removing backup files added by mistake

[Chris Hillery (ceejatec)]

Basically the same comments as the queue proposal:

1. Make the error QName variables %private;
2. Fix or eliminate the XQDoc for the error QNames;
3. Replace "node" with "item" in function XQDoc.

In addition:

4. You have a stray <p> at the beginning of the header XQDoc comment (diff line 21).

5. You have </p> in at least 8 places, instead of <p/>.

review: Needs Fixing

[lp:~zorba-coders/zorba/bug-1188061]

20. By Luis Rodriguez Gonzalez on 2013-07-10

Constants declared as private. Removed <p> and changed </p> for <p/>. Removed comments for private variables.

21. By Luis Rodriguez Gonzalez on 2013-07-10

All references to nodes were changed to items.

22. By Chris Hillery on 2013-07-17

Updated header comment.

[Chris Hillery (ceejatec)]

review: Approve

[Luis Rodriguez Gonzalez (kuraru)]

review: Approve

[Juan Zacarias (juan457)]

review: Approve

[lp:~zorba-coders/zorba/bug-1188061]

23. By Chris Hillery on 2013-07-17

Updating expected results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-02-29 08:49:50 +0000
+++ src/CMakeLists.txt	2013-07-17 01:17:24 +0000
@@ -15,6 +15,6 @@
 
 ##### Stack data structure
 
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/store/data-structures/stack" VERSION 1.0 FILE "stack.xq")
+DECLARE_ZORBA_MODULE (URI "http://zorba.io/modules/stack" VERSION 1.0 FILE "stack.xq")
 
 ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
 
=== modified file 'src/stack.xq'
--- src/stack.xq	2013-06-15 19:49:12 +0000
+++ src/stack.xq	2013-07-17 01:17:24 +0000
@@ -17,12 +17,15 @@
 :)
 
 (:~
- : Implementation of stack for node items, using dynamic collections.<br />
+ : Implementation of stack for items, using dynamic collections.<p/>
+ :
+ : Entries in the stack must be structured items - that is, either JSON
+ : Objects or Arrays, or XML Nodes. <p/>
  :
  : @author Daniel Turcanu, Sorin Nasoi
  : @project Zorba/Data Store/Data Structures/Stack
  :)
-module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";
+module namespace stack = "http://zorba.io/modules/stack";
 
 import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
 import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";
@@ -31,119 +34,117 @@
 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
 declare option ver:module-version "1.0";
 
-(:~
- : Errors namespace URI.
-:)
-declare variable $stack:errNS as xs:string := "http://www.zorba-xquery.com/modules/store/data-structures/stack";
+declare %private variable $stack:errNS as xs:string := "http://zorba.io/modules/stack";
  
-(:~
- : xs:QName with namespace URI="http://www.zorba-xquery.com/modules/store/data-structures/stack" and local name "errNA"
-:)
-declare variable $stack:errNA as xs:QName := fn:QName($stack:errNS, "stack:errNA");
-
-(:~
- : xs:QName with namespace URI="http://www.zorba-xquery.com/modules/store/data-structures/stack" and local name "errExists"
-:)
-declare variable $stack:errExists as xs:QName := fn:QName($stack:errNS, "stack:errExists");
-
-(:~
- : Create a stack with this name. <br /> If stack exists, an error is raised.
- : @param $name name of the new stack.
- : @return ()
- : @error stack:errExists if the stack identified by $name already exists.
+declare %private variable $stack:NOT-EXISTS as xs:QName := fn:QName($stack:errNS, "stack:NOT-EXISTS");
+
+declare %private variable $stack:EXISTS as xs:QName := fn:QName($stack:errNS, "stack:EXISTS");
+
+(:~
+ : Create a stack with this name. If stack exists, an error is raised. <p/>
+ :
+ : @param  $name name of the new stack.
+ : @return an empty sequence.
+ : @error  stack:EXISTS if the stack identified by $name already exists.
  :)
 declare %ann:sequential function stack:create($name as xs:QName) as empty-sequence()
 {
   if(collections-ddl:is-available-collection($name)) then
-    fn:error($stack:errExists, "Stack already exists.");
+    fn:error($stack:EXISTS, "Stack already exists.");
   else
     collections-ddl:create($name);
 };
 
 (:~
- : Return the top node in the stack, without removing it.
- : @param $name name of the stack.
- : @return the top node, or empty sequence if stack is empty.
+ : Return the top item in the stack, without removing it. <p/>
+ :
+ : @param   $name name of the stack.
+ : @return  the top item, or empty sequence if stack is empty.
  : @example test/Queries/top1.xq
- : @error stack:errNA if the stack identified by $name does not exist.
+ : @error   stack:NOT-EXISTS if the stack identified by $name does not exist.
  :)
-declare function stack:top($name as xs:QName) as node()?
+declare function stack:top($name as xs:QName) as structured-item()?
 {
   if(not(collections-ddl:is-available-collection($name))) then
-    fn:error($stack:errNA, "Stack does not exist.")
+    fn:error($stack:NOT-EXISTS, "Stack does not exist.")
   else
     collections-dml:collection($name)[1]
 };
 
 (:~
- : Return the top node in the stack, and remove it.
- : @param $name name of the stack.
- : @return the top node, or empty sequence if stack is empty.
+ : Return the top item in the stack, and remove it. <p/>
+ :
+ : @param   $name name of the stack.
+ : @return  the top item, or empty sequence if stack is empty.
  : @example test/Queries/pop2.xq
- : @error stack:errNA if the stack identified by $name does not exist.
+ : @error   stack:NOT-EXISTS if the stack identified by $name does not exist.
  :)
-declare %ann:sequential function stack:pop($name as xs:QName) as node()?
+declare %ann:sequential function stack:pop($name as xs:QName) as structured-item()?
 {
   if(not(collections-ddl:is-available-collection($name))) then
-    fn:error($stack:errNA, "Stack does not exist.")
+    fn:error($stack:NOT-EXISTS, "Stack does not exist.")
   else
   {
-    variable $topNode := collections-dml:collection($name)[1];
-    collections-dml:delete-node-first($name);
-    $topNode
+    variable $topItem := collections-dml:collection($name)[1];
+    collections-dml:delete-first($name);
+    $topItem
   }
 };
 
 (:~
- : Add a new node to the stack; the stack will contain a copy of the given node.
- : @param $name name of the stack.
- : @param $value the node to be added.
- : @return ()
+ : Add a new item to the stack; the stack will contain a copy of the given item. <p/>
+ :
+ : @param   $name name of the stack.
+ : @param   $value the item to be added.
+ : @return  an empty sequence.
  : @example test/Queries/push1.xq
- : @error stack:errNA if the stack identified by $name does not exist.
+ : @error   stack:NOT-EXISTS if the stack identified by $name does not exist.
  :)
-declare %ann:sequential function stack:push($name as xs:QName, $value as node()) as empty-sequence()
+declare %ann:sequential function stack:push($name as xs:QName, $value as structured-item()) as empty-sequence()
 {
-  collections-dml:apply-insert-nodes-first($name, $value);
+  collections-dml:apply-insert-first($name, $value);
 };
 
 (:~
- : Checks if a stack exists and is empty.
- : @param $name name of the stack.
- : @return true is the stack is empty or does not exist.
+ : Checks if a stack exists and is empty. <p/>
+ :
+ : @param   $name name of the stack.
+ : @return  true if the stack is empty or does not exist.
  : @example test/Queries/empty1.xq
- : @error stack:errNA if the stack identified by $name does not exist.
+ : @error   stack:NOT-EXISTS if the stack identified by $name does not exist.
  :)
 declare function stack:empty($name as xs:QName) as xs:boolean
 {
   if(not(collections-ddl:is-available-collection($name))) then
-    fn:error($stack:errNA, "Stack does not exist.")
+    fn:error($stack:NOT-EXISTS, "Stack does not exist.")
   else
     fn:empty(collections-dml:collection($name))
 };
 
 (:~
- : Count of nodes in the stack.
- : @param $name name of the stack.
- : @return the count of nodes.
+ : Count of items in the stack. <p/>
+ :
+ : @param   $name name of the stack.
+ : @return  the amount of items.
  : @example test/Queries/size1.xq
- : @error stack:errNA if the stack identified by $name does not exist.
+ : @error   stack:NOT-EXISTS if the stack identified by $name does not exist.
  :)
 declare function stack:size($name as xs:QName) as xs:integer
 {
   if(not(collections-ddl:is-available-collection($name))) then
-    fn:error($stack:errNA, "Stack does not exist.")
+    fn:error($stack:NOT-EXISTS, "Stack does not exist.")
   else
     fn:count(collections-dml:collection($name))
 };
 
 (:~
- : Copy all nodes from source stack to a destination stack.<br />
- : If destination stack does not exist, it is created first.<br />
- : If destination stack is not empty, the nodes are appended on top.
- : @param $destName name of the destination stack.
- : @param $sourceName name of the source stack.
- : @return ()
+ : Copy all items from source stack to a destination stack. <p/>
+ : If destination stack does not exist, it is created first. <p/>
+ : If destination stack is not empty, the items are appended on top. <p/>
+ :
+ : @param   $destName name of the destination stack.
+ : @param   $sourceName name of the source stack.
+ : @return  an empty sequence.
  : @example test/Queries/copy1.xq
  :)
 declare %ann:sequential function stack:copy($destName as xs:QName, $sourceName as xs:QName) as empty-sequence()
@@ -152,5 +153,5 @@
     collections-ddl:create($destName);
   else
     ();
-  collections-dml:insert-nodes-first($destName, collections-dml:collection($sourceName));
+  collections-dml:insert-first($destName, collections-dml:collection($sourceName));
 };
 
=== added file 'test/ExpQueryResults/copy-json1.xml.res'
--- test/ExpQueryResults/copy-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/copy-json1.xml.res	2013-07-17 01:17:24 +0000
@@ -0,0 +1,1 @@
+{ "c" : null }{ "c" : null }
 \ No newline at end of file
 
=== added file 'test/ExpQueryResults/copy-mix.xml.res'
--- test/ExpQueryResults/copy-mix.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/copy-mix.xml.res	2013-07-17 01:17:24 +0000
@@ -0,0 +1,1 @@
+{ "c" : null }{ "c" : null }
 \ No newline at end of file
 
=== added file 'test/ExpQueryResults/create-json1.xml.res'
--- test/ExpQueryResults/create-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/create-json1.xml.res	2013-07-17 01:17:24 +0000
@@ -0,0 +1,1 @@
+{ "a" : 1 }
 \ No newline at end of file
 
=== added file 'test/ExpQueryResults/empty-json1.xml.res'
--- test/ExpQueryResults/empty-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/empty-json1.xml.res	2013-07-17 01:17:24 +0000
@@ -0,0 +1,1 @@
+{ "a" : 0 }false{ "a" : 0 }true
 \ No newline at end of file
 
=== added file 'test/ExpQueryResults/pop-json2.xml.res'
--- test/ExpQueryResults/pop-json2.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/pop-json2.xml.res	2013-07-17 01:17:24 +0000
@@ -0,0 +1,1 @@
+{ "a" : 0 }
 \ No newline at end of file
 
=== added file 'test/ExpQueryResults/push-json1.xml.res'
--- test/ExpQueryResults/push-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/push-json1.xml.res	2013-07-17 01:17:24 +0000
@@ -0,0 +1,1 @@
+{ "a" : 1 }
 \ No newline at end of file
 
=== added file 'test/ExpQueryResults/size-json1.xml.res'
--- test/ExpQueryResults/size-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/size-json1.xml.res	2013-07-17 01:17:24 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+0{ "phi" : 1.6180339 }1{ "phi" : 1.6180339 }0
 \ No newline at end of file
 
=== added file 'test/ExpQueryResults/top-json1.xml.res'
--- test/ExpQueryResults/top-json1.xml.res	1970-01-01 00:00:00 +0000
+++ test/ExpQueryResults/top-json1.xml.res	2013-07-17 01:17:24 +0000
@@ -0,0 +1,1 @@
+{ "a" : null }{ "a" : null }{ "z" : 9.999 }
 \ No newline at end of file
 
=== added file 'test/Queries/copy-json1.xq'
--- test/Queries/copy-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/copy-json1.xq	2013-07-17 01:17:24 +0000
@@ -0,0 +1,11 @@
+import module namespace stack = "http://zorba.io/modules/stack";
+
+variable $stName := fn:QName("", "stack1");
+variable $stCopy := fn:QName("", "stackcopy");
+stack:create($stName);
+stack:push($stName, { "a" : 1 });
+stack:push($stName, { "b" : 2.1 });
+stack:push($stName, { "c" : jn:null() });
+stack:copy($stCopy, $stName);
+(stack:top($stName),
+stack:top($stCopy))
 
=== added file 'test/Queries/copy-mix.xq'
--- test/Queries/copy-mix.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/copy-mix.xq	2013-07-17 01:17:24 +0000
@@ -0,0 +1,11 @@
+import module namespace stack = "http://zorba.io/modules/stack";
+
+variable $stName := fn:QName("", "stack1");
+variable $stCopy := fn:QName("", "stackcopy");
+stack:create($stName);
+stack:push($stName, { "a" : 1 });
+stack:push($stName, <b/>);
+stack:push($stName, { "c" : jn:null() });
+stack:copy($stCopy, $stName);
+(stack:top($stName),
+stack:top($stCopy))
 
=== modified file 'test/Queries/copy1.xq'
--- test/Queries/copy1.xq	2012-02-29 08:49:50 +0000
+++ test/Queries/copy1.xq	2013-07-17 01:17:24 +0000
@@ -1,4 +1,4 @@
-import module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";
+import module namespace stack = "http://zorba.io/modules/stack";
 
 variable $stName := fn:QName("", "stack1");
 variable $stCopy := fn:QName("", "stackcopy");
 
=== added file 'test/Queries/create-json1.xq'
--- test/Queries/create-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/create-json1.xq	2013-07-17 01:17:24 +0000
@@ -0,0 +1,9 @@
+import module namespace stack = "http://zorba.io/modules/stack";
+
+variable $stName := fn:QName("", "stack1");
+(
+  stack:create($stName),
+  stack:push($stName, { "z" : 27 }),
+  stack:push($stName, { "a" : 1 }),
+  stack:top($stName)
+)
 
=== modified file 'test/Queries/create1.xq'
--- test/Queries/create1.xq	2012-03-23 07:56:19 +0000
+++ test/Queries/create1.xq	2013-07-17 01:17:24 +0000
@@ -1,4 +1,4 @@
-import module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";
+import module namespace stack = "http://zorba.io/modules/stack";
 
 variable $stName := fn:QName("", "stack1");
 (
 
=== added file 'test/Queries/empty-json1.xq'
--- test/Queries/empty-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/empty-json1.xq	2013-07-17 01:17:24 +0000
@@ -0,0 +1,12 @@
+import module namespace stack = "http://zorba.io/modules/stack";
+
+variable $stName := fn:QName("", "stack1");
+(
+  stack:create($stName),
+  stack:push($stName, { "a" : 0 }),
+  stack:top($stName),
+  stack:empty($stName),
+  stack:pop($stName),
+  stack:top($stName),
+  stack:empty($stName)
+)
 
=== modified file 'test/Queries/empty1.xq'
--- test/Queries/empty1.xq	2012-03-23 07:56:19 +0000
+++ test/Queries/empty1.xq	2013-07-17 01:17:24 +0000
@@ -1,4 +1,4 @@
-import module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";
+import module namespace stack = "http://zorba.io/modules/stack";
 
 variable $stName := fn:QName("", "stack1");
 (
 
=== added file 'test/Queries/pop-json2.xq'
--- test/Queries/pop-json2.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/pop-json2.xq	2013-07-17 01:17:24 +0000
@@ -0,0 +1,7 @@
+import module namespace stack = "http://zorba.io/modules/stack";
+
+variable $stName := fn:QName("", "stack1");
+stack:create($stName);
+stack:push($stName, { "b" : 1 });
+stack:push($stName, { "a" : 0 });
+stack:pop($stName)
 
=== modified file 'test/Queries/pop1.xq'
--- test/Queries/pop1.xq	2012-02-29 08:49:50 +0000
+++ test/Queries/pop1.xq	2013-07-17 01:17:24 +0000
@@ -1,4 +1,4 @@
-import module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";
+import module namespace stack = "http://zorba.io/modules/stack";
 
 variable $stName := fn:QName("", "stack1");
 stack:create($stName);
 
=== modified file 'test/Queries/pop2.xq'
--- test/Queries/pop2.xq	2012-02-29 08:49:50 +0000
+++ test/Queries/pop2.xq	2013-07-17 01:17:24 +0000
@@ -1,4 +1,4 @@
-import module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";
+import module namespace stack = "http://zorba.io/modules/stack";
 
 variable $stName := fn:QName("", "stack1");
 stack:create($stName);
 
=== added file 'test/Queries/push-json1.xq'
--- test/Queries/push-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/push-json1.xq	2013-07-17 01:17:24 +0000
@@ -0,0 +1,6 @@
+import module namespace stack = "http://zorba.io/modules/stack";
+
+variable $stName := fn:QName("", "stack1");
+stack:create($stName);
+stack:push($stName, {"a" : 1});
+stack:pop($stName)
 
=== modified file 'test/Queries/push1.xq'
--- test/Queries/push1.xq	2012-02-29 08:49:50 +0000
+++ test/Queries/push1.xq	2013-07-17 01:17:24 +0000
@@ -1,4 +1,4 @@
-import module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";
+import module namespace stack = "http://zorba.io/modules/stack";
 
 variable $stName := fn:QName("", "stack1");
 stack:create($stName);
 
=== added file 'test/Queries/size-json1.xq'
--- test/Queries/size-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/size-json1.xq	2013-07-17 01:17:24 +0000
@@ -0,0 +1,13 @@
+import module namespace stack = "http://zorba.io/modules/stack";
+
+variable $stName := fn:QName("", "stack1");
+(
+  stack:create($stName),
+  stack:size($stName),
+  stack:push($stName, { "phi" : 1.6180339 }),
+  stack:top($stName),
+  stack:size($stName),
+  stack:pop($stName),
+  stack:top($stName),
+  stack:size($stName)
+)
 
=== modified file 'test/Queries/size1.xq'
--- test/Queries/size1.xq	2012-03-23 07:56:19 +0000
+++ test/Queries/size1.xq	2013-07-17 01:17:24 +0000
@@ -1,4 +1,4 @@
-import module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";
+import module namespace stack = "http://zorba.io/modules/stack";
 
 variable $stName := fn:QName("", "stack1");
 (
 
=== added file 'test/Queries/top-json1.xq'
--- test/Queries/top-json1.xq	1970-01-01 00:00:00 +0000
+++ test/Queries/top-json1.xq	2013-07-17 01:17:24 +0000
@@ -0,0 +1,12 @@
+import module namespace stack = "http://zorba.io/modules/stack";
+
+variable $stName := fn:QName("", "stack1");
+(
+  stack:create($stName),
+  stack:push($stName, { "z" : 9.999 }),
+  stack:push($stName, { "a" : jn:null() }),
+  stack:top($stName),
+  stack:pop($stName),
+  stack:pop($stName),
+  stack:top($stName)
+)
 
=== modified file 'test/Queries/top1.xq'
--- test/Queries/top1.xq	2012-02-29 08:49:50 +0000
+++ test/Queries/top1.xq	2013-07-17 01:17:24 +0000
@@ -1,4 +1,4 @@
-import module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";
+import module namespace stack = "http://zorba.io/modules/stack";
 
 variable $stName := fn:QName("", "stack1");
 (