[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
fixed implementation of xqdoc functions
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549
fixed implementation of xqdoc functions
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-09-26 17:09:11 +
+++ ChangeLog 2012-09-26 21:04:24 +
@@ -45,6 +45,7 @@
variables)
* Fixed bug #899366 (enforce the type declaration of a window variable)
* Now using native UUID libraries.
+ * Fixed bug in implementation of xqdoc functions
* Fixed bug #1034942 (improper variable inlining inside general flwor expr)
* Fixed bug #1024892 (index declaration references udf declared after the index)
* Fixed bug #1038410 (Memory leaks in parser, trace iterator, and general index)
=== modified file 'src/compiler/expression/var_expr.cpp'
--- src/compiler/expression/var_expr.cpp 2012-09-19 18:18:02 +
+++ src/compiler/expression/var_expr.cpp 2012-09-26 21:04:24 +
@@ -126,6 +126,7 @@
if (theVarInfo)
{
assert(theVarKind == prolog_var);
+assert(theVarInfo-getName() != NULL);
theVarInfo-clearVar();
}
}
=== modified file 'src/runtime/xqdoc/xqdoc_impl.cpp'
--- src/runtime/xqdoc/xqdoc_impl.cpp 2012-09-17 00:36:37 +
+++ src/runtime/xqdoc/xqdoc_impl.cpp 2012-09-26 21:04:24 +
@@ -27,6 +27,7 @@
#include system/globalenv.h
#include zorbatypes/URI.h
#include diagnostics/dict.h
+#include diagnostics/util_macros.h
#include context/static_context.h
#include context/uri_resolver.h
@@ -57,13 +58,6 @@
std::istream* lFile;
zstring lErrorMessage;
- // setup a new CompilerCB and a new XQueryCompiler
- CompilerCB lCompilerCB(*planState.theCompilerCB);
- lCompilerCB.theRootSctx = GENV.getRootStaticContext().create_child_context();
- (planState.theCompilerCB-theSctxMap)[1] = lCompilerCB.theRootSctx;
-
- XQueryCompiler lCompiler(lCompilerCB);
-
PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
@@ -76,18 +70,17 @@
// resolve the uri in the surrounding static context and use
// the URI resolver to retrieve the module
lSctx = theSctx;
+
lItem-getStringValue2(strval);
lURI = lSctx-resolve_relative_uri(strval);
lResource = lSctx-resolve_uri(lURI, internal::EntityData::MODULE, lErrorMessage);
+
lStream = static_castinternal::StreamResource*(lResource.get());
if ( ! lStream )
{
-throw XQUERY_EXCEPTION(
- err::XQST0046,
- ERROR_PARAMS( lURI, ZED( ModuleNotFound ) ),
- ERROR_LOC( loc )
-);
+RAISE_ERROR(err::XQST0046, loc, ERROR_PARAMS(lURI, ZED(ModuleNotFound)));
}
+
lFile = lStream-getStream();
// now, do the real work
@@ -95,6 +88,11 @@
{
try
{
+ // setup a new CompilerCB and a new XQueryCompiler
+ CompilerCB lCompilerCB(*planState.theCompilerCB);
+
+ XQueryCompiler lCompiler(lCompilerCB);
+
// retrieve the xqdoc elements
lCompiler.xqdoc(*lFile,
lFileName,
@@ -111,11 +109,7 @@
}
else
{
-throw XQUERY_EXCEPTION(
- err::XQST0046,
- ERROR_PARAMS( lURI, ZED( ModuleNotFound ) ),
- ERROR_LOC( loc )
-);
+RAISE_ERROR(err::XQST0046, loc, ERROR_PARAMS(lURI, ZED(ModuleNotFound)));
}
STACK_END(state);
@@ -131,15 +125,6 @@
store::Item_t lItem;
zstring lFileName;
- // setup a new CompilerCB and a new XQueryCompiler
- CompilerCB lCompilerCB(*planState.theCompilerCB);
- lCompilerCB.theRootSctx = GENV.getRootStaticContext().create_child_context();
- (planState.theCompilerCB-theSctxMap)[1] = lCompilerCB.theRootSctx;
-
- // the XQueryCompiler's constructor destroys the existing type manager
- // in the static context. Hence, we create a new one
- XQueryCompiler lCompiler(lCompilerCB);
-
PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
@@ -150,6 +135,13 @@
{
std::istringstream is(lItem-getStringValue().c_str());
+// setup a new CompilerCB and a new XQueryCompiler
+CompilerCB lCompilerCB(*planState.theCompilerCB);
+
+// the XQueryCompiler's constructor destroys the existing type manager
+// in the static context. Hence, we create a new one
+XQueryCompiler lCompiler(lCompilerCB);
+
// retrieve the xqdoc elements
lCompiler.xqdoc(is,
lFileName,
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-26T21-05-48.177Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-09-26T21-05-48.177Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126549 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Commit message: Handle materialize clause in flwor optimization rules Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Handle materialize clause in flwor optimization rules -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-25T08-54-52.532Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job markos-scratch-2012-09-25T08-54-52.532Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-25T09-25-49.857Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-09-25T09-25-49.857Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126196 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Commit message: Optimized runtime group iterator based on latest group-by semntics. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 Optimized runtime group iterator based on latest group-by semntics. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-26T05-38-00.131Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/126378 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Description changed to: Optimize positional predicates involving inequality (convert them to subsequence) Optimize positional predicate that is in CNF with other predicates For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Commit Message changed to: Optimize positional predicates involving inequality (convert them to subsequence) Optimize positional predicate that is in CNF with other predicates For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-24T16-58-00.033Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-09-24T16-58-00.033Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Commit message: Optimize positional predicates involving inequality (convert them to subsequence) Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 Optimize positional predicates involving inequality (convert them to subsequence) -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125880 Your team Zorba Coders is subscribed to branch lp:zorba. === added file 'test/rbkt/Queries/zorba/optim/pos_pred11.xq' --- test/rbkt/Queries/zorba/optim/pos_pred11.xq 1970-01-01 00:00:00 + +++ test/rbkt/Queries/zorba/optim/pos_pred11.xq 2012-09-23 14:06:22 + @@ -0,0 +1,3 @@ +variable $doc := doca/a/a/a/a//doc; + +($doc/a)[if (position() 3) then position() else 1] -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Commit message: For non-mutable global variables, assign a type based on their initializing expr. Early optimization of positional predicates to sequence-point-access expressions: now done at translation time, if possible. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 For non-mutable global variables, assign a type based on their initializing expr. Early optimization of positional predicates to sequence-point-access expressions: now done at translation time, if possible. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-20T14-04-00.583Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job markos-scratch-2012-09-20T14-04-00.583Z is finished. The final status was: 2 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-20T17-20-03.596Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-09-20T17-20-03.596Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125435 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-18T19-47-54.294Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-18T21-47-59.121Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-09-18T21-47-59.121Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/125018 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [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/124712 Fixed bug #866994 (a better error message when collection iterator not open) -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-09-17T15-37-23.082Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-09-17T15-37-23.082Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [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/124792 Fixed bug #1039254 (allow empty sequence as position value in positional LET var iterator) -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-09-17T20-48-51.181Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [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/122068
rchandle cleanup
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/122068
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/api/item.cpp'
--- src/api/item.cpp 2012-08-29 11:12:58 +
+++ src/api/item.cpp 2012-08-30 13:56:23 +
@@ -486,6 +486,7 @@
return store::StoreConsts::jsonItem;
}
+
uint64_t
Item::getArraySize() const
{
@@ -494,9 +495,10 @@
return to_xs_long(m_item-getArraySize());
ITEM_CATCH
- return NULL;
+ return 0;
}
+
Item
Item::getArrayValue(uint32_t aIndex) const
{
@@ -508,6 +510,7 @@
return Item();
}
+
Iterator_t
Item::getObjectKeys() const
{
@@ -520,6 +523,7 @@
return NULL;
}
+
Item
Item::getObjectValue(String aName) const
{
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2012-08-29 11:12:58 +
+++ src/context/static_context.cpp 2012-08-30 13:56:23 +
@@ -1039,8 +1039,8 @@
else
ar theParent;
-if(theParent)
- theParent-addReference(theParent-getSharedRefCounter() SYNC_PARAM2(theParent-getRCLock()));
+if (theParent)
+ theParent-addReference(SYNC_CODE(theParent-getRCLock()));
}
ar theModuleNamespace;
=== modified file 'src/zorbatypes/rchandle.cpp'
--- src/zorbatypes/rchandle.cpp 2012-08-29 11:12:58 +
+++ src/zorbatypes/rchandle.cpp 2012-08-30 13:56:23 +
@@ -53,17 +53,15 @@
}
-void RCObject::addReference(long* sharedCounter SYNC_PARAM2(RCLock* lock)) const
+void RCObject::addReference(SYNC_CODE(RCLock* lock)) const
{
#if defined WIN32 !defined CYGWIN !defined ZORBA_FOR_ONE_THREAD_ONLY
if(lock)
{
-if (sharedCounter) InterlockedIncrement(sharedCounter);
InterlockedIncrement(theRefCount);
}
else
{
-if (sharedCounter) ++(*sharedCounter);
++theRefCount;
}
@@ -71,7 +69,6 @@
SYNC_CODE(if (lock) lock-acquire());
- if (sharedCounter) ++(*sharedCounter);
++theRefCount;
SYNC_CODE(if (lock) lock-release());
@@ -80,21 +77,12 @@
}
-void RCObject::removeReference(long* sharedCounter SYNC_PARAM2(RCLock* lock))
+void RCObject::removeReference(SYNC_CODE(RCLock* lock))
{
#if defined WIN32 !defined CYGWIN !defined ZORBA_FOR_ONE_THREAD_ONLY
- if(lock)
+ if (lock)
{
-if (sharedCounter)
-{
- InterlockedDecrement(theRefCount);
- if (!InterlockedDecrement(sharedCounter))
- {
-free();
-return;
- }
-}
-else if (!InterlockedDecrement(theRefCount))
+if (!InterlockedDecrement(theRefCount))
{
free();
return;
@@ -102,16 +90,7 @@
}
else
{
-if (sharedCounter)
-{
- --theRefCount;
- if (--(*sharedCounter) == 0)
- {
-free();
-return;
- }
-}
-else if (--theRefCount == 0)
+if (--theRefCount == 0)
{
free();
return;
@@ -122,17 +101,7 @@
SYNC_CODE(if (lock) lock-acquire());
- if (sharedCounter)
- {
---theRefCount;
-if (--(*sharedCounter) == 0)
-{
- SYNC_CODE(if (lock) lock-release());
- free();
- return;
-}
- }
- else if (--theRefCount == 0)
+ if (--theRefCount == 0)
{
SYNC_CODE(if (lock) lock-release());
free();
=== modified file 'src/zorbatypes/rchandle.h'
--- src/zorbatypes/rchandle.h 2012-08-29 11:12:58 +
+++ src/zorbatypes/rchandle.h 2012-08-30 13:56:23 +
@@ -53,7 +53,7 @@
reference count becomes 0.
/
-class ZORBA_DLL_PUBLIC RCObject : public ::zorba::serialization::SerializeBaseClass
+class ZORBA_DLL_PUBLIC RCObject : public serialization::SerializeBaseClass
{
protected:
mutable long theRefCount;
@@ -93,38 +93,70 @@
long getRefCount() const { return theRefCount; }
- void addReference(long* sharedCounter SYNC_PARAM2(RCLock* lock)) const;
+ void addReference(SYNC_CODE(RCLock* lock)) const;
- void removeReference(long* sharedCounter SYNC_PARAM2(RCLock* lock));
+ void removeReference(SYNC_CODE(RCLock* lock));
};
/***
/
-class ZORBA_DLL_PUBLIC SimpleRCObject : public RCObject
+class ZORBA_DLL_PUBLIC SimpleRCObject : public serialization::SerializeBaseClass
{
-public:
- SERIALIZABLE_CLASS(SimpleRCObject)
- SERIALIZABLE_CLASS_CONSTRUCTOR2(SimpleRCObject, RCObject)
- void serialize(::zorba::serialization::Archiver ar);
-
-public:
- SimpleRCObject() : RCObject() { }
-
- SimpleRCObject(const SimpleRCObject rhs) : RCObject(rhs) { }
-
- void free() { delete this; }
-
- long* getSharedRefCounter() const { return NULL; }
+protected:
+
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/122068 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/122068 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/122068 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-08-30T14-43-30.885Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/122068 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-08-30T14-43-30.885Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/122068 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/122068 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/122068 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [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/121819
Fixed bug #866984 (better error message for an eval error)
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/121819
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-08-29 08:20:45 +
+++ ChangeLog 2012-08-29 10:51:54 +
@@ -17,7 +17,8 @@
* Fixed bug #1038410 (Memory leaks in parser, trace iterator, and general index)
* Fixed bug #1039488 (inserting more than one pair at once in a JSON object)
* Fixed bug #1042840 (qname pool free-list corruption)
-
+ * Fixed bug #866984 (better error message for an eval error)
+
version 2.6
New Features:
=== modified file 'src/runtime/eval/eval.cpp'
--- src/runtime/eval/eval.cpp 2012-08-29 08:20:45 +
+++ src/runtime/eval/eval.cpp 2012-08-29 10:51:54 +
@@ -415,7 +415,10 @@
rchandleMainModule mm = ast.dyn_castMainModule();
if (mm == NULL)
-throw XQUERY_EXCEPTION(err::XPST0003, ERROR_LOC(loc));
+ {
+RAISE_ERROR(err::XPST0003, loc,
+ERROR_PARAMS(ZED(XPST0003_ModuleDeclNotInMain)));
+ }
PlanIter_t rootIter = compiler.compile(ast,
false, // do not apply PUL
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/121819 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/121819 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/121819 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-08-29T10-46-45.524Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/121819 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-08-29T10-46-45.524Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/121819 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/121819 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/121819 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/119482 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/119482 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/119482 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-08-14T08-56-03.744Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/119482 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-08-14T08-56-03.744Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/119482 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/119482 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/119482 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114657 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114657 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114657 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-07-12T15-05-12.066Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114657 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-07-12T15-05-12.066Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114657 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114657 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114657 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job markos-scratch-2012-07-11T05-42-58.896Z is finished. The final status was: 7 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-07-11T08-11-03.686Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-07-11T08-11-03.686Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [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/114278 added auditing in zorba cmd. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114278 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'bin/zorbacmd.cpp' --- bin/zorbacmd.cpp 2012-06-28 04:14:03 + +++ bin/zorbacmd.cpp 2012-07-10 21:26:21 + @@ -803,7 +803,9 @@ if (properties.trailingNl()) outputStream std::endl; - + +query-close(); + // stop the execution timer if (doTiming) timing.stopTimer(TimingInfo::EXEC_TIMER, i); -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [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/114297 added auditing in zorba cmd + fixed bug in auditing the parse time -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114297 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'bin/zorbacmd.cpp' --- bin/zorbacmd.cpp 2012-06-28 04:14:03 + +++ bin/zorbacmd.cpp 2012-07-10 23:16:22 + @@ -803,7 +803,9 @@ if (properties.trailingNl()) outputStream std::endl; - + +query-close(); + // stop the execution timer if (doTiming) timing.stopTimer(TimingInfo::EXEC_TIMER, i); -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Commit Message changed to: added auditing in zorba cmd + fixed bug in auditing the parse time For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114297 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114297 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114297 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114297 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114297 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-07-11T00-15-03.097Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114297 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue job markos-scratch-2012-07-11T00-15-03.097Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114297 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114297 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114297 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [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/114336
Avoid (if possible) treat expr for checking that the value of a non-external
global variable conforms to the type declaration of the vatiable
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-07-11 04:46:41 +
+++ ChangeLog 2012-07-11 05:37:40 +
@@ -23,6 +23,8 @@
* Optimized hash function used for nodes (also fixes bug #1010051)
* No more serialization of compiler expressions.
* Big rewrite of plan serializer internals, resulting in big performance improvement.
+ * Avoid (if possible) treat expr for checking that the value of a non-external
+global variable conforms to the type declaration of the vatiable.
Bug Fixes/Other Changes:
* Fixed bug #1002993 (bug during revalidation after update; improper condition
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-07-11 05:28:20 +
+++ src/compiler/translator/translator.cpp 2012-07-11 05:37:40 +
@@ -1923,12 +1923,21 @@
varType = GENV_TYPESYSTEM.ITEM_TYPE_ONE;
}
+ if (initExpr != NULL varType != NULL)
+ {
+initExpr = new treat_expr(theRootSctx,
+ loc,
+ initExpr,
+ varType,
+ TreatIterator::TYPE_MATCH);
+ }
+
expr_t declExpr = new var_decl_expr(theRootSctx, loc, varExpr, initExpr);
stmts.push_back(declExpr);
// check type for vars that are external or have an init expr
- if (varType != NULL (b.is_extern() || b.theExpr != NULL))
+ if (varType != NULL b.is_extern())
{
expr_t getExpr = new fo_expr(theRootSctx, loc, varGet, varExpr);
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-07-11T05-42-58.896Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114336 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114023 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114023 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/114023 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [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/112790
Fixed bug #1018673 + renamed misleading isXXXNode() methods.
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/112790
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/nodes/node_position_impl.cpp'
--- src/runtime/nodes/node_position_impl.cpp 2012-06-28 04:14:03 +
+++ src/runtime/nodes/node_position_impl.cpp 2012-06-29 14:45:27 +
@@ -464,14 +464,14 @@
{
store::Item_t lUri;
- PlanIteratorState *state;
+ PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
consumeNext(lUri, theChildren[0].getp(), planState);
try
{
-GENV_ITEMFACTORY-createBoolean(result, lUri-isAttribute());
+GENV_ITEMFACTORY-createBoolean(result, lUri-isAttributeRef());
}
catch (ZorbaException e)
{
@@ -493,14 +493,14 @@
{
store::Item_t lUri;
- PlanIteratorState *state;
+ PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
consumeNext(lUri, theChildren[0].getp(), planState);
try
{
-GENV_ITEMFACTORY-createBoolean(result, lUri-isComment());
+GENV_ITEMFACTORY-createBoolean(result, lUri-isCommentRef());
}
catch (ZorbaException e)
{
@@ -522,14 +522,14 @@
{
store::Item_t lUri;
- PlanIteratorState *state;
+ PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
consumeNext(lUri, theChildren[0].getp(), planState);
try
{
-GENV_ITEMFACTORY-createBoolean(result, lUri-isDocument());
+GENV_ITEMFACTORY-createBoolean(result, lUri-isDocumentRef());
}
catch (ZorbaException e)
{
@@ -551,14 +551,14 @@
{
store::Item_t lUri;
- PlanIteratorState *state;
+ PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
consumeNext(lUri, theChildren[0].getp(), planState);
try
{
-GENV_ITEMFACTORY-createBoolean(result, lUri-isElement());
+GENV_ITEMFACTORY-createBoolean(result, lUri-isElementRef());
}
catch (ZorbaException e)
{
@@ -580,14 +580,14 @@
{
store::Item_t lUri;
- PlanIteratorState *state;
+ PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
consumeNext(lUri, theChildren[0].getp(), planState);
try
{
-GENV_ITEMFACTORY-createBoolean(result, lUri-isProcessingInstruction());
+GENV_ITEMFACTORY-createBoolean(result, lUri-isProcessingInstructionRef());
}
catch (ZorbaException e)
{
@@ -609,14 +609,14 @@
{
store::Item_t lUri;
- PlanIteratorState *state;
+ PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
consumeNext(lUri, theChildren[0].getp(), planState);
try
{
-GENV_ITEMFACTORY-createBoolean(result, lUri-isText());
+GENV_ITEMFACTORY-createBoolean(result, lUri-isTextRef());
}
catch (ZorbaException e)
{
=== modified file 'src/runtime/nodes/nodes_impl.cpp'
--- src/runtime/nodes/nodes_impl.cpp 2012-06-28 21:54:08 +
+++ src/runtime/nodes/nodes_impl.cpp 2012-06-29 14:45:27 +
@@ -703,87 +703,101 @@
bool FnPathIterator::nextImpl(store::Item_t result, PlanState planState) const
{
store::Item_t inNode;
- store::Item_t swap;
store::Item_t nodeName;
+ store::NsBindings nsBindings;
zstring path;
zstring temp;
zstring zNamespace;
zstring zLocalName;
zstring zPosition;
+ bool rootIsDocument = false;
PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
if (consumeNext(inNode, theChildren[0], planState))
{
-while (inNode-getParent())
-{
- temp = path;
- path = /;
-
+do
+{
switch (inNode-getNodeKind())
{
+case store::StoreConsts::documentNode:
+ temp = path;
+ path = /;
+ path += temp;
+ rootIsDocument = true;
+ break;
+
case store::StoreConsts::elementNode:
nodeName = inNode-getNodeName();
zNamespace = nodeName-getNamespace();
zLocalName = nodeName-getLocalName();
zPosition = ztd::to_string(getNodePosition(inNode));
- path += \+zNamespace+\:+zLocalName+[+zPosition+];
+ temp = path;
+ path = \+zNamespace+\:+zLocalName+[+zPosition.c_str()+];
+ path += temp;
break;
+
case store::StoreConsts::attributeNode:
nodeName = inNode-getNodeName();
zNamespace =nodeName-getNamespace();
zLocalName = nodeName-getLocalName();
- path += @;
if(zNamespace != )
{
-path += \+zNamespace+\:;
- }
- path += zLocalName;
+temp = path;
+path = @\+zNamespace+\:+zLocalName;
+path
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/112790 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/112790 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/112790 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
