Zorba

Merge lp:~ceejatec/zorba/sf-trunk into lp:zorba

  1. sf-trunk
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 10465
Merged at revision: 10462
Proposed branch: lp:~ceejatec/zorba/sf-trunk
Merge into: lp:zorba
Diff against target: 260 lines (+42/-45)
5 files modified
src/compiler/expression/expr.h (+0/-2)
src/compiler/expression/expr_iter.cpp (+2/-0)
src/store/api/shared_types.h (+1/-1)
src/store/naive/pul_primitives.cpp (+33/-40)
test/rbkt/Scripts/w3c/XQTS.xml (+6/-2)
To merge this branch: bzr merge lp:~ceejatec/zorba/sf-trunk
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Review via email: mp+76344@code.launchpad.net

Commit message

Merge of Sourceforge changes through r12117.

Description of the change

Merge of Sourceforge changes through r12117.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) wrote :

These are presumably already-reviewed changes.

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

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

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/sf-trunk-2011-09-21T08-00-06.307Z/log.html

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

Validation queue job sf-trunk-2011-09-21T08-00-06.307Z 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/compiler/expression/expr.h'
2--- src/compiler/expression/expr.h 2011-09-16 19:36:18 +0000
3+++ src/compiler/expression/expr.h 2011-09-21 07:59:23 +0000
4@@ -199,8 +199,6 @@
5
6 public:
7 const namespace_context* getNSCtx() const;
8-
9- void compute_scripting_kind() = 0;
10 };
11
12
13
14=== modified file 'src/compiler/expression/expr_iter.cpp'
15--- src/compiler/expression/expr_iter.cpp 2011-09-16 19:36:18 +0000
16+++ src/compiler/expression/expr_iter.cpp 2011-09-21 07:59:23 +0000
17@@ -677,6 +677,7 @@
18 break;
19 }
20
21+#ifdef ZORBA_WITH_DEBUGGER
22 case debugger_expr_kind:
23 {
24 debugger_expr* debuggerExpr = static_cast<debugger_expr*>(theExpr);
25@@ -695,6 +696,7 @@
26 EXPR_ITER_END();
27 break;
28 }
29+#endif
30
31 case function_trace_expr_kind:
32 {
33
34=== modified file 'src/store/api/shared_types.h'
35--- src/store/api/shared_types.h 2011-09-12 22:42:28 +0000
36+++ src/store/api/shared_types.h 2011-09-21 07:59:23 +0000
37@@ -90,7 +90,7 @@
38
39 class ICChecker;
40
41-struct Annotation;
42+class Annotation;
43 typedef rchandle<Annotation> Annotation_t;
44
45
46
47=== modified file 'src/store/naive/pul_primitives.cpp'
48--- src/store/naive/pul_primitives.cpp 2011-09-13 13:33:51 +0000
49+++ src/store/naive/pul_primitives.cpp 2011-09-21 07:59:23 +0000
50@@ -182,11 +182,11 @@
51 {
52 theSibling.transfer(sibling);
53
54- uint64_t numNewChildren = 0;
55- uint64_t numChildren = (uint64_t)children.size();
56+ size_t numNewChildren = 0;
57+ size_t numChildren = children.size();
58 theNewChildren.resize(numChildren);
59
60- for (uint64_t i = 0; i < numChildren; i++)
61+ for (size_t i = 0; i < numChildren; i++)
62 {
63 if (i > 0 &&
64 children[i]->getNodeKind() == store::StoreConsts::textNode &&
65@@ -286,10 +286,11 @@
66 UpdatePrimitive(pul, aLoc, target),
67 theNumApplied(0)
68 {
69- uint64_t numAttrs = (uint64_t)attrs.size();
70+ size_t numAttrs = attrs.size();
71 theNewAttrs.resize(numAttrs);
72- for (uint64_t i = 0; i < numAttrs; i++)
73+ for (size_t i = 0; i < numAttrs; i++) {
74 theNewAttrs[i].transfer(attrs[i]);
75+ }
76 }
77
78
79@@ -335,10 +336,11 @@
80 {
81 theAttr.transfer(attr);
82
83- uint64_t numAttrs = (uint64_t)newAttrs.size();
84+ size_t numAttrs = (uint64_t)newAttrs.size();
85 theNewAttrs.resize(numAttrs);
86- for (uint64_t i = 0; i < numAttrs; i++)
87- theNewAttrs[i].transfer(newAttrs[i]);
88+ for (size_t i = 0; i < numAttrs; i++) {
89+ theNewAttrs[i].transfer(newAttrs[i]);
90+ }
91 }
92
93
94@@ -737,11 +739,12 @@
95 {
96 theName.transfer(name);
97
98- uint64_t numNodes = (uint64_t)nodes.size();
99+ size_t numNodes = (uint64_t)nodes.size();
100 theNodes.resize(numNodes);
101
102- for (uint64_t i = 0; i < numNodes; ++i)
103+ for (size_t i = 0; i < numNodes; ++i) {
104 theNodes[i].transfer(nodes[i]);
105+ }
106 }
107
108
109@@ -758,11 +761,12 @@
110 {
111 theName.transfer(name);
112
113- uint64_t numNodes = (uint64_t)nodes.size();
114+ size_t numNodes = (uint64_t)nodes.size();
115 theNodes.resize(numNodes);
116
117- for (uint64_t i = 0; i < numNodes; ++i)
118+ for (size_t i = 0; i < numNodes; ++i) {
119 theNodes[i].transfer(nodes[i]);
120+ }
121 }
122
123
124@@ -873,9 +877,8 @@
125
126 theIsApplied = true;
127
128- uint64_t numNodes = (uint64_t)theNodes.size();
129- for (uint64_t i = 0; i < numNodes; ++i)
130- {
131+ size_t numNodes = (uint64_t)theNodes.size();
132+ for (size_t i = 0; i < numNodes; ++i) {
133 lColl->addNode(theNodes[i], -1);
134 ++theNumApplied;
135 }
136@@ -891,8 +894,7 @@
137 uint64_t lastPos;
138 try {
139 lastPos = to_xs_unsignedLong(lColl->size()) - 1;
140- } catch (std::range_error& e)
141- {
142+ } catch (std::range_error& e) {
143 throw ZORBA_EXCEPTION(
144 zerr::ZSTR0060_RANGE_EXCEPTION,
145 ERROR_PARAMS(
146@@ -925,9 +927,8 @@
147
148 theCollectionPul->setAdjustTreePositions();
149
150- uint64_t numNodes = (uint64_t)theNodes.size();
151- for (uint64_t i = 0; i < numNodes; ++i)
152- {
153+ size_t numNodes = (uint64_t)theNodes.size();
154+ for (size_t i = 0; i < numNodes; ++i) {
155 lColl->addNode(theNodes[i], i);
156 ++theNumApplied;
157 }
158@@ -940,8 +941,7 @@
159 (GET_STORE().getCollection(theName, theDynamicCollection).getp());
160 assert(lColl);
161
162- for (uint64_t i = 0; i < theNumApplied; ++i)
163- {
164+ for (size_t i = 0; i < theNumApplied; ++i) {
165 ZORBA_ASSERT(theNodes[i] == lColl->nodeAt(0));
166
167 lColl->removeNode((uint64_t)0);
168@@ -960,9 +960,8 @@
169
170 theIsApplied = true;
171
172- uint64_t numNodes = (uint64_t)theNodes.size();
173- for (uint64_t i = 0; i < numNodes; ++i)
174- {
175+ size_t numNodes = (uint64_t)theNodes.size();
176+ for (size_t i = 0; i < numNodes; ++i) {
177 lColl->addNode(theNodes[i], -1);
178 }
179 }
180@@ -1072,8 +1071,7 @@
181 uint64_t size;
182 try {
183 size = to_xs_unsignedLong(lColl->size());
184- } catch (std::range_error& e)
185- {
186+ } catch (std::range_error& e) {
187 throw ZORBA_EXCEPTION(
188 zerr::ZSTR0060_RANGE_EXCEPTION,
189 ERROR_PARAMS(
190@@ -1087,26 +1085,23 @@
191
192 bool isLast = theIsLast;
193
194- if (theIsLast)
195- {
196- for (size_t i = numNodes; i > 0; --i)
197- {
198- if (theNodes[i-1] != lColl->nodeAt(size - i))
199- {
200+ if (theIsLast) {
201+ for (size_t i = numNodes; i > 0; --i) {
202+ if (theNodes[i-1] != lColl->nodeAt(size - i)) {
203 isLast = false;
204 break;
205 }
206 }
207 }
208
209- if (!isLast)
210+ if (!isLast) {
211 theCollectionPul->setAdjustTreePositions();
212+ }
213
214 theFound.resize(numNodes);
215 thePositions.resize(numNodes);
216
217- for (uint64_t i = 0; i < numNodes; ++i)
218- {
219+ for (size_t i = 0; i < numNodes; ++i) {
220 theFound[i] = lColl->removeNode(theNodes[i], thePositions[i]);
221 ++theNumApplied;
222 }
223@@ -1118,10 +1113,8 @@
224 (GET_STORE().getCollection(theName, theDynamicCollection).getp());
225 assert(lColl);
226
227- for (uint64_t i = 0; i < theNumApplied; ++i)
228- {
229- if (theFound[i])
230- {
231+ for (size_t i = 0; i < theNumApplied; ++i) {
232+ if (theFound[i]) {
233 lColl->addNode(theNodes[i], thePositions[i]);
234 }
235 }
236
237=== modified file 'test/rbkt/Scripts/w3c/XQTS.xml'
238--- test/rbkt/Scripts/w3c/XQTS.xml 2011-09-13 13:33:51 +0000
239+++ test/rbkt/Scripts/w3c/XQTS.xml 2011-09-21 07:59:23 +0000
240@@ -62,7 +62,9 @@
241 name="serializationInvocation"
242 value="The result of an XQuery program can be serialized via the zorba::XQuery::execute methods (see http://www.zorba-xquery.com/site2/doc/latest/cxx/html/classzorba_1_1XQuery.html). Sequence of items can be serialized via the zorba::Serializer::serialize method (see http://www.zorba-xquery.com/site2/doc/latest/cxx/html/classzorba_1_1Serializer.html)."/>
243
244- <implementation-defined-item name="serializationDefaults" value="Serialization Feature is supported. Implicit values are: byte-order-mark = no, encoding = UTF-8, media-type = '', normalization-form = '', omix-xml-declaration = no, standalone = omit, version = '1.0', method = xml, doctype-system = '', doctype-public = '', cdata-section-elements = empty list, include-content-type = no, undeclare-prefixes = no, indent = no"/>
245+ <implementation-defined-item
246+ name="serializationDefaults"
247+ value="Serialization Feature is supported. Implicit values are: byte-order-mark = no, encoding = UTF-8, media-type = '', normalization-form = '', omix-xml-declaration = no, standalone = omit, version = '1.0', method = xml, doctype-system = '', doctype-public = '', cdata-section-elements = empty list, include-content-type = no, undeclare-prefixes = no, indent = no"/>
248
249 <implementation-defined-item
250 name="externalFunctionCall"
251@@ -74,7 +76,9 @@
252 name="traceDestination"
253 value="By default, it is std:cerr. Users can modify this via the StaticContext::setTraceStream method."/>
254
255- <implementation-defined-item name="integerOperations" value="Zorba raises [err:FOAR0002]"/>
256+ <implementation-defined-item
257+ name="integerOperations"
258+ value="Zorba raises [err:FOAR0002]"/>
259
260 <implementation-defined-item name="decimalDigits" value=""/>
261

Subscribers

People subscribed via source and target branches