[Zorba-coders] [Merge] lp:~zorba-coders/zorba/no-copy into lp:zorba

2012-10-22 Thread Markos Zaharioudakis
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/no-copy into 
lp:zorba.

Commit message:
testing

Requested reviews:
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/no-copy/+merge/130765

testing
-- 
https://code.launchpad.net/~zorba-coders/zorba/no-copy/+merge/130765
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/module-depends into lp:zorba

2012-10-22 Thread David Graf
David Graf has proposed merging lp:~zorba-coders/zorba/module-depends into 
lp:zorba.

Commit message:
Additional optional parameter for DECLARE_ZORBA_MODULE macro to pass targets 
the declared module depends on.

Requested reviews:
  David Graf (davidagraf)
  Till Westmann (tillw)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784

Additional optional parameter for DECLARE_ZORBA_MODULE macro to pass targets 
the declared module depends on.
-- 
https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake	2012-10-08 12:09:36 +
+++ cmake_modules/ZorbaModule.cmake	2012-10-22 11:42:20 +
@@ -118,6 +118,7 @@
 #  information; see below
 #   TEST_ONLY - (optional) Module is for testcases only and should not
 #  be installed
+#   DEPENDS - (optional) List of targets the module depends on
 #
 # CONFIG_FILES - any files specific here will be copied to
 # CMAKE_CURRENT_BINARY_DIR using CONFIGURE_FILE(). They may contain
@@ -136,7 +137,7 @@
 # file enough to deduce the URI and version?
 MACRO (DECLARE_ZORBA_MODULE)
   # Parse and validate arguments
-  PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES
+  PARSE_ARGUMENTS(MODULE LINK_LIBRARIES;EXTRA_SOURCES;CONFIG_FILES;DEPENDS
 URI;FILE;VERSION TEST_ONLY ${ARGN})
   IF (NOT MODULE_FILE)
 MESSAGE (FATAL_ERROR 'FILE' argument is required for ZORBA_DECLARE_MODULE())
@@ -268,6 +269,9 @@
 # the module *URI*'s final component.
 SET(module_lib_target modlib${num_zorba_modules}_${module_name})
 ADD_LIBRARY(${module_lib_target} SHARED ${SRC_FILES})
+IF (MODULE_DEPENDS)
+  ADD_DEPENDENCIES(${module_lib_target} ${MODULE_DEPENDS})
+ENDIF()
 GET_FILENAME_COMPONENT(module_filewe ${module_filename} NAME_WE)
 IF (MODULE_VERSION)
   # If there's a version, insert it into the module library name

-- 
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/module-depends into lp:zorba

2012-10-22 Thread David Graf
The proposal to merge lp:~zorba-coders/zorba/module-depends into lp:zorba has 
been updated.

Commit Message changed to:

Additional optional parameter for DECLARE_ZORBA_MODULE macro to pass targets 
the declared module depends on.

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784
-- 
https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784
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/module-depends into lp:zorba

2012-10-22 Thread David Graf
Till, this changed is needed for 28msec. Our mongodb module is dependent on one 
of our targets.
-- 
https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784
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/module-depends into lp:zorba

2012-10-22 Thread David Graf
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/module-depends/+merge/130784
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

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

Commit message:
Optimized the MarkExpr and EliminateFlworVariables rules of the optimizer

Requested reviews:
  Markos Zaharioudakis (markos-za)

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

Optimized the MarkExpr and EliminateFlworVariables rules of the optimizer
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130833
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog	2012-10-20 21:29:37 +
+++ ChangeLog	2012-10-22 15:15:32 +
@@ -6,6 +6,7 @@
 New Features:
 
 Optimizations:
+  * Optimized the MarkExpr and EliminateFlworVariables rules of the optimizer
 
 Bug Fixes/Other Changes:
   * Fixed mustCopyInputNodes() method of no-copy, and jsoniq functions.

=== modified file 'src/compiler/expression/expr.cpp'
--- src/compiler/expression/expr.cpp	2012-10-10 13:05:50 +
+++ src/compiler/expression/expr.cpp	2012-10-22 15:15:32 +
@@ -334,6 +334,8 @@
 {
   assert(type-get_quantifier() == TypeConstants::QUANT_ONE ||
  type-get_quantifier() == TypeConstants::QUANT_QUESTION);
+
+  setNonDiscardable(ANNOTATION_TRUE_FIXED);
 }
 
 
@@ -362,6 +364,7 @@
   theCheckPrime(check_prime),
   theQName(qname)
 {
+  setNonDiscardable(ANNOTATION_TRUE_FIXED);
 }
 
 
