Zorba

Merge lp:~zorba-coders/zorba/bug-978722_xqxq into lp:zorba/xqxq-module

  1. bug-978722_xqxq
  2. Merge into xqxq-module
Proposed by Matthias Brantner
Status: Merged
Approved by: Matthias Brantner
Approved revision: 37
Merged at revision: 37
Proposed branch: lp:~zorba-coders/zorba/bug-978722_xqxq
Merge into: lp:zorba/xqxq-module
Diff against target: 139 lines (+17/-17)
6 files modified
src/xqxq.xq (+7/-7)
test/Queries/xqxq/evaluate-sequential.xq (+2/-2)
test/Queries/xqxq/evaluate-updating2.xq (+2/-2)
test/Queries/xqxq/evaluate3.xq (+2/-2)
test/Queries/xqxq/is-sequential.xq (+2/-2)
test/Queries/xqxq/is-updating.xq (+2/-2)
To merge this branch: bzr merge lp:~zorba-coders/zorba/bug-978722_xqxq
Reviewer Review Type Date Requested Status
William Candillon Approve
Matthias Brantner Approve
Review via email: mp+101525@code.launchpad.net

Commit message

fix for bug #978722 (change annotation prefix from "ann" to "an")

Description of the change

fix for bug #978722 (change annotation prefix from "ann" to "an")

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
William Candillon (wcandillon) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-978722_xqxq-2012-04-13T08-10-13.547Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job bug-978722_xqxq-2012-04-13T08-10-13.547Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/xqxq.xq'
--- src/xqxq.xq 2012-03-07 08:21:14 +0000
+++ src/xqxq.xq 2012-04-11 10:08:29 +0000
@@ -25,7 +25,7 @@
25 :)25 :)
26module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';26module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
2727
28declare namespace ann = "http://www.zorba-xquery.com/annotations";28declare namespace an = "http://www.zorba-xquery.com/annotations";
2929
30declare namespace ver = "http://www.zorba-xquery.com/options/versioning";30declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
31declare option ver:module-version "1.0";31declare option ver:module-version "1.0";
@@ -52,7 +52,7 @@
52 : of the query. For example, err:XPST0003 if the given XQuery program could52 : of the query. For example, err:XPST0003 if the given XQuery program could
53 : not be parsed.53 : not be parsed.
54 :)54 :)
55declare %ann:sequential function xqxq:prepare-main-module($main-module-text as xs:string) as 55declare %an:sequential function xqxq:prepare-main-module($main-module-text as xs:string) as
56 xs:anyURI external;56 xs:anyURI external;
5757
58(:~58(:~
@@ -69,7 +69,7 @@
69 : of the library module. For example, err:XPST0003 if the given XQuery library69 : of the library module. For example, err:XPST0003 if the given XQuery library
70 : module could not be parsed.70 : module could not be parsed.
71 :)71 :)
72declare %ann:sequential function xqxq:prepare-library-module($library-module-text as xs:string) as 72declare %an:sequential function xqxq:prepare-library-module($library-module-text as xs:string) as
73 empty-sequence() external ;73 empty-sequence() external ;
7474
75(:~75(:~
@@ -160,7 +160,7 @@
160 : @error xqxq:NoQueryMatch if no query with the given identifier160 : @error xqxq:NoQueryMatch if no query with the given identifier
161 : was prepared.161 : was prepared.
162 :)162 :)
163declare %ann:sequential function xqxq:bind-context-item($query-key as xs:anyURI,163declare %an:sequential function xqxq:bind-context-item($query-key as xs:anyURI,
164 $dot as item()) as empty-sequence() external ;164 $dot as item()) as empty-sequence() external ;
165165
166(:~166(:~
@@ -180,7 +180,7 @@
180 : @error xqxq:UndeclaredVariable if the given variable is not declared180 : @error xqxq:UndeclaredVariable if the given variable is not declared
181 : in the query.181 : in the query.
182 :)182 :)
183declare %ann:sequential function xqxq:bind-variable($query-key as xs:anyURI,183declare %an:sequential function xqxq:bind-variable($query-key as xs:anyURI,
184 $var as xs:QName, $value as item()*) as empty-sequence() external ;184 $var as xs:QName, $value as item()*) as empty-sequence() external ;
185185
186186
@@ -247,7 +247,7 @@
247 : given query.247 : given query.
248 :248 :
249 :)249 :)
250declare %ann:sequential function xqxq:evaluate-sequential($query-key as250declare %an:sequential function xqxq:evaluate-sequential($query-key as
251 xs:string) as item()* external;251 xs:string) as item()* external;
252 252
253(:~ 253(:~
@@ -263,5 +263,5 @@
263 : was prepared.263 : was prepared.
264 :264 :
265 :)265 :)
266declare %ann:sequential function xqxq:delete-query($query-key as xs:anyURI) as266declare %an:sequential function xqxq:delete-query($query-key as xs:anyURI) as
267 empty-sequence() external;267 empty-sequence() external;
268268
=== modified file 'test/Queries/xqxq/evaluate-sequential.xq'
--- test/Queries/xqxq/evaluate-sequential.xq 2011-11-30 22:38:48 +0000
+++ test/Queries/xqxq/evaluate-sequential.xq 2012-04-11 10:08:29 +0000
@@ -2,8 +2,8 @@
22
3variable $query-key := xqxq:prepare-main-module('3variable $query-key := xqxq:prepare-main-module('
4import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";4import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
5declare namespace ann = "http://www.zorba-xquery.com/annotations";5declare namespace an = "http://www.zorba-xquery.com/annotations";
6declare %ann:sequential function local:foo() {6declare %an:sequential function local:foo() {
7 ddl:create(xs:QName("hola"),(<a/>,<b/>)); 7 ddl:create(xs:QName("hola"),(<a/>,<b/>));
8 8
9 exit returning true();9 exit returning true();
1010
=== modified file 'test/Queries/xqxq/evaluate-updating2.xq'
--- test/Queries/xqxq/evaluate-updating2.xq 2011-11-30 22:38:48 +0000
+++ test/Queries/xqxq/evaluate-updating2.xq 2012-04-11 10:08:29 +0000
@@ -2,8 +2,8 @@
22
3variable $query-key := xqxq:prepare-main-module('3variable $query-key := xqxq:prepare-main-module('
4import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";4import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
5declare namespace ann = "http://www.zorba-xquery.com/annotations";5declare namespace an = "http://www.zorba-xquery.com/annotations";
6declare %ann:sequential function local:foo() {6declare %an:sequential function local:foo() {
7 ddl:create(xs:QName("hola"),(<a/>,<b/>)); 7 ddl:create(xs:QName("hola"),(<a/>,<b/>));
8 8
9 exit returning ();9 exit returning ();
1010
=== modified file 'test/Queries/xqxq/evaluate3.xq'
--- test/Queries/xqxq/evaluate3.xq 2011-11-30 22:38:48 +0000
+++ test/Queries/xqxq/evaluate3.xq 2012-04-11 10:08:29 +0000
@@ -2,8 +2,8 @@
22
3variable $query-key := xqxq:prepare-main-module('3variable $query-key := xqxq:prepare-main-module('
4import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";4import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
5declare namespace ann = "http://www.zorba-xquery.com/annotations";5declare namespace an = "http://www.zorba-xquery.com/annotations";
6declare %ann:sequential function local:foo() {6declare %an:sequential function local:foo() {
7 ddl:create(xs:QName("hola"),(<a/>,<b/>)); 7 ddl:create(xs:QName("hola"),(<a/>,<b/>));
8 8
9 exit returning ();9 exit returning ();
1010
=== modified file 'test/Queries/xqxq/is-sequential.xq'
--- test/Queries/xqxq/is-sequential.xq 2011-11-30 22:38:48 +0000
+++ test/Queries/xqxq/is-sequential.xq 2012-04-11 10:08:29 +0000
@@ -2,8 +2,8 @@
22
3variable $query-key1 := xqxq:prepare-main-module('3variable $query-key1 := xqxq:prepare-main-module('
4import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";4import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
5declare namespace ann = "http://www.zorba-xquery.com/annotations";5declare namespace an = "http://www.zorba-xquery.com/annotations";
6declare %ann:sequential function local:foo() {6declare %an:sequential function local:foo() {
7 ddl:create(xs:QName("hola"),(<a/>,<b/>)); 7 ddl:create(xs:QName("hola"),(<a/>,<b/>));
8 8
9 exit returning ();9 exit returning ();
1010
=== modified file 'test/Queries/xqxq/is-updating.xq'
--- test/Queries/xqxq/is-updating.xq 2011-11-30 22:38:48 +0000
+++ test/Queries/xqxq/is-updating.xq 2012-04-11 10:08:29 +0000
@@ -2,8 +2,8 @@
22
3variable $query-key1 := xqxq:prepare-main-module('3variable $query-key1 := xqxq:prepare-main-module('
4import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";4import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
5declare namespace ann = "http://www.zorba-xquery.com/annotations";5declare namespace an = "http://www.zorba-xquery.com/annotations";
6declare %ann:sequential function local:foo() {6declare %an:sequential function local:foo() {
7 ddl:create(xs:QName("hola"),(<a/>,<b/>)); 7 ddl:create(xs:QName("hola"),(<a/>,<b/>));
8 8
9 exit returning ();9 exit returning ();

Subscribers

People subscribed via source and target branches

to all changes: