Merge lp:~zorba-coders/zorba/feature-setvar-typed into lp:zorba

[Matthias Brantner]

1. Added the ability to do casting when setting the value of an external variable.
2. The zorba command now always requests casting.

1. Added the ability to do casting when setting the value of an external variable.
2. The zorba command now always requests casting.

[lp:~zorba-coders/zorba/feature-setvar-typed]

11719. By Paul J. Lucas on 2014-04-25

Added "cast" to other setVariable().

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217313

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Voting criteria failed for the following merge proposals:

https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217313 :
Votes: {'Approve': 1, 'Pending': 1}

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217313

Stage "CommitZorba" failed.

Check console output at http://jenkins.lambda.nu:8180/job/CommitZorba/323/console to view the results.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/feature-setvar-typed/+merge/217313

Progress dashboard at http://jenkins.zorba.io:8180/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp	2014-02-20 00:58:25 +0000
+++ bin/zorbacmd.cpp	2014-04-25 23:55:27 +0000
@@ -250,7 +250,7 @@
         dctx->setVariable( i->var_name, doc );
       } else {
         Item item( zorba->getItemFactory()->createString( i->var_value ) );
-        dctx->setVariable( i->var_name, item );
+        dctx->setVariable( i->var_name, item, true );
       }
     }
     catch ( ... ) {
 
=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h	2013-08-14 08:46:44 +0000
+++ include/zorba/dynamic_context.h	2014-04-25 23:55:27 +0000
@@ -59,13 +59,16 @@
    *
    * @param aQName the QName that identifies the external variable.
    * @param aItem the Item that is used as value for the variable.
+   * @param cast If \c true, attempt to cast \a aItem to the type (if any) that
+   * the external variable was declared as.
    * @return true if the variable has been set, false otherwise.
    * @throw ZorbaException if an error occured (e.g. the given Item is not valid).
    */
   virtual bool
   setVariable(
       const String& aQName,
-      const Item& aItem) = 0;
+      const Item& aItem,
+      bool cast = false) = 0;
 
   /** 
    * \brief Defines the external variable identified by an expanded QName and
@@ -77,6 +80,8 @@
    * @param aNamespace the namespace URI of the variable's expanded QName
    * @param aLocalname the local name of the variable's expanded QName
    * @param aItem the Item that is used as value for the variable.
+   * @param cast If \c true, attempt to cast \a aItem to the type (if any) that
+   * the external variable was declared as.
    * @return true if the variable has been set successfully, false otherwise.
    * @throw ZorbaException if an error occured (e.g. the given Item is not valid).
    */
@@ -84,7 +89,8 @@
   setVariable(
       const String& inNamespace,
       const String& inLocalname,
-      const Item& inValue) = 0;
+      const Item& inValue,
+      bool cast = false) = 0;
 
   /**
    * \brief Defines the external variable identified by aQName and assigns it
 
=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp	2013-09-16 09:08:27 +0000
+++ src/api/dynamiccontextimpl.cpp	2014-04-25 23:55:27 +0000
@@ -36,6 +36,7 @@
 #include "api/item_iter_store.h"
 #include "api/dynamiccontextimpl.h"
 
+#include "compiler/expression/var_expr.h"
 #include "compiler/parser/query_loc.h"
 #include "compiler/parsetree/parsenodes.h"
 #include "compiler/api/compilercb.h"
@@ -46,6 +47,7 @@
 #include "store/api/store.h"
 #include "store/api/item_factory.h"
 #include "store/api/temp_seq.h"
+#include "types/casting.h"
 
 #include "util/xml_util.h"
 
@@ -334,7 +336,8 @@
 bool DynamicContextImpl::setVariable(
     const String& inNamespace,
     const String& inLocalname,
-    const Item& inValue)
+    const Item& inValue,
+    bool cast)
 {
   ZORBA_DCTX_TRY
   {
@@ -364,6 +367,15 @@
       throw;
     }
 
+    if ( cast && var->getType() ) {
+      store::Item_t cast_value;
+      GenericCast::castToAtomic(
+        cast_value, value, var->getType(), var->getVar()->get_type_manager(),
+        /*nsCtx*/ nullptr, QueryLoc::null
+      );
+      value = cast_value;
+    }
+
     ulong varId = var->getId();
 
     theCtx->add_variable(varId, value);
@@ -380,7 +392,8 @@
 ********************************************************************************/
 bool DynamicContextImpl::setVariable(
     const String& inVarName,
-    const Item& inValue)
+    const Item& inValue,
+    bool cast)
 {
   ZORBA_DCTX_TRY
   {
@@ -410,6 +423,15 @@
       throw;
     }
 
+    if ( cast && var->getType() ) {
+      store::Item_t cast_value;
+      GenericCast::castToAtomic(
+        cast_value, value, var->getType(), var->getVar()->get_type_manager(),
+        /*nsCtx*/ nullptr, QueryLoc::null
+      );
+      value = cast_value;
+    }
+
     ulong varId = var->getId();
 
     theCtx->add_variable(varId, value);
 
=== modified file 'src/api/dynamiccontextimpl.h'
--- src/api/dynamiccontextimpl.h	2013-08-01 07:57:57 +0000
+++ src/api/dynamiccontextimpl.h	2014-04-25 23:55:27 +0000
@@ -96,13 +96,15 @@
   virtual bool
   setVariable(
       const String& inVarName,
-      const Item& inValue);
+      const Item& inValue,
+      bool cast = false);
 
   virtual bool
   setVariable(
       const String& inNamespace,
       const String& inLocalname,
-      const Item& inValue);
+      const Item& inValue,
+      bool cast = false);
 
   virtual bool
   setVariable(