zorba-coders team mailing list archive
-
zorba-coders team
-
Mailing list archive
-
Message #00030
[Merge] lp:~ceejatec/zorba/sf-trunk into lp:zorba
Chris Hillery has proposed merging lp:~ceejatec/zorba/sf-trunk into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~ceejatec/zorba/sf-trunk/+merge/76344
Merge of Sourceforge changes through r12117.
--
https://code.launchpad.net/~ceejatec/zorba/sf-trunk/+merge/76344
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/expression/expr.h'
--- src/compiler/expression/expr.h 2011-09-16 19:36:18 +0000
+++ src/compiler/expression/expr.h 2011-09-21 07:55:22 +0000
@@ -199,8 +199,6 @@
public:
const namespace_context* getNSCtx() const;
-
- void compute_scripting_kind() = 0;
};
=== modified file 'src/compiler/expression/expr_iter.cpp'
--- src/compiler/expression/expr_iter.cpp 2011-09-16 19:36:18 +0000
+++ src/compiler/expression/expr_iter.cpp 2011-09-21 07:55:22 +0000
@@ -677,6 +677,7 @@
break;
}
+#ifdef ZORBA_WITH_DEBUGGER
case debugger_expr_kind:
{
debugger_expr* debuggerExpr = static_cast<debugger_expr*>(theExpr);
@@ -695,6 +696,7 @@
EXPR_ITER_END();
break;
}
+#endif
case function_trace_expr_kind:
{
=== modified file 'src/store/api/shared_types.h'
--- src/store/api/shared_types.h 2011-09-12 22:42:28 +0000
+++ src/store/api/shared_types.h 2011-09-21 07:55:22 +0000
@@ -90,7 +90,7 @@
class ICChecker;
-struct Annotation;
+class Annotation;
typedef rchandle<Annotation> Annotation_t;
=== modified file 'src/store/naive/pul_primitives.cpp'
--- src/store/naive/pul_primitives.cpp 2011-09-13 13:33:51 +0000
+++ src/store/naive/pul_primitives.cpp 2011-09-21 07:55:22 +0000
@@ -182,11 +182,11 @@
{
theSibling.transfer(sibling);
- uint64_t numNewChildren = 0;
- uint64_t numChildren = (uint64_t)children.size();
+ size_t numNewChildren = 0;
+ size_t numChildren = children.size();
theNewChildren.resize(numChildren);
- for (uint64_t i = 0; i < numChildren; i++)
+ for (size_t i = 0; i < numChildren; i++)
{
if (i > 0 &&
children[i]->getNodeKind() == store::StoreConsts::textNode &&
@@ -286,10 +286,11 @@
UpdatePrimitive(pul, aLoc, target),
theNumApplied(0)
{
- uint64_t numAttrs = (uint64_t)attrs.size();
+ size_t numAttrs = attrs.size();
theNewAttrs.resize(numAttrs);
- for (uint64_t i = 0; i < numAttrs; i++)
+ for (size_t i = 0; i < numAttrs; i++) {
theNewAttrs[i].transfer(attrs[i]);
+ }
}
@@ -335,10 +336,11 @@
{
theAttr.transfer(attr);
- uint64_t numAttrs = (uint64_t)newAttrs.size();
+ size_t numAttrs = (uint64_t)newAttrs.size();
theNewAttrs.resize(numAttrs);
- for (uint64_t i = 0; i < numAttrs; i++)
- theNewAttrs[i].transfer(newAttrs[i]);
+ for (size_t i = 0; i < numAttrs; i++) {
+ theNewAttrs[i].transfer(newAttrs[i]);
+ }
}
@@ -737,11 +739,12 @@
{
theName.transfer(name);
- uint64_t numNodes = (uint64_t)nodes.size();
+ size_t numNodes = (uint64_t)nodes.size();
theNodes.resize(numNodes);
- for (uint64_t i = 0; i < numNodes; ++i)
+ for (size_t i = 0; i < numNodes; ++i) {
theNodes[i].transfer(nodes[i]);
+ }
}
@@ -758,11 +761,12 @@
{
theName.transfer(name);
- uint64_t numNodes = (uint64_t)nodes.size();
+ size_t numNodes = (uint64_t)nodes.size();
theNodes.resize(numNodes);
- for (uint64_t i = 0; i < numNodes; ++i)
+ for (size_t i = 0; i < numNodes; ++i) {
theNodes[i].transfer(nodes[i]);
+ }
}
@@ -873,9 +877,8 @@
theIsApplied = true;
- uint64_t numNodes = (uint64_t)theNodes.size();
- for (uint64_t i = 0; i < numNodes; ++i)
- {
+ size_t numNodes = (uint64_t)theNodes.size();
+ for (size_t i = 0; i < numNodes; ++i) {
lColl->addNode(theNodes[i], -1);
++theNumApplied;
}
@@ -891,8 +894,7 @@
uint64_t lastPos;
try {
lastPos = to_xs_unsignedLong(lColl->size()) - 1;
- } catch (std::range_error& e)
- {
+ } catch (std::range_error& e) {
throw ZORBA_EXCEPTION(
zerr::ZSTR0060_RANGE_EXCEPTION,
ERROR_PARAMS(
@@ -925,9 +927,8 @@
theCollectionPul->setAdjustTreePositions();
- uint64_t numNodes = (uint64_t)theNodes.size();
- for (uint64_t i = 0; i < numNodes; ++i)
- {
+ size_t numNodes = (uint64_t)theNodes.size();
+ for (size_t i = 0; i < numNodes; ++i) {
lColl->addNode(theNodes[i], i);
++theNumApplied;
}
@@ -940,8 +941,7 @@
(GET_STORE().getCollection(theName, theDynamicCollection).getp());
assert(lColl);
- for (uint64_t i = 0; i < theNumApplied; ++i)
- {
+ for (size_t i = 0; i < theNumApplied; ++i) {
ZORBA_ASSERT(theNodes[i] == lColl->nodeAt(0));
lColl->removeNode((uint64_t)0);
@@ -960,9 +960,8 @@
theIsApplied = true;
- uint64_t numNodes = (uint64_t)theNodes.size();
- for (uint64_t i = 0; i < numNodes; ++i)
- {
+ size_t numNodes = (uint64_t)theNodes.size();
+ for (size_t i = 0; i < numNodes; ++i) {
lColl->addNode(theNodes[i], -1);
}
}
@@ -1072,8 +1071,7 @@
uint64_t size;
try {
size = to_xs_unsignedLong(lColl->size());
- } catch (std::range_error& e)
- {
+ } catch (std::range_error& e) {
throw ZORBA_EXCEPTION(
zerr::ZSTR0060_RANGE_EXCEPTION,
ERROR_PARAMS(
@@ -1087,26 +1085,23 @@
bool isLast = theIsLast;
- if (theIsLast)
- {
- for (size_t i = numNodes; i > 0; --i)
- {
- if (theNodes[i-1] != lColl->nodeAt(size - i))
- {
+ if (theIsLast) {
+ for (size_t i = numNodes; i > 0; --i) {
+ if (theNodes[i-1] != lColl->nodeAt(size - i)) {
isLast = false;
break;
}
}
}
- if (!isLast)
+ if (!isLast) {
theCollectionPul->setAdjustTreePositions();
+ }
theFound.resize(numNodes);
thePositions.resize(numNodes);
- for (uint64_t i = 0; i < numNodes; ++i)
- {
+ for (size_t i = 0; i < numNodes; ++i) {
theFound[i] = lColl->removeNode(theNodes[i], thePositions[i]);
++theNumApplied;
}
@@ -1118,10 +1113,8 @@
(GET_STORE().getCollection(theName, theDynamicCollection).getp());
assert(lColl);
- for (uint64_t i = 0; i < theNumApplied; ++i)
- {
- if (theFound[i])
- {
+ for (size_t i = 0; i < theNumApplied; ++i) {
+ if (theFound[i]) {
lColl->addNode(theNodes[i], thePositions[i]);
}
}
=== modified file 'test/rbkt/Scripts/w3c/XQTS.xml'
--- test/rbkt/Scripts/w3c/XQTS.xml 2011-09-13 13:33:51 +0000
+++ test/rbkt/Scripts/w3c/XQTS.xml 2011-09-21 07:55:22 +0000
@@ -62,7 +62,9 @@
name="serializationInvocation"
value="The result of an XQuery program can be serialized via the zorba::XQuery::execute methods (see http://www.zorba-xquery.com/site2/doc/latest/cxx/html/classzorba_1_1XQuery.html). Sequence of items can be serialized via the zorba::Serializer::serialize method (see http://www.zorba-xquery.com/site2/doc/latest/cxx/html/classzorba_1_1Serializer.html)."/>
- <implementation-defined-item name="serializationDefaults" value="Serialization Feature is supported. Implicit values are: byte-order-mark = no, encoding = UTF-8, media-type = '', normalization-form = '', omix-xml-declaration = no, standalone = omit, version = '1.0', method = xml, doctype-system = '', doctype-public = '', cdata-section-elements = empty list, include-content-type = no, undeclare-prefixes = no, indent = no"/>
+ <implementation-defined-item
+ name="serializationDefaults"
+ value="Serialization Feature is supported. Implicit values are: byte-order-mark = no, encoding = UTF-8, media-type = '', normalization-form = '', omix-xml-declaration = no, standalone = omit, version = '1.0', method = xml, doctype-system = '', doctype-public = '', cdata-section-elements = empty list, include-content-type = no, undeclare-prefixes = no, indent = no"/>
<implementation-defined-item
name="externalFunctionCall"
@@ -74,7 +76,9 @@
name="traceDestination"
value="By default, it is std:cerr. Users can modify this via the StaticContext::setTraceStream method."/>
- <implementation-defined-item name="integerOperations" value="Zorba raises [err:FOAR0002]"/>
+ <implementation-defined-item
+ name="integerOperations"
+ value="Zorba raises [err:FOAR0002]"/>
<implementation-defined-item name="decimalDigits" value=""/>
Follow ups
