zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #05952
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/96319
bug fixes: some methods in atomic_item.h should have been virtual + use myChild local var in children iterators"
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/96319
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
=== modified file 'src/diagnostics/diagnostic_en.xml'
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
=== modified file 'src/store/naive/atomic_items.cpp'
=== modified file 'src/store/naive/atomic_items.h'
--- src/store/naive/atomic_items.h 2012-02-29 17:15:09 +0000
+++ src/store/naive/atomic_items.h 2012-03-07 10:31:37 +0000
@@ -1427,6 +1427,7 @@
********************************************************************************/
class IntegerItem : public AtomicItem
{
+<<<<<<< TREE
protected:
IntegerItem() {}
@@ -1452,6 +1453,25 @@
********************************************************************************/
class IntegerItemImpl : public IntegerItem
{
+=======
+protected:
+ IntegerItem() {}
+
+public:
+ virtual xs_decimal getDecimalValue() const = 0;
+ virtual xs_integer getIntegerValue() const = 0;
+ virtual xs_long getLongValue() const = 0;
+
+ bool isNaN() const { return false; }
+};
+
+
+/*******************************************************************************
+ class IntegerItemImpl
+********************************************************************************/
+class IntegerItemImpl : public IntegerItem
+{
+>>>>>>> MERGE-SOURCE
friend class BasicItemFactory;
friend class AtomicItem;
@@ -1467,6 +1487,7 @@
xs_decimal getDecimalValue() const;
xs_integer getIntegerValue() const { return theValue; }
+<<<<<<< TREE
xs_long getLongValue() const;
xs_nonNegativeInteger getUnsignedIntegerValue() const { return theValue; }
@@ -1477,6 +1498,20 @@
virtual store::SchemaTypeCode getTypeCode() const { return store::XS_INTEGER; }
virtual store::Item* getType() const;
+=======
+ xs_long getLongValue() const;
+
+ zstring getStringValue() const;
+
+ void getStringValue2(zstring&) const;
+
+ void appendStringValue(zstring&) const;
+
+ store::SchemaTypeCode getTypeCode() const { return store::XS_INTEGER; }
+
+ store::Item* getType() const;
+
+>>>>>>> MERGE-SOURCE
uint32_t hash(long = 0, const XQPCollator* aCollation = 0) const;
long compare(
@@ -1489,11 +1524,17 @@
long timezone = 0,
const XQPCollator* aCollation = 0) const;
+<<<<<<< TREE
bool getEBV() const;
bool isNaN() const { return false; }
virtual zstring show() const;
+=======
+ bool getEBV() const;
+
+ zstring show() const;
+>>>>>>> MERGE-SOURCE
};
@@ -1512,6 +1553,7 @@
NonPositiveIntegerItem() {}
public:
+<<<<<<< TREE
// inherited
xs_decimal getDecimalValue() const;
xs_integer getIntegerValue() const;
@@ -1540,6 +1582,42 @@
const store::Item* other,
long timezone = 0,
const XQPCollator* aCollation = 0) const;
+=======
+ xs_decimal getDecimalValue() const;
+
+ xs_integer getIntegerValue() const;
+
+ xs_long getLongValue() const;
+
+ zstring getStringValue() const;
+
+ void getStringValue2(zstring& val) const;
+
+ void appendStringValue(zstring&) const;
+
+ virtual store::SchemaTypeCode getTypeCode() const
+ {
+ return store::XS_NON_POSITIVE_INTEGER;
+ }
+
+ virtual store::Item* getType() const;
+
+ uint32_t hash(long = 0, const XQPCollator* aCollation = 0) const;
+
+ long compare(
+ const Item* other,
+ long timezone = 0,
+ const XQPCollator* aCollation = 0) const;
+
+ bool equals(
+ const store::Item* other,
+ long timezone = 0,
+ const XQPCollator* aCollation = 0) const;
+
+ bool getEBV() const;
+
+ virtual zstring show() const;
+>>>>>>> MERGE-SOURCE
};
@@ -1579,6 +1657,7 @@
NonNegativeIntegerItem() {}
public:
+<<<<<<< TREE
// inherited
xs_decimal getDecimalValue() const;
xs_integer getIntegerValue() const;
@@ -1609,6 +1688,44 @@
const store::Item* other,
long timezone = 0,
const XQPCollator* aCollation = 0) const;
+=======
+ xs_decimal getDecimalValue() const;
+
+ xs_integer getIntegerValue() const;
+
+ xs_long getLongValue() const;
+
+ xs_nonNegativeInteger getUnsignedIntegerValue() const { return theValue; }
+
+ zstring getStringValue() const;
+
+ void getStringValue2(zstring& val) const;
+
+ void appendStringValue(zstring&) const;
+
+ virtual store::SchemaTypeCode getTypeCode() const
+ {
+ return store::XS_NON_NEGATIVE_INTEGER;
+ }
+
+ virtual store::Item* getType() const;
+
+ uint32_t hash(long = 0, const XQPCollator* aCollation = 0) const;
+
+ long compare(
+ const Item* other,
+ long timezone = 0,
+ const XQPCollator* aCollation = 0) const;
+
+ bool equals(
+ const store::Item* other,
+ long timezone = 0,
+ const XQPCollator* aCollation = 0) const;
+
+ bool getEBV() const;
+
+ virtual zstring show() const;
+>>>>>>> MERGE-SOURCE
};
@@ -1620,13 +1737,17 @@
friend class BasicItemFactory;
protected:
+<<<<<<< TREE
PositiveIntegerItem(const xs_positiveInteger& aValue) : NonNegativeIntegerItem(aValue) { }
+=======
+ PositiveIntegerItem(const xs_positiveInteger& aValue)
+ :
+ NonNegativeIntegerItem(aValue) { }
+>>>>>>> MERGE-SOURCE
PositiveIntegerItem() {}
public:
- xs_uinteger getUnsignedIntegerValue() const { return theValue; }
-
store::SchemaTypeCode getTypeCode() const { return store::XS_POSITIVE_INTEGER; }
store::Item* getType() const;
=== modified file 'src/store/naive/node_iterators.h'
--- src/store/naive/node_iterators.h 2012-02-28 20:45:43 +0000
+++ src/store/naive/node_iterators.h 2012-03-07 10:31:37 +0000
@@ -69,7 +69,7 @@
static_cast<ConnectorNode*>(*theStart)->getNode() :
(*theStart));
- while ((*theStart) != child)
+ while (myChild != child)
{
++theStart;
@@ -183,7 +183,7 @@
static_cast<ConnectorNode*>(*theStart)->getNode() :
(*theStart));
- while ((*theStart) != child)
+ while (myChild != child)
{
++theStart;
@@ -211,7 +211,7 @@
static_cast<ConnectorNode*>(*theStart)->getNode() :
(*theStart));
- while ((*theStart) != child)
+ while (myChild != child)
{
++theStart;
Follow ups
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: noreply, 2012-03-07
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Zorba Build Bot, 2012-03-07
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Zorba Build Bot, 2012-03-07
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Markos Zaharioudakis, 2012-03-07
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Zorba Build Bot, 2012-03-07
-
Re: [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Zorba Build Bot, 2012-03-07
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Markos Zaharioudakis, 2012-03-07
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Zorba Build Bot, 2012-03-07
-
Re: [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Zorba Build Bot, 2012-03-07
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Markos Zaharioudakis, 2012-03-07
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Zorba Build Bot, 2012-03-07
-
Re: [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Zorba Build Bot, 2012-03-07
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Zorba Build Bot, 2012-03-07
-
[Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Markos Zaharioudakis, 2012-03-07
-
Re: [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
From: Markos Zaharioudakis, 2012-03-07