@@ -385,6 +388,8 @@
   assert(TypeOps::is_subtype(sctx-get_typemanager(),
  *type,
  *GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR));
+
+  setNonDiscardable(ANNOTATION_TRUE_FIXED);
 }
 
 
@@ -494,6 +499,9 @@
   theCopyInputNodes(copyNodes)
 {
   compute_scripting_kind();
+
+  setUnfoldable(ANNOTATION_TRUE_FIXED);
+  setConstructsNodes(ANNOTATION_TRUE_FIXED);
 }
 
 
@@ -530,7 +538,12 @@
 {
   compute_scripting_kind();
 
+  // Node constructors are unfoldable because if a node constructor is inside
+  // a loop, then it will create a different xml tree every time it is invoked,
+  // even if the constructor itself is constant (i.e. does not reference any
+  // varialbes)
   setUnfoldable(ANNOTATION_TRUE_FIXED);
+  setConstructsNodes(ANNOTATION_TRUE_FIXED);
 }
 
 
@@ -553,6 +566,7 @@
   compute_scripting_kind();
 
   setUnfoldable(ANNOTATION_TRUE_FIXED);
+  setConstructsNodes(ANNOTATION_TRUE_FIXED);
 }
 
 
@@ -600,6 +614,7 @@
   compute_scripting_kind();
 
   setUnfoldable(ANNOTATION_TRUE_FIXED);
+  setConstructsNodes(ANNOTATION_TRUE_FIXED);
 }
 
 
@@ -658,6 +673,7 @@
   compute_scripting_kind();
 
   setUnfoldable(ANNOTATION_TRUE_FIXED);
+  setConstructsNodes(ANNOTATION_TRUE_FIXED);
 }
 
 
@@ -690,6 +706,7 @@
   compute_scripting_kind();
 
   setUnfoldable(ANNOTATION_TRUE_FIXED);
+  setConstructsNodes(ANNOTATION_TRUE_FIXED);
 }
 
 

=== modified file 'src/compiler/expression/expr_base.cpp'
--- src/compiler/expression/expr_base.cpp	2012-10-20 21:29:37 +
+++ src/compiler/expression/expr_base.cpp	2012-10-22 15:15:32 +
@@ -122,6 +122,19 @@
 /***
 
 /
+expr::expr() 
+  :
+  theCCB(NULL),
+  theSctx(NULL),
+  theUDF(NULL),
+  theFlags1(0)
+{
+}
+
+
+/***
+
+/
 expr::expr(
 CompilerCB* ccb,
 static_context* sctx,
@@ -142,6 +155,8 @@
   // This is the default. The constructors for certain exprs set different values.
   setNonDiscardable(ANNOTATION_FALSE);
   setUnfoldable(ANNOTATION_FALSE);
+  setConstructsNodes(ANNOTATION_FALSE);
+  setDereferencesNodes(ANNOTATION_FALSE);
 }
 
 

=== modified file 'src/compiler/expression/expr_base.h'
--- src/compiler/expression/expr_base.h	2012-10-20 21:29:37 +
+++ src/compiler/expression/expr_base.h	2012-10-22 15:15:32 +
@@ -17,6 +17,8 @@
 #ifndef ZORBA_COMPILER_EXPR_BASE
 #define ZORBA_COMPILER_EXPR_BASE
 
+#include map
+
 #include zorba/config.h
 
 #include common/shared_types.h
@@ -27,7 +29,7 @@
 
 #include functions/function_consts.h
 
-#include types/typeimpl.h
+//#include types/typeimpl.h
 
 #include context/static_context_consts.h
 
@@ -135,7 +137,7 @@
 
   typedef substitution_t::iterator subst_iter_t;
 
-  typedef std::setconst var_expr * FreeVars;
+  typedef std::setvar_expr * FreeVars;
 
   typedef enum
   {
@@ -205,7 +207,7 @@
 protected:
   expr(CompilerCB*, static_context*, user_function*, const QueryLoc, expr_kind_t);
 
-  expr() : theCCB(NULL), theSctx(NULL), theUDF(NULL), theFlags1(0) {}
+  expr();
 
 public:
   virtual ~expr();

=== modified file 'src/compiler/expression/expr_iter.cpp'
--- src/compiler/expression/expr_iter.cpp	2012-10-08 12:09:36 +
+++ src/compiler/expression/expr_iter.cpp	2012-10-22 15:15:32 +
@@ -40,7 +40,7 @@
 
 #define EXPR_ITER_BEGIN() switch (theState) { case 0:
 
-#define 

[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba

2012-10-22 Thread Markos Zaharioudakis
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/130833
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130833
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

2012-10-22 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-10-22T15-20-00.536Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130833
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

2012-10-22 Thread Zorba Build Bot
Validation queue job markos-scratch-2012-10-22T15-20-00.536Z is finished. The 
final status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130833
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

2012-10-22 Thread noreply
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/130833
-- 
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130833
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/xqxq-memory-smash into lp:zorba/xqxq-module

2012-10-22 Thread Juan Zacarias
The proposal to merge lp:~zorba-coders/zorba/xqxq-memory-smash into 
lp:zorba/xqxq-module has been updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657
-- 
https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657
Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-module.

-- 
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/xqxq-memory-smash into lp:zorba/xqxq-module

2012-10-22 Thread Juan Zacarias
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657
Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-module.

-- 
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/xqxq-memory-smash into lp:zorba/xqxq-module

2012-10-22 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/xqxq-memory-smash-2012-10-22T16-48-40.826Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657
Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-module.

-- 
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/xqxq-memory-smash into lp:zorba/xqxq-module

2012-10-22 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/xqxq-memory-smash into 
lp:zorba/xqxq-module has been updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657
-- 
https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657
Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-module.

-- 
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/bug1068240 into lp:zorba

2012-10-22 Thread Juan Zacarias
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/bug1068240 into 
lp:zorba.

Commit message:
 Changed DynamicContext function addExternalFunctionParameter to const

Requested reviews:
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #855925 in Zorba: C++ API, DynamicContext is passed as a const argument 
to the function's evaluate method
  https://bugs.launchpad.net/zorba/+bug/855925
  Bug #1068240 in Zorba: make addExternalFunctionParameter const
  https://bugs.launchpad.net/zorba/+bug/1068240

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861

 Changed DynamicContext function addExternalFunctionParameter to const
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h	2012-10-08 12:09:36 +
+++ include/zorba/dynamic_context.h	2012-10-22 17:16:25 +
@@ -284,7 +284,7 @@
*  false otherwise.
*/
   virtual bool
