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
=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt 2013-08-01 11:39:44 +0000
+++ src/api/CMakeLists.txt 2013-08-01 17:29:31 +0000
@@ -23,7 +23,6 @@
23 sax2impl.cpp23 sax2impl.cpp
24 staticcontextimpl.cpp24 staticcontextimpl.cpp
25 dynamiccontextimpl.cpp25 dynamiccontextimpl.cpp
26 resultiteratorimpl.cpp
27 zorba_string.cpp26 zorba_string.cpp
28 hexbinaryimpl.cpp27 hexbinaryimpl.cpp
29 hexbinary_streambuf.cpp28 hexbinary_streambuf.cpp
@@ -39,10 +38,11 @@
39 collectionimpl.cpp38 collectionimpl.cpp
40 options.cpp39 options.cpp
41 functionimpl.cpp40 functionimpl.cpp
42 storeiteratorimpl.cpp
43 vectoriterator.cpp
44 iterator_singleton.cpp
45 serialization_callback.cpp41 serialization_callback.cpp
42 item_iter_singleton.cpp
43 item_iter_vector.cpp
44 item_iter_store.cpp
45 item_iter_query_result.cpp
46 item_seq_vector.cpp46 item_seq_vector.cpp
47 item_seq_singleton.cpp47 item_seq_singleton.cpp
48 item_seq_invoke.cpp48 item_seq_invoke.cpp
4949
=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp 2013-08-01 07:57:57 +0000
+++ src/api/dynamiccontextimpl.cpp 2013-08-01 17:29:31 +0000
@@ -32,10 +32,8 @@
32#include "api/unmarshaller.h"32#include "api/unmarshaller.h"
33#include "api/zorbaimpl.h"33#include "api/zorbaimpl.h"
34#include "api/xqueryimpl.h"34#include "api/xqueryimpl.h"
35#include "api/resultiteratorimpl.h"35#include "api/item_iter_query_result.h"
36#include "api/storeiteratorimpl.h"36#include "api/item_iter_store.h"
37//#include "api/item_iter_query_result.h"
38//#include "api/item_iter_store.h"
39#include "api/dynamiccontextimpl.h"37#include "api/dynamiccontextimpl.h"
4038
41#include "compiler/parser/query_loc.h"39#include "compiler/parser/query_loc.h"
4240
=== modified file 'src/api/item.cpp'
--- src/api/item.cpp 2013-06-21 05:17:24 +0000
+++ src/api/item.cpp 2013-08-01 17:29:31 +0000
@@ -28,8 +28,8 @@
2828
29#include "api/zorbaimpl.h"29#include "api/zorbaimpl.h"
30#include "api/serialization/serializer.h"30#include "api/serialization/serializer.h"
31#include "api/storeiteratorimpl.h"31#include "api/item_iter_store.h"
32#include "api/iterator_singleton.h"32#include "api/item_iter_singleton.h"
33#include "api/unmarshaller.h"33#include "api/unmarshaller.h"
3434
35#include "store/api/item.h"35#include "store/api/item.h"
3636
=== renamed file 'src/api/resultiteratorimpl.cpp' => 'src/api/item_iter_query_result.cpp'
--- src/api/resultiteratorimpl.cpp 2013-02-07 17:24:36 +0000
+++ src/api/item_iter_query_result.cpp 2013-08-01 17:29:31 +0000
@@ -22,7 +22,7 @@
2222
23#include "system/globalenv.h"23#include "system/globalenv.h"
2424
25#include "api/resultiteratorimpl.h"25#include "api/item_iter_query_result.h"
26#include "api/unmarshaller.h"26#include "api/unmarshaller.h"
27#include "api/xqueryimpl.h"27#include "api/xqueryimpl.h"
28#include "api/zorbaimpl.h"28#include "api/zorbaimpl.h"
2929
=== renamed file 'src/api/resultiteratorimpl.h' => 'src/api/item_iter_query_result.h'
=== renamed file 'src/api/iterator_singleton.cpp' => 'src/api/item_iter_singleton.cpp'
--- src/api/iterator_singleton.cpp 2013-02-07 17:24:36 +0000
+++ src/api/item_iter_singleton.cpp 2013-08-01 17:29:31 +0000
@@ -15,11 +15,10 @@
15 */15 */
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "api/iterator_singleton.h"
19
20#include <zorba/item.h>18#include <zorba/item.h>
2119
22#include "api/zorbaimpl.h"20#include "api/zorbaimpl.h"
21#include "api/item_iter_singleton.h"
2322
24#include "system/globalenv.h"23#include "system/globalenv.h"
2524
2625
=== renamed file 'src/api/iterator_singleton.h' => 'src/api/item_iter_singleton.h'
=== renamed file 'src/api/storeiteratorimpl.cpp' => 'src/api/item_iter_store.cpp'
--- src/api/storeiteratorimpl.cpp 2013-02-07 17:24:36 +0000
+++ src/api/item_iter_store.cpp 2013-08-01 17:29:31 +0000
@@ -15,12 +15,11 @@
15 */15 */
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "api/storeiteratorimpl.h"
19
20#include <zorba/item.h>18#include <zorba/item.h>
2119
22#include "system/globalenv.h"20#include "system/globalenv.h"
2321
22#include "api/item_iter_store.h"
24#include "api/zorbaimpl.h"23#include "api/zorbaimpl.h"
2524
26#include "diagnostics/xquery_diagnostics.h"25#include "diagnostics/xquery_diagnostics.h"
@@ -73,7 +72,7 @@
7372
74********************************************************************************/73********************************************************************************/
75StoreIteratorImpl::StoreIteratorImpl(74StoreIteratorImpl::StoreIteratorImpl(
76 store::Iterator_t aIter,75 const store::Iterator_t& aIter,
77 DiagnosticHandler* aDiagnosticHandler)76 DiagnosticHandler* aDiagnosticHandler)
78 :77 :
79 theIterator(aIter),78 theIterator(aIter),
8079
=== renamed file 'src/api/storeiteratorimpl.h' => 'src/api/item_iter_store.h'
--- src/api/storeiteratorimpl.h 2013-02-07 17:24:36 +0000
+++ src/api/item_iter_store.h 2013-08-01 17:29:31 +0000
@@ -34,15 +34,15 @@
34 friend class DynamicContextImpl;34 friend class DynamicContextImpl;
3535
36protected:36protected:
37 store::Iterator_t theIterator; 37 store::Iterator_t theIterator;
38 DiagnosticHandler* theDiagnosticHandler;38 DiagnosticHandler * theDiagnosticHandler;
39 bool theOwnDiagnosticHandler;39 bool theOwnDiagnosticHandler;
40 bool theIsOpen; 40 bool theIsOpen;
41 bool theHaveLock;41 bool theHaveLock;
42 42
43 StoreIteratorImpl(store::Iterator_t, DiagnosticHandler*);
44
45public:43public:
44 StoreIteratorImpl(const store::Iterator_t&, DiagnosticHandler*);
45
46 virtual ~StoreIteratorImpl();46 virtual ~StoreIteratorImpl();
47 47
48 virtual void open();48 virtual void open();
4949
=== renamed file 'src/api/vectoriterator.cpp' => 'src/api/item_iter_vector.cpp'
--- src/api/vectoriterator.cpp 2013-02-07 17:24:36 +0000
+++ src/api/item_iter_vector.cpp 2013-08-01 17:29:31 +0000
@@ -15,19 +15,14 @@
15 */15 */
16#include "stdafx.h"16#include "stdafx.h"
1717
18#include "api/vectoriterator.h"
19
20#include <zorba/item.h>18#include <zorba/item.h>
2119
20#include "api/item_iter_vector.h"
22#include "api/zorbaimpl.h"21#include "api/zorbaimpl.h"
2322
24#include "system/globalenv.h"
25
26#include "diagnostics/xquery_diagnostics.h"23#include "diagnostics/xquery_diagnostics.h"
2724
28#include "store/api/item.h"25#include "store/api/item.h"
29#include "store/api/iterator.h"
30#include "store/api/store.h"
3126
32namespace zorba {27namespace zorba {
3328
3429
=== renamed file 'src/api/vectoriterator.h' => 'src/api/item_iter_vector.h'
--- src/api/vectoriterator.h 2013-02-07 17:24:36 +0000
+++ src/api/item_iter_vector.h 2013-08-01 17:29:31 +0000
@@ -34,10 +34,10 @@
34 friend class Item;34 friend class Item;
3535
36protected:36protected:
37 std::vector<store::Item_t> theVector;37 std::vector<store::Item_t> theVector;
38 std::vector<store::Item_t>::iterator theIter;38 std::vector<store::Item_t>::iterator theIter;
39 DiagnosticHandler* theDiagnosticHandler;39 DiagnosticHandler * theDiagnosticHandler;
40 bool theIsOpen; 40 bool theIsOpen;
4141
42public:42public:
43 VectorIterator(const std::vector<store::Item_t>&, DiagnosticHandler*);43 VectorIterator(const std::vector<store::Item_t>&, DiagnosticHandler*);
4444
=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp 2013-08-01 11:39:44 +0000
+++ src/api/staticcontextimpl.cpp 2013-08-01 17:29:31 +0000
@@ -37,7 +37,7 @@
37#include "api/xqueryimpl.h"37#include "api/xqueryimpl.h"
38#include "api/item_seq_invoke.h"38#include "api/item_seq_invoke.h"
39#include "api/staticcollectionmanagerimpl.h"39#include "api/staticcollectionmanagerimpl.h"
40#include "api/vectoriterator.h"40#include "api/item_iter_vector.h"
4141
42#include "context/static_context.h"42#include "context/static_context.h"
43#include "context/static_context_consts.h"43#include "context/static_context_consts.h"
4444
=== modified file 'src/api/unmarshaller.cpp'
--- src/api/unmarshaller.cpp 2013-02-07 17:24:36 +0000
+++ src/api/unmarshaller.cpp 2013-08-01 17:29:31 +0000
@@ -22,7 +22,7 @@
22#include <zorba/iterator.h>22#include <zorba/iterator.h>
23#include "api/staticcontextimpl.h"23#include "api/staticcontextimpl.h"
24#include "api/dynamiccontextimpl.h"24#include "api/dynamiccontextimpl.h"
25#include "api/storeiteratorimpl.h"25#include "api/item_iter_store.h"
26#include "api/collectionimpl.h"26#include "api/collectionimpl.h"
27#include "store/api/collection.h"27#include "store/api/collection.h"
2828
2929
=== modified file 'src/api/xqueryimpl.cpp'
--- src/api/xqueryimpl.cpp 2013-06-27 15:54:27 +0000
+++ src/api/xqueryimpl.cpp 2013-08-01 17:29:31 +0000
@@ -39,7 +39,7 @@
3939
40#include "api/staticcontextimpl.h"40#include "api/staticcontextimpl.h"
41#include "api/dynamiccontextimpl.h"41#include "api/dynamiccontextimpl.h"
42#include "api/resultiteratorimpl.h"42#include "api/item_iter_query_result.h"
43#include "api/unmarshaller.h"43#include "api/unmarshaller.h"
44#include "api/serialization/serializer.h"44#include "api/serialization/serializer.h"
45#include "api/serialization/serializable.h"45#include "api/serialization/serializable.h"
@@ -47,7 +47,7 @@
47#include "api/serializerimpl.h"47#include "api/serializerimpl.h"
48#include "api/auditimpl.h"48#include "api/auditimpl.h"
49#include "api/staticcollectionmanagerimpl.h"49#include "api/staticcollectionmanagerimpl.h"
50#include "api/vectoriterator.h"50#include "api/item_iter_vector.h"
5151
52#include "context/static_context.h"52#include "context/static_context.h"
53#include "context/dynamic_context.h"53#include "context/dynamic_context.h"
5454
=== modified file 'src/api/zorbaimpl.cpp'
--- src/api/zorbaimpl.cpp 2013-06-27 15:54:27 +0000
+++ src/api/zorbaimpl.cpp 2013-08-01 17:29:31 +0000
@@ -28,7 +28,7 @@
28#include "api/itemfactoryimpl.h"28#include "api/itemfactoryimpl.h"
29#include "api/unmarshaller.h"29#include "api/unmarshaller.h"
30#include "api/xmldatamanagerimpl.h"30#include "api/xmldatamanagerimpl.h"
31#include "api/vectoriterator.h"31#include "api/item_iter_vector.h"
32#include "api/auditimpl.h"32#include "api/auditimpl.h"
3333
34#include "zorbautils/fatal.h"34#include "zorbautils/fatal.h"
3535
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2013-07-26 20:43:25 +0000
+++ src/context/static_context.cpp 2013-08-01 17:29:31 +0000
@@ -52,7 +52,6 @@
5252
53#include "api/unmarshaller.h"53#include "api/unmarshaller.h"
54#include "api/auditimpl.h"54#include "api/auditimpl.h"
55
56#include "api/uri_resolver_wrappers.h"55#include "api/uri_resolver_wrappers.h"
5756
58#include "diagnostics/xquery_diagnostics.h"57#include "diagnostics/xquery_diagnostics.h"
@@ -1420,6 +1419,7 @@
1420 compute_base_uri();1419 compute_base_uri();
1421}1420}
14221421
1422
1423/***************************************************************************//**1423/***************************************************************************//**
1424 Base Uri Computation1424 Base Uri Computation
14251425
@@ -1511,7 +1511,8 @@
1511 if (found)1511 if (found)
1512 {1512 {
1513 URI base(entityUri);1513 URI base(entityUri);
1514 if (base.is_absolute()) {1514 if (base.is_absolute())
1515 {
1515 URI resolvedURI(base, userBaseUri);1516 URI resolvedURI(base, userBaseUri);
1516 theBaseUriInfo->theBaseUri = resolvedURI.toString();1517 theBaseUriInfo->theBaseUri = resolvedURI.toString();
1517 theBaseUriInfo->theHaveBaseUri = true;1518 theBaseUriInfo->theHaveBaseUri = true;
@@ -1981,6 +1982,7 @@
1981#endif1982#endif
1982}1983}
19831984
1985
1984/////////////////////////////////////////////////////////////////////////////////1986/////////////////////////////////////////////////////////////////////////////////
1985// //1987// //
1986// Type Manager //1988// Type Manager //
@@ -2756,8 +2758,7 @@
2756/***************************************************************************//**2758/***************************************************************************//**
2757 Find all the in-scope and non-disabled functions in this sctx and its ancestors.2759 Find all the in-scope and non-disabled functions in this sctx and its ancestors.
2758********************************************************************************/2760********************************************************************************/
2759void static_context::get_functions(2761void static_context::get_functions(std::vector<function *>& functions) const
2760 std::vector<function *>& functions) const
2761{2762{
2762 std::vector<function*> disabled;2763 std::vector<function*> disabled;
2763 std::vector<zstring> importedBuiltinModules;2764 std::vector<zstring> importedBuiltinModules;
@@ -2915,8 +2916,8 @@
29152916
2916 if (theFunctionArityMap != NULL && theFunctionArityMap->get(qname2, fv))2917 if (theFunctionArityMap != NULL && theFunctionArityMap->get(qname2, fv))
2917 {2918 {
2918 ulong numFunctions = (ulong)fv->size();2919 csize numFunctions = fv->size();
2919 for (ulong i = 0; i < numFunctions; ++i)2920 for (csize i = 0; i < numFunctions; ++i)
2920 {2921 {
2921 if (!(*fv)[i].theIsDisabled)2922 if (!(*fv)[i].theIsDisabled)
2922 functions.push_back((*fv)[i].theFunction);2923 functions.push_back((*fv)[i].theFunction);
29232924
=== modified file 'src/store/naive/pul_primitives.h'
--- src/store/naive/pul_primitives.h 2013-06-15 02:57:08 +0000
+++ src/store/naive/pul_primitives.h 2013-08-01 17:29:31 +0000
@@ -1500,11 +1500,10 @@
1500 store::Item_t theDoc;1500 store::Item_t theDoc;
15011501
1502 UpdCreateDocument(1502 UpdCreateDocument(
1503 PULImpl* pul,1503 PULImpl* pul,
1504 const QueryLoc*,1504 const QueryLoc*,
1505 const store::Item_t& uri,1505 const store::Item_t& uri,
1506 store::Item_t& doc1506 store::Item_t& doc);
1507 );
15081507
1509public:1508public:
1510 store::UpdateConsts::UpdPrimKind getKind() const1509 store::UpdateConsts::UpdPrimKind getKind() const

Subscribers

People subscribed via source and target branches