zorba-coders team mailing list archive

[Markos Zaharioudakis <markos_za@xxxxxxxxx>]

Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.

Commit message:
renamed files implementing our various item iterators + cosmetic

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178133

renamed files implementing our various item iterators + cosmetic
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/178133
Your team Zorba Coders is subscribed to branch lp:zorba.

=== 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 @@
     sax2impl.cpp
     staticcontextimpl.cpp
     dynamiccontextimpl.cpp
-    resultiteratorimpl.cpp
     zorba_string.cpp
     hexbinaryimpl.cpp
     hexbinary_streambuf.cpp
@@ -39,10 +38,11 @@
     collectionimpl.cpp
     options.cpp
     functionimpl.cpp
-    storeiteratorimpl.cpp
-    vectoriterator.cpp
-    iterator_singleton.cpp
     serialization_callback.cpp
+    item_iter_singleton.cpp
+    item_iter_vector.cpp
+    item_iter_store.cpp
+    item_iter_query_result.cpp
     item_seq_vector.cpp
     item_seq_singleton.cpp
     item_seq_invoke.cpp

=== 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 @@
 #include "api/unmarshaller.h"
 #include "api/zorbaimpl.h"
 #include "api/xqueryimpl.h"
-#include "api/resultiteratorimpl.h"
-#include "api/storeiteratorimpl.h"
-//#include "api/item_iter_query_result.h"
-//#include "api/item_iter_store.h"
+#include "api/item_iter_query_result.h"
+#include "api/item_iter_store.h"
 #include "api/dynamiccontextimpl.h"
 
 #include "compiler/parser/query_loc.h"

=== 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 @@
 
 #include "api/zorbaimpl.h"
 #include "api/serialization/serializer.h"
-#include "api/storeiteratorimpl.h"
-#include "api/iterator_singleton.h"
+#include "api/item_iter_store.h"
+#include "api/item_iter_singleton.h"
 #include "api/unmarshaller.h"
 
 #include "store/api/item.h"

=== 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 @@
 
 #include "system/globalenv.h"
 
-#include "api/resultiteratorimpl.h"
+#include "api/item_iter_query_result.h"
 #include "api/unmarshaller.h"
 #include "api/xqueryimpl.h"
 #include "api/zorbaimpl.h"

=== 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 @@
  */
 #include "stdafx.h"
 
-#include "api/iterator_singleton.h"
-
 #include <zorba/item.h>
 
 #include "api/zorbaimpl.h"
+#include "api/item_iter_singleton.h"
 
 #include "system/globalenv.h"
 

=== 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 @@
  */
 #include "stdafx.h"
 
-#include "api/storeiteratorimpl.h"
-
 #include <zorba/item.h>
 
 #include "system/globalenv.h"
 
+#include "api/item_iter_store.h"
 #include "api/zorbaimpl.h"
 
 #include "diagnostics/xquery_diagnostics.h"
@@ -73,7 +72,7 @@
 
 ********************************************************************************/
 StoreIteratorImpl::StoreIteratorImpl(
-    store::Iterator_t aIter,
+    const store::Iterator_t& aIter,
     DiagnosticHandler* aDiagnosticHandler)
   :
   theIterator(aIter),

=== 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 @@
   friend class DynamicContextImpl;
 
 protected:
-  store::Iterator_t  theIterator; 
-  DiagnosticHandler* theDiagnosticHandler;
-  bool               theOwnDiagnosticHandler;
-  bool               theIsOpen;     
-  bool               theHaveLock;
+  store::Iterator_t   theIterator; 
+  DiagnosticHandler * theDiagnosticHandler;
+  bool                theOwnDiagnosticHandler;
+  bool                theIsOpen;     
+  bool                theHaveLock;
     
-  StoreIteratorImpl(store::Iterator_t, DiagnosticHandler*);
-
 public:
+  StoreIteratorImpl(const store::Iterator_t&, DiagnosticHandler*);
+
   virtual ~StoreIteratorImpl();
     
   virtual void open();

=== 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 @@
  */
 #include "stdafx.h"
 
-#include "api/vectoriterator.h"
-
 #include <zorba/item.h>
 
+#include "api/item_iter_vector.h"
 #include "api/zorbaimpl.h"
 
-#include "system/globalenv.h"
-
 #include "diagnostics/xquery_diagnostics.h"
 
 #include "store/api/item.h"
-#include "store/api/iterator.h"
-#include "store/api/store.h"
 
 namespace zorba {
 

=== 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 @@
   friend class Item;
 
 protected:
-  std::vector<store::Item_t>           theVector;
-  std::vector<store::Item_t>::iterator theIter;
-  DiagnosticHandler*                   theDiagnosticHandler;
-  bool                                 theIsOpen;     
+  std::vector<store::Item_t>            theVector;
+  std::vector<store::Item_t>::iterator  theIter;
+  DiagnosticHandler                   * theDiagnosticHandler;
+  bool                                  theIsOpen;     
 
 public:
   VectorIterator(const std::vector<store::Item_t>&, DiagnosticHandler*);

=== 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 @@
 #include "api/xqueryimpl.h"
 #include "api/item_seq_invoke.h"
 #include "api/staticcollectionmanagerimpl.h"
-#include "api/vectoriterator.h"
+#include "api/item_iter_vector.h"
 
 #include "context/static_context.h"
 #include "context/static_context_consts.h"

=== 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 @@
 #include <zorba/iterator.h>
 #include "api/staticcontextimpl.h"
 #include "api/dynamiccontextimpl.h"
-#include "api/storeiteratorimpl.h"
+#include "api/item_iter_store.h"
 #include "api/collectionimpl.h"
 #include "store/api/collection.h"
 

=== 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 @@
 
 #include "api/staticcontextimpl.h"
 #include "api/dynamiccontextimpl.h"
-#include "api/resultiteratorimpl.h"
+#include "api/item_iter_query_result.h"
 #include "api/unmarshaller.h"
 #include "api/serialization/serializer.h"
 #include "api/serialization/serializable.h"
@@ -47,7 +47,7 @@
 #include "api/serializerimpl.h"
 #include "api/auditimpl.h"
 #include "api/staticcollectionmanagerimpl.h"
-#include "api/vectoriterator.h"
+#include "api/item_iter_vector.h"
 
 #include "context/static_context.h"
 #include "context/dynamic_context.h"

=== 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 @@
 #include "api/itemfactoryimpl.h"
 #include "api/unmarshaller.h"
 #include "api/xmldatamanagerimpl.h"
-#include "api/vectoriterator.h"
+#include "api/item_iter_vector.h"
 #include "api/auditimpl.h"
 
 #include "zorbautils/fatal.h"

=== 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 @@
 
 #include "api/unmarshaller.h"
 #include "api/auditimpl.h"
-
 #include "api/uri_resolver_wrappers.h"
 
 #include "diagnostics/xquery_diagnostics.h"
@@ -1420,6 +1419,7 @@
   compute_base_uri();
 }
 
+
 /***************************************************************************//**
   Base Uri Computation
 
@@ -1511,7 +1511,8 @@
     if (found)
     {
       URI base(entityUri);
-      if (base.is_absolute()) {
+      if (base.is_absolute())
+      {
         URI resolvedURI(base, userBaseUri);
         theBaseUriInfo->theBaseUri = resolvedURI.toString();
         theBaseUriInfo->theHaveBaseUri = true;
@@ -1981,6 +1982,7 @@
 #endif
 }
 
+
 /////////////////////////////////////////////////////////////////////////////////
 //                                                                             //
 //  Type Manager                                                               //
@@ -2756,8 +2758,7 @@
 /***************************************************************************//**
   Find all the in-scope and non-disabled functions in this sctx and its ancestors.
 ********************************************************************************/
-void static_context::get_functions(
-    std::vector<function *>& functions) const
+void static_context::get_functions(std::vector<function *>& functions) const
 {
   std::vector<function*> disabled;
   std::vector<zstring> importedBuiltinModules;
@@ -2915,8 +2916,8 @@
 
   if (theFunctionArityMap != NULL && theFunctionArityMap->get(qname2, fv))
   {
-    ulong numFunctions = (ulong)fv->size();
-    for (ulong i = 0; i < numFunctions; ++i)
+    csize numFunctions = fv->size();
+    for (csize i = 0; i < numFunctions; ++i)
     {
       if (!(*fv)[i].theIsDisabled)
         functions.push_back((*fv)[i].theFunction);

=== 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 @@
   store::Item_t       theDoc;
 
   UpdCreateDocument(
-        PULImpl* pul,
-        const QueryLoc*,
-        const store::Item_t& uri,
-        store::Item_t& doc
-        );
+      PULImpl* pul,
+      const QueryLoc*,
+      const store::Item_t& uri,
+      store::Item_t& doc);
 
 public:
   store::UpdateConsts::UpdPrimKind getKind() const