-  addExternalFunctionParameter ( const String aName, ExternalFunctionParameter* aParam ) = 0;
+  addExternalFunctionParameter ( const String aName, ExternalFunctionParameter* aParam ) const = 0;
 
   /** \brief Get the value of a pair that was registered using
* the addExternalFunctionParam method. This can

=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp	2012-10-08 12:09:36 +
+++ src/api/dynamiccontextimpl.cpp	2012-10-22 17:16:25 +
@@ -715,7 +715,7 @@
 bool
 DynamicContextImpl::addExternalFunctionParameter (
 const String aName,
-ExternalFunctionParameter* aValue )
+ExternalFunctionParameter* aValue ) const
 {
   ZORBA_DCTX_TRY
   {

=== modified file 'src/api/dynamiccontextimpl.h'
--- src/api/dynamiccontextimpl.h	2012-10-08 12:09:36 +
+++ src/api/dynamiccontextimpl.h	2012-10-22 17:16:25 +
@@ -151,7 +151,7 @@
   getExternalFunctionParam(const String aName, void*) const;
 
   virtual bool
-  addExternalFunctionParameter(const String aName, ExternalFunctionParameter* aParam);
+  addExternalFunctionParameter(const String aName, ExternalFunctionParameter* aParam) const;
 
   virtual ExternalFunctionParameter*
   getExternalFunctionParameter(const String aName) const;

=== modified file 'src/context/dynamic_context.cpp'
--- src/context/dynamic_context.cpp	2012-09-19 21:16:15 +
+++ src/context/dynamic_context.cpp	2012-10-22 17:16:25 +
@@ -891,7 +891,7 @@
 /
 bool dynamic_context::addExternalFunctionParameter(
const std::string aName,
-   ExternalFunctionParameter* aValue)
+   ExternalFunctionParameter* aValue) const
 {
   if (!keymap)
   {

=== modified file 'src/context/dynamic_context.h'
--- src/context/dynamic_context.h	2012-10-19 20:42:38 +
+++ src/context/dynamic_context.h	2012-10-22 17:16:25 +
@@ -129,7 +129,7 @@
 
   std::vectorVarValuetheVarValues;
 
-  ValueMap   * keymap;
+  mutable ValueMap   * keymap;
 
   IndexMap   * theAvailableIndices;
 
@@ -241,7 +241,7 @@
 
   bool addExternalFunctionParameter(
  const std::string aName,
- ExternalFunctionParameter* aValue);
+ ExternalFunctionParameter* aValue) const;
 
   ExternalFunctionParameter* getExternalFunctionParameter(
   const std::string aName) const;

-- 
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/bug1068240 into lp:zorba

2012-10-22 Thread Matthias Brantner
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
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/bug1068240 into lp:zorba

2012-10-22 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug1068240-2012-10-22T17-21-43.277Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
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/xqxq-bug1068240 into lp:zorba/xqxq-module

2012-10-22 Thread Juan Zacarias
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/xqxq-bug1068240 into 
lp:zorba/xqxq-module.

Commit message:
Removed cast to const for the DynamicContext.

Requested reviews:
  Matthias Brantner (matthias-brantner)
Related bugs:
  Bug #855925 in Zorba: C++ API, DynamicContext is passed as a const argument 
to the function's evaluate method
  https://bugs.launchpad.net/zorba/+bug/855925
  Bug #1068240 in Zorba: make addExternalFunctionParameter const
  https://bugs.launchpad.net/zorba/+bug/1068240

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xqxq-bug1068240/+merge/130867

Removed cast to const for the DynamicContext.
-- 
https://code.launchpad.net/~zorba-coders/zorba/xqxq-bug1068240/+merge/130867
Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-module.
=== modified file 'src/xqxq.xq.src/xqxq.cpp'
--- src/xqxq.xq.src/xqxq.cpp	2012-10-20 02:18:45 +
+++ src/xqxq.xq.src/xqxq.cpp	2012-10-22 17:25:22 +
@@ -374,14 +374,13 @@
   const zorba::StaticContext* aSctx,
   const zorba::DynamicContext* aDctx) const 
   {
-DynamicContext* lDynCtx = const_castDynamicContext*(aDctx);
 StaticContext_t lSctxChild = aSctx-createChildContext();

 QueryMap* lQueryMap;
-if(!(lQueryMap = dynamic_castQueryMap*(lDynCtx-getExternalFunctionParameter(xqxqQueryMap
+if(!(lQueryMap = dynamic_castQueryMap*(aDctx-getExternalFunctionParameter(xqxqQueryMap
 {
   lQueryMap = new QueryMap();
-  lDynCtx-addExternalFunctionParameter(xqxqQueryMap, lQueryMap); 
+  aDctx-addExternalFunctionParameter(xqxqQueryMap, lQueryMap); 
 }
 
 Zorba *lZorba = Zorba::getInstance(0);

-- 
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/bug1068240 into lp:zorba

2012-10-22 Thread Zorba Build Bot
The attempt to merge lp:~zorba-coders/zorba/bug1068240 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 bug1068240-2012-10-22T17-21-43.277Z 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/bug1068240/+merge/130861
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/bug1068240 into lp:zorba

2012-10-22 Thread Zorba Build Bot
The proposal to merge lp:~zorba-coders/zorba/bug1068240 into lp:zorba has been 
updated.

Status: Approved = Needs review

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
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/bug1068240 into lp:zorba

2012-10-22 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug1068240-2012-10-22T19-12-38.498Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
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/bug1068240 into lp:zorba

2012-10-22 Thread Markos Zaharioudakis
Review: Approve


-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
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/bug1068240 into lp:zorba

2012-10-22 Thread Markos Zaharioudakis
The proposal to merge lp:~zorba-coders/zorba/bug1068240 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
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/bug-1039284 into lp:zorba

2012-10-22 Thread Till Westmann
Review: Approve

Looks good - especially the name of the new source file :)

-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1039284/+merge/129677
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/bug-1039284 into lp:zorba

2012-10-22 Thread Till Westmann
The proposal to merge lp:~zorba-coders/zorba/bug-1039284 into lp:zorba has been 
updated.

Status: Needs review = Approved

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1039284/+merge/129677
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1039284/+merge/129677
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/bug1068240 into lp:zorba

2012-10-22 Thread Zorba Build Bot
Validation queue job bug1068240-2012-10-22T19-12-38.498Z is finished. The final 
status was:

All tests succeeded!
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
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/bug1068240 into lp:zorba

2012-10-22 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/bug1068240 into lp:zorba has been 
updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug1068240/+merge/130861
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/bug-1039284 into lp:zorba

2012-10-22 Thread Zorba Build Bot
Validation queue starting for merge proposal.
Log at: 
http://zorbatest.lambda.nu:8080/remotequeue/bug-1039284-2012-10-22T19-38-54.354Z/log.html
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1039284/+merge/129677
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/bug-1039284 into lp:zorba

2012-10-22 Thread noreply
The proposal to merge lp:~zorba-coders/zorba/bug-1039284 into lp:zorba has been 
updated.

Status: Approved = Merged

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1039284/+merge/129677
-- 
https://code.launchpad.net/~zorba-coders/zorba/bug-1039284/+merge/129677
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