Zorba

Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

  1. markos-scratch
  2. Merge into trunk
Proposed by Markos Zaharioudakis
Status: Merged
Merged at revision: 11576
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 328 lines (+40/-49)
15 files modified
src/api/CMakeLists.txt (+4/-4)
src/api/dynamiccontextimpl.cpp (+2/-4)
src/api/item.cpp (+2/-2)
src/api/item_iter_query_result.cpp (+1/-1)
src/api/item_iter_singleton.cpp (+1/-2)
src/api/item_iter_store.cpp (+2/-3)
src/api/item_iter_store.h (+7/-7)
src/api/item_iter_vector.cpp (+1/-6)
src/api/item_iter_vector.h (+4/-4)
src/api/staticcontextimpl.cpp (+1/-1)
src/api/unmarshaller.cpp (+1/-1)
src/api/xqueryimpl.cpp (+2/-2)
src/api/zorbaimpl.cpp (+1/-1)
src/context/static_context.cpp (+7/-6)
src/store/naive/pul_primitives.h (+4/-5)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+178133@code.launchpad.net

Commit message

renamed files implementing our various item iterators + cosmetic

Description of the change

renamed files implementing our various item iterators + cosmetic

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178133

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

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

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/api/CMakeLists.txt'
2--- src/api/CMakeLists.txt 2013-08-01 11:39:44 +0000
3+++ src/api/CMakeLists.txt 2013-08-01 17:29:31 +0000
4@@ -23,7 +23,6 @@
5 sax2impl.cpp
6 staticcontextimpl.cpp
7 dynamiccontextimpl.cpp
8- resultiteratorimpl.cpp
9 zorba_string.cpp
10 hexbinaryimpl.cpp
11 hexbinary_streambuf.cpp
12@@ -39,10 +38,11 @@
13 collectionimpl.cpp
14 options.cpp
15 functionimpl.cpp
16- storeiteratorimpl.cpp
17- vectoriterator.cpp
18- iterator_singleton.cpp
19 serialization_callback.cpp
20+ item_iter_singleton.cpp
21+ item_iter_vector.cpp
22+ item_iter_store.cpp
23+ item_iter_query_result.cpp
24 item_seq_vector.cpp
25 item_seq_singleton.cpp
26 item_seq_invoke.cpp
27
28=== modified file 'src/api/dynamiccontextimpl.cpp'
29--- src/api/dynamiccontextimpl.cpp 2013-08-01 07:57:57 +0000
30+++ src/api/dynamiccontextimpl.cpp 2013-08-01 17:29:31 +0000
31@@ -32,10 +32,8 @@
32 #include "api/unmarshaller.h"
33 #include "api/zorbaimpl.h"
34 #include "api/xqueryimpl.h"
35-#include "api/resultiteratorimpl.h"
36-#include "api/storeiteratorimpl.h"
37-//#include "api/item_iter_query_result.h"
38-//#include "api/item_iter_store.h"
39+#include "api/item_iter_query_result.h"
40+#include "api/item_iter_store.h"
41 #include "api/dynamiccontextimpl.h"
42
43 #include "compiler/parser/query_loc.h"
44
45=== modified file 'src/api/item.cpp'
46--- src/api/item.cpp 2013-06-21 05:17:24 +0000
47+++ src/api/item.cpp 2013-08-01 17:29:31 +0000
48@@ -28,8 +28,8 @@
49
50 #include "api/zorbaimpl.h"
51 #include "api/serialization/serializer.h"
52-#include "api/storeiteratorimpl.h"
53-#include "api/iterator_singleton.h"
54+#include "api/item_iter_store.h"
55+#include "api/item_iter_singleton.h"
56 #include "api/unmarshaller.h"
57
58 #include "store/api/item.h"
59
60=== renamed file 'src/api/resultiteratorimpl.cpp' => 'src/api/item_iter_query_result.cpp'
61--- src/api/resultiteratorimpl.cpp 2013-02-07 17:24:36 +0000
62+++ src/api/item_iter_query_result.cpp 2013-08-01 17:29:31 +0000
63@@ -22,7 +22,7 @@
64
65 #include "system/globalenv.h"
66
67-#include "api/resultiteratorimpl.h"
68+#include "api/item_iter_query_result.h"
69 #include "api/unmarshaller.h"
70 #include "api/xqueryimpl.h"
71 #include "api/zorbaimpl.h"
72
73=== renamed file 'src/api/resultiteratorimpl.h' => 'src/api/item_iter_query_result.h'
74=== renamed file 'src/api/iterator_singleton.cpp' => 'src/api/item_iter_singleton.cpp'
75--- src/api/iterator_singleton.cpp 2013-02-07 17:24:36 +0000
76+++ src/api/item_iter_singleton.cpp 2013-08-01 17:29:31 +0000
77@@ -15,11 +15,10 @@
78 */
79 #include "stdafx.h"
80
81-#include "api/iterator_singleton.h"
82-
83 #include <zorba/item.h>
84
85 #include "api/zorbaimpl.h"
86+#include "api/item_iter_singleton.h"
87
88 #include "system/globalenv.h"
89
90
91=== renamed file 'src/api/iterator_singleton.h' => 'src/api/item_iter_singleton.h'
92=== renamed file 'src/api/storeiteratorimpl.cpp' => 'src/api/item_iter_store.cpp'
93--- src/api/storeiteratorimpl.cpp 2013-02-07 17:24:36 +0000
94+++ src/api/item_iter_store.cpp 2013-08-01 17:29:31 +0000
95@@ -15,12 +15,11 @@
96 */
97 #include "stdafx.h"
98
99-#include "api/storeiteratorimpl.h"
100-
101 #include <zorba/item.h>
102
103 #include "system/globalenv.h"
104
105+#include "api/item_iter_store.h"
106 #include "api/zorbaimpl.h"
107
108 #include "diagnostics/xquery_diagnostics.h"
109@@ -73,7 +72,7 @@
110
111 ********************************************************************************/
112 StoreIteratorImpl::StoreIteratorImpl(
113- store::Iterator_t aIter,
114+ const store::Iterator_t& aIter,
115 DiagnosticHandler* aDiagnosticHandler)
116 :
117 theIterator(aIter),
118
119=== renamed file 'src/api/storeiteratorimpl.h' => 'src/api/item_iter_store.h'
120--- src/api/storeiteratorimpl.h 2013-02-07 17:24:36 +0000
121+++ src/api/item_iter_store.h 2013-08-01 17:29:31 +0000
122@@ -34,15 +34,15 @@
123 friend class DynamicContextImpl;
124
125 protected:
126- store::Iterator_t theIterator;
127- DiagnosticHandler* theDiagnosticHandler;
128- bool theOwnDiagnosticHandler;
129- bool theIsOpen;
130- bool theHaveLock;
131+ store::Iterator_t theIterator;
132+ DiagnosticHandler * theDiagnosticHandler;
133+ bool theOwnDiagnosticHandler;
134+ bool theIsOpen;
135+ bool theHaveLock;
136
137- StoreIteratorImpl(store::Iterator_t, DiagnosticHandler*);
138-
139 public:
140+ StoreIteratorImpl(const store::Iterator_t&, DiagnosticHandler*);
141+
142 virtual ~StoreIteratorImpl();
143
144 virtual void open();
145
146=== renamed file 'src/api/vectoriterator.cpp' => 'src/api/item_iter_vector.cpp'
147--- src/api/vectoriterator.cpp 2013-02-07 17:24:36 +0000
148+++ src/api/item_iter_vector.cpp 2013-08-01 17:29:31 +0000
149@@ -15,19 +15,14 @@
150 */
151 #include "stdafx.h"
152
153-#include "api/vectoriterator.h"
154-
155 #include <zorba/item.h>
156
157+#include "api/item_iter_vector.h"
158 #include "api/zorbaimpl.h"
159
160-#include "system/globalenv.h"
161-
162 #include "diagnostics/xquery_diagnostics.h"
163
164 #include "store/api/item.h"
165-#include "store/api/iterator.h"
166-#include "store/api/store.h"
167
168 namespace zorba {
169
170
171=== renamed file 'src/api/vectoriterator.h' => 'src/api/item_iter_vector.h'
172--- src/api/vectoriterator.h 2013-02-07 17:24:36 +0000
173+++ src/api/item_iter_vector.h 2013-08-01 17:29:31 +0000
174@@ -34,10 +34,10 @@
175 friend class Item;
176
177 protected:
178- std::vector<store::Item_t> theVector;
179- std::vector<store::Item_t>::iterator theIter;
180- DiagnosticHandler* theDiagnosticHandler;
181- bool theIsOpen;
182+ std::vector<store::Item_t> theVector;
183+ std::vector<store::Item_t>::iterator theIter;
184+ DiagnosticHandler * theDiagnosticHandler;
185+ bool theIsOpen;
186
187 public:
188 VectorIterator(const std::vector<store::Item_t>&, DiagnosticHandler*);
189
190=== modified file 'src/api/staticcontextimpl.cpp'
191--- src/api/staticcontextimpl.cpp 2013-08-01 11:39:44 +0000
192+++ src/api/staticcontextimpl.cpp 2013-08-01 17:29:31 +0000
193@@ -37,7 +37,7 @@
194 #include "api/xqueryimpl.h"
195 #include "api/item_seq_invoke.h"
196 #include "api/staticcollectionmanagerimpl.h"
197-#include "api/vectoriterator.h"
198+#include "api/item_iter_vector.h"
199
200 #include "context/static_context.h"
201 #include "context/static_context_consts.h"
202
203=== modified file 'src/api/unmarshaller.cpp'
204--- src/api/unmarshaller.cpp 2013-02-07 17:24:36 +0000
205+++ src/api/unmarshaller.cpp 2013-08-01 17:29:31 +0000
206@@ -22,7 +22,7 @@
207 #include <zorba/iterator.h>
208 #include "api/staticcontextimpl.h"
209 #include "api/dynamiccontextimpl.h"
210-#include "api/storeiteratorimpl.h"
211+#include "api/item_iter_store.h"
212 #include "api/collectionimpl.h"
213 #include "store/api/collection.h"
214
215
216=== modified file 'src/api/xqueryimpl.cpp'
217--- src/api/xqueryimpl.cpp 2013-06-27 15:54:27 +0000
218+++ src/api/xqueryimpl.cpp 2013-08-01 17:29:31 +0000
219@@ -39,7 +39,7 @@
220
221 #include "api/staticcontextimpl.h"
222 #include "api/dynamiccontextimpl.h"
223-#include "api/resultiteratorimpl.h"
224+#include "api/item_iter_query_result.h"
225 #include "api/unmarshaller.h"
226 #include "api/serialization/serializer.h"
227 #include "api/serialization/serializable.h"
228@@ -47,7 +47,7 @@
229 #include "api/serializerimpl.h"
230 #include "api/auditimpl.h"
231 #include "api/staticcollectionmanagerimpl.h"
232-#include "api/vectoriterator.h"
233+#include "api/item_iter_vector.h"
234
235 #include "context/static_context.h"
236 #include "context/dynamic_context.h"
237
238=== modified file 'src/api/zorbaimpl.cpp'
239--- src/api/zorbaimpl.cpp 2013-06-27 15:54:27 +0000
240+++ src/api/zorbaimpl.cpp 2013-08-01 17:29:31 +0000
241@@ -28,7 +28,7 @@
242 #include "api/itemfactoryimpl.h"
243 #include "api/unmarshaller.h"
244 #include "api/xmldatamanagerimpl.h"
245-#include "api/vectoriterator.h"
246+#include "api/item_iter_vector.h"
247 #include "api/auditimpl.h"
248
249 #include "zorbautils/fatal.h"
250
251=== modified file 'src/context/static_context.cpp'
252--- src/context/static_context.cpp 2013-07-26 20:43:25 +0000
253+++ src/context/static_context.cpp 2013-08-01 17:29:31 +0000
254@@ -52,7 +52,6 @@
255
256 #include "api/unmarshaller.h"
257 #include "api/auditimpl.h"
258-
259 #include "api/uri_resolver_wrappers.h"
260
261 #include "diagnostics/xquery_diagnostics.h"
262@@ -1420,6 +1419,7 @@
263 compute_base_uri();
264 }
265
266+
267 /***************************************************************************//**
268 Base Uri Computation
269
270@@ -1511,7 +1511,8 @@
271 if (found)
272 {
273 URI base(entityUri);
274- if (base.is_absolute()) {
275+ if (base.is_absolute())
276+ {
277 URI resolvedURI(base, userBaseUri);
278 theBaseUriInfo->theBaseUri = resolvedURI.toString();
279 theBaseUriInfo->theHaveBaseUri = true;
280@@ -1981,6 +1982,7 @@
281 #endif
282 }
283
284+
285 /////////////////////////////////////////////////////////////////////////////////
286 // //
287 // Type Manager //
288@@ -2756,8 +2758,7 @@
289 /***************************************************************************//**
290 Find all the in-scope and non-disabled functions in this sctx and its ancestors.
291 ********************************************************************************/
292-void static_context::get_functions(
293- std::vector<function *>& functions) const
294+void static_context::get_functions(std::vector<function *>& functions) const
295 {
296 std::vector<function*> disabled;
297 std::vector<zstring> importedBuiltinModules;
298@@ -2915,8 +2916,8 @@
299
300 if (theFunctionArityMap != NULL && theFunctionArityMap->get(qname2, fv))
301 {
302- ulong numFunctions = (ulong)fv->size();
303- for (ulong i = 0; i < numFunctions; ++i)
304+ csize numFunctions = fv->size();
305+ for (csize i = 0; i < numFunctions; ++i)
306 {
307 if (!(*fv)[i].theIsDisabled)
308 functions.push_back((*fv)[i].theFunction);
309
310=== modified file 'src/store/naive/pul_primitives.h'
311--- src/store/naive/pul_primitives.h 2013-06-15 02:57:08 +0000
312+++ src/store/naive/pul_primitives.h 2013-08-01 17:29:31 +0000
313@@ -1500,11 +1500,10 @@
314 store::Item_t theDoc;
315
316 UpdCreateDocument(
317- PULImpl* pul,
318- const QueryLoc*,
319- const store::Item_t& uri,
320- store::Item_t& doc
321- );
322+ PULImpl* pul,
323+ const QueryLoc*,
324+ const store::Item_t& uri,
325+ store::Item_t& doc);
326
327 public:
328 store::UpdateConsts::UpdPrimKind getKind() const

Subscribers

People subscribed via source and target branches