Merge lp:~zorba-coders/zorba/bug-978722_xqxq into lp:zorba/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 :
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
1=== modified file 'src/xqxq.xq'
2--- src/xqxq.xq 2012-03-07 08:21:14 +0000
3+++ src/xqxq.xq 2012-04-11 10:08:29 +0000
4@@ -25,7 +25,7 @@
5 :)
6 module namespace xqxq = 'http://www.zorba-xquery.com/modules/xqxq';
7
8-declare namespace ann = "http://www.zorba-xquery.com/annotations";
9+declare namespace an = "http://www.zorba-xquery.com/annotations";
10
11 declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
12 declare option ver:module-version "1.0";
13@@ -52,7 +52,7 @@
14 : of the query. For example, err:XPST0003 if the given XQuery program could
15 : not be parsed.
16 :)
17-declare %ann:sequential function xqxq:prepare-main-module($main-module-text as xs:string) as
18+declare %an:sequential function xqxq:prepare-main-module($main-module-text as xs:string) as
19 xs:anyURI external;
20
21 (:~
22@@ -69,7 +69,7 @@
23 : of the library module. For example, err:XPST0003 if the given XQuery library
24 : module could not be parsed.
25 :)
26-declare %ann:sequential function xqxq:prepare-library-module($library-module-text as xs:string) as
27+declare %an:sequential function xqxq:prepare-library-module($library-module-text as xs:string) as
28 empty-sequence() external ;
29
30 (:~
31@@ -160,7 +160,7 @@
32 : @error xqxq:NoQueryMatch if no query with the given identifier
33 : was prepared.
34 :)
35-declare %ann:sequential function xqxq:bind-context-item($query-key as xs:anyURI,
36+declare %an:sequential function xqxq:bind-context-item($query-key as xs:anyURI,
37 $dot as item()) as empty-sequence() external ;
38
39 (:~
40@@ -180,7 +180,7 @@
41 : @error xqxq:UndeclaredVariable if the given variable is not declared
42 : in the query.
43 :)
44-declare %ann:sequential function xqxq:bind-variable($query-key as xs:anyURI,
45+declare %an:sequential function xqxq:bind-variable($query-key as xs:anyURI,
46 $var as xs:QName, $value as item()*) as empty-sequence() external ;
47
48
49@@ -247,7 +247,7 @@
50 : given query.
51 :
52 :)
53-declare %ann:sequential function xqxq:evaluate-sequential($query-key as
54+declare %an:sequential function xqxq:evaluate-sequential($query-key as
55 xs:string) as item()* external;
56
57 (:~
58@@ -263,5 +263,5 @@
59 : was prepared.
60 :
61 :)
62-declare %ann:sequential function xqxq:delete-query($query-key as xs:anyURI) as
63+declare %an:sequential function xqxq:delete-query($query-key as xs:anyURI) as
64 empty-sequence() external;
65
66=== modified file 'test/Queries/xqxq/evaluate-sequential.xq'
67--- test/Queries/xqxq/evaluate-sequential.xq 2011-11-30 22:38:48 +0000
68+++ test/Queries/xqxq/evaluate-sequential.xq 2012-04-11 10:08:29 +0000
69@@ -2,8 +2,8 @@
70
71 variable $query-key := xqxq:prepare-main-module('
72 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
73-declare namespace ann = "http://www.zorba-xquery.com/annotations";
74-declare %ann:sequential function local:foo() {
75+declare namespace an = "http://www.zorba-xquery.com/annotations";
76+declare %an:sequential function local:foo() {
77 ddl:create(xs:QName("hola"),(<a/>,<b/>));
78
79 exit returning true();
80
81=== modified file 'test/Queries/xqxq/evaluate-updating2.xq'
82--- test/Queries/xqxq/evaluate-updating2.xq 2011-11-30 22:38:48 +0000
83+++ test/Queries/xqxq/evaluate-updating2.xq 2012-04-11 10:08:29 +0000
84@@ -2,8 +2,8 @@
85
86 variable $query-key := xqxq:prepare-main-module('
87 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
88-declare namespace ann = "http://www.zorba-xquery.com/annotations";
89-declare %ann:sequential function local:foo() {
90+declare namespace an = "http://www.zorba-xquery.com/annotations";
91+declare %an:sequential function local:foo() {
92 ddl:create(xs:QName("hola"),(<a/>,<b/>));
93
94 exit returning ();
95
96=== modified file 'test/Queries/xqxq/evaluate3.xq'
97--- test/Queries/xqxq/evaluate3.xq 2011-11-30 22:38:48 +0000
98+++ test/Queries/xqxq/evaluate3.xq 2012-04-11 10:08:29 +0000
99@@ -2,8 +2,8 @@
100
101 variable $query-key := xqxq:prepare-main-module('
102 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
103-declare namespace ann = "http://www.zorba-xquery.com/annotations";
104-declare %ann:sequential function local:foo() {
105+declare namespace an = "http://www.zorba-xquery.com/annotations";
106+declare %an:sequential function local:foo() {
107 ddl:create(xs:QName("hola"),(<a/>,<b/>));
108
109 exit returning ();
110
111=== modified file 'test/Queries/xqxq/is-sequential.xq'
112--- test/Queries/xqxq/is-sequential.xq 2011-11-30 22:38:48 +0000
113+++ test/Queries/xqxq/is-sequential.xq 2012-04-11 10:08:29 +0000
114@@ -2,8 +2,8 @@
115
116 variable $query-key1 := xqxq:prepare-main-module('
117 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
118-declare namespace ann = "http://www.zorba-xquery.com/annotations";
119-declare %ann:sequential function local:foo() {
120+declare namespace an = "http://www.zorba-xquery.com/annotations";
121+declare %an:sequential function local:foo() {
122 ddl:create(xs:QName("hola"),(<a/>,<b/>));
123
124 exit returning ();
125
126=== modified file 'test/Queries/xqxq/is-updating.xq'
127--- test/Queries/xqxq/is-updating.xq 2011-11-30 22:38:48 +0000
128+++ test/Queries/xqxq/is-updating.xq 2012-04-11 10:08:29 +0000
129@@ -2,8 +2,8 @@
130
131 variable $query-key1 := xqxq:prepare-main-module('
132 import module namespace ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";
133-declare namespace ann = "http://www.zorba-xquery.com/annotations";
134-declare %ann:sequential function local:foo() {
135+declare namespace an = "http://www.zorba-xquery.com/annotations";
136+declare %an:sequential function local:foo() {
137 ddl:create(xs:QName("hola"),(<a/>,<b/>));
138
139 exit returning ();

Subscribers

People subscribed via source and target branches

to all changes: