Merge lp:~gislenius/zorba/xs_integer into lp:zorba

[Ghislain Fourny]

Replacing ulong positions with xs_integer for positions in collections.

Replacing ulong positions with xs_integer.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xs_integer-2012-02-16T15-16-03.605Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job xs_integer-2012-02-16T15-16-03.605Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xs_integer-2012-02-16T22-27-57.89Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job xs_integer-2012-02-16T22-27-57.89Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 2 Pending.

[Ghislain Fourny (gislenius)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xs_integer-2012-02-28T15-13-17.766Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job xs_integer-2012-02-28T15-13-17.766Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp	2012-02-15 10:25:02 +0000
+++ src/store/naive/node_items.cpp	2012-02-16 15:02:20 +0000
@@ -104,7 +104,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void XmlTree::setCollection(SimpleCollection* collection, ulong pos)
+void XmlTree::setCollection(SimpleCollection* collection, xs_integer pos)
 {
   ZORBA_ASSERT(collection == NULL || theCollection == NULL);
 

=== modified file 'src/store/naive/node_items.h'
--- src/store/naive/node_items.h	2012-01-26 19:56:14 +0000
+++ src/store/naive/node_items.h	2012-02-16 15:02:20 +0000
@@ -178,7 +178,7 @@
   SYNC_CODE(mutable RCLock  theRCLock;)
 
   ulong                     theId;
-  ulong                     thePos;
+  xs_integer                thePos;
 
   SimpleCollection        * theCollection;
 
@@ -223,11 +223,11 @@
 
   const SimpleCollection* getCollection() const { return theCollection; }
 
-  void setCollection(SimpleCollection* coll, ulong pos);
-
-  void setPosition(ulong pos) { thePos = pos; }
-
-  ulong getPosition() const { return thePos; }
+  void setCollection(SimpleCollection* coll, xs_integer pos);
+
+  void setPosition(xs_integer pos) { thePos = pos; }
+
+  xs_integer getPosition() const { return thePos; }
 
   XmlNode* getRoot() const { return theRootNode; }
 
@@ -516,7 +516,7 @@
 
   XmlNode* getRoot() const { return getTree()->getRoot(); }
 
-  void setCollection(SimpleCollection* coll, ulong pos)
+  void setCollection(SimpleCollection* coll, xs_integer pos)
   {
     assert(!isConnectorNode());
     getTree()->setCollection(coll, pos);
@@ -1582,8 +1582,8 @@
     }
     else
     {
-      ulong pos1 = this->getTree()->getPosition();
-      ulong pos2 = other->getTree()->getPosition();
+      xs_integer pos1 = this->getTree()->getPosition();
+      xs_integer pos2 = other->getTree()->getPosition();
 
       if (pos1 < pos2)
         return -1;
@@ -1629,8 +1629,8 @@
     }
     else
     {
-      ulong pos1 = this->getTree()->getPosition();
-      ulong pos2 = other->getTree()->getPosition();
+      xs_integer pos1 = this->getTree()->getPosition();
+      xs_integer pos2 = other->getTree()->getPosition();
 
       if (pos1 < pos2)
         return -1;

=== modified file 'src/store/naive/pul_primitives.h'
--- src/store/naive/pul_primitives.h	2011-12-21 14:40:33 +0000
+++ src/store/naive/pul_primitives.h	2012-02-16 15:02:20 +0000
@@ -1112,7 +1112,7 @@
 
 protected:
   store::Item_t theFirstNode;
-  ulong         theFirstPos;
+  xs_integer    theFirstPos;
 
   UpdInsertBeforeIntoCollection(
         CollectionPul* pul,
@@ -1146,7 +1146,7 @@
 
 protected:
   store::Item_t theFirstNode;
-  ulong         theFirstPos;
+  xs_integer    theFirstPos;
 
   UpdInsertAfterIntoCollection(
         CollectionPul* pul,

=== modified file 'src/store/naive/simple_collection.cpp'
--- src/store/naive/simple_collection.cpp	2012-02-15 10:25:02 +0000
+++ src/store/naive/simple_collection.cpp	2012-02-16 15:02:20 +0000
@@ -141,7 +141,7 @@
   method raises an error. The moethod returns the position occupied by the first
   new node after the insertion is done.
 ********************************************************************************/
-ulong SimpleCollection::addNodes(
+xs_integer SimpleCollection::addNodes(
     std::vector<store::Item_t>& nodes,
     const store::Item* targetNode,
     bool before)

=== modified file 'src/store/naive/simple_collection.h'
--- src/store/naive/simple_collection.h	2012-01-15 09:18:22 +0000
+++ src/store/naive/simple_collection.h	2012-02-16 15:02:20 +0000
@@ -109,7 +109,7 @@
         xs_integer position = -1);
 
   // virtual to allow extension by subclasses
-  virtual ulong addNodes(
+  virtual xs_integer addNodes(
         std::vector<store::Item_t>& nodes,
         const store::Item* aTargetNode,
         bool before);