Merge lp:~zorba-coders/zorba/bug-1046411 into lp:zorba

[Markos Zaharioudakis]

Fixed bug #1046411 (automatic boxing of mutli-item sequence appearing as the value of an object pair)
Fixed bug #1046410 (automatic conversion to null of empty sequence appearing as the value of an object pair)

Fixed bug #1046411 (automatic boxing of mutli-item sequence appearing as the value of an object pair)
Fixed bug #1046410 (automatic conversion to null of empty sequence appearing as the value of an object pair)

[lp:~zorba-coders/zorba/bug-1046411]

11030. By Markos Zaharioudakis on 2012-09-10

work in progress

11031. By Markos Zaharioudakis on 2012-09-10

merge from trunk

11032. By Markos Zaharioudakis on 2012-09-10

work in progress

11033. By Markos Zaharioudakis on 2012-09-11

added internal json-box function

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1046411-2012-09-11T16-04-36.756Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1046411-2012-09-11T16-04-36.756Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-09-11 14:57:18 +0000
+++ ChangeLog	2012-09-11 15:56:21 +0000
@@ -27,6 +27,10 @@
   * 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)
+  * Fixed bug #1046411 (automatic boxing of mutli-item sequence appearing as the
+    value of an object pair)
+  * Fixed bug #1046410 (automatic conversion to null of empty sequence appearing
+    as the value of an object pair)
   * 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)

=== modified file 'src/compiler/expression/expr.cpp'
--- src/compiler/expression/expr.cpp	2012-09-10 18:50:57 +0000
+++ src/compiler/expression/expr.cpp	2012-09-11 15:56:21 +0000
@@ -943,7 +943,7 @@
     CompilerCB* ccb,
     static_context* sctx,
     const QueryLoc& loc,
-    store::Item_t v)
+    const store::Item_t& v)
   :
   expr(ccb, sctx, loc, const_expr_kind),
   theValue(v)

=== modified file 'src/compiler/expression/expr.h'
--- src/compiler/expression/expr.h	2012-09-10 18:50:57 +0000
+++ src/compiler/expression/expr.h	2012-09-11 15:56:21 +0000
@@ -784,23 +784,23 @@
   store::Item_t theValue;
 
 protected:
-  const_expr(CompilerCB* ccb, static_context* sctx, const QueryLoc&, zstring& sval);
-
-  const_expr(CompilerCB* ccb, static_context* sctx, const QueryLoc&, const std::string& sval);
-
-  const_expr(CompilerCB* ccb, static_context* sctx, const QueryLoc&, const char* sval);
-
-  const_expr(CompilerCB* ccb, static_context* sctx, const QueryLoc&, xs_integer);
-
-  const_expr(CompilerCB* ccb, static_context* sctx, const QueryLoc&, xs_decimal);
-
-  const_expr(CompilerCB* ccb, static_context* sctx, const QueryLoc&, xs_double);
-
-  const_expr(CompilerCB* ccb, static_context* sctx, const QueryLoc&, xs_boolean);
-
-  const_expr(CompilerCB* ccb, static_context* sctx, const QueryLoc&, store::Item_t);
-
-  const_expr(CompilerCB* ccb, static_context* sctx, const QueryLoc&, const char* ns, const char* pre, const char* local);
+  const_expr(CompilerCB*, static_context*, const QueryLoc&, zstring& sval);
+
+  const_expr(CompilerCB*, static_context*, const QueryLoc&, const std::string& sval);
+
+  const_expr(CompilerCB*, static_context*, const QueryLoc&, const char* sval);
+
+  const_expr(CompilerCB*, static_context*, const QueryLoc&, xs_integer);
+
+  const_expr(CompilerCB*, static_context*, const QueryLoc&, xs_decimal);
+
+  const_expr(CompilerCB*, static_context*, const QueryLoc&, xs_double);
+
+  const_expr(CompilerCB*, static_context*, const QueryLoc&, xs_boolean);
+
+  const_expr(CompilerCB*, static_context*, const QueryLoc&, const store::Item_t&);
+
+  const_expr(CompilerCB*, static_context*, const QueryLoc&, const char* ns, const char* pre, const char* local);
 
 public:
   store::Item* get_val() const { return theValue.getp(); }

=== modified file 'src/compiler/rewriter/rules/type_rules.cpp'
--- src/compiler/rewriter/rules/type_rules.cpp	2012-09-10 18:50:57 +0000
+++ src/compiler/rewriter/rules/type_rules.cpp	2012-09-11 15:56:21 +0000
@@ -39,6 +39,8 @@
 
 #include "diagnostics/assert.h"
 
+#include "store/api/store.h"
+#include "store/api/item_factory.h"
 
 namespace zorba
 {
@@ -50,7 +52,10 @@
     const xqtref_t& t,
     RewriterContext& rCtx);
 
-static xqtref_t specialize_numeric(fo_expr* fo, static_context* sctx, RewriterContext& rCtx);
+static xqtref_t specialize_numeric(
+    fo_expr* fo,
+    static_context* sctx,
+    RewriterContext& rCtx);
 
 static function* flip_value_cmp(FunctionConsts::FunctionKind kind);
 
@@ -121,6 +126,25 @@
       else
         return NULL;
     }
+
+    if (fo->get_func()->getKind() == FunctionConsts::OP_ZORBA_JSON_BOX_1)
+    {
+      expr* arg = fo->get_arg(0);
+      xqtref_t arg_type = arg->get_return_type();
+
+      if (arg_type->get_quantifier() == TypeConstants::QUANT_ONE)
+        return arg;
+
+      if (arg_type->max_card() == 0)
+      {
+        store::Item_t null;
+        GENV_STORE.getItemFactory()->createJSONNull(null);
+
+        return rCtx.theEM->create_const_expr(sctx, fo->get_loc(), null);
+      }
+
+      return NULL;
+    }
   }
 
   cast_base_expr* pe = NULL;
@@ -425,16 +449,16 @@
 
     bool modified = false;
 
-    ulong numClauses = flworExpr->num_clauses();
-    for (ulong i = 0; i < numClauses; ++i)
+    csize numClauses = flworExpr->num_clauses();
+    for (csize i = 0; i < numClauses; ++i)
     {
       if (flworExpr->get_clause(i)->get_kind() == flwor_clause::order_clause)
       {
         orderby_clause* obc = reinterpret_cast<orderby_clause*>
                               (flworExpr->get_clause(i));
 
-        ulong numColumns = obc->num_columns();
-        for (ulong j = 0; j < numColumns; ++j)
+        csize numColumns = obc->num_columns();
+        for (csize j = 0; j < numColumns; ++j)
         {
           expr* colExpr = obc->get_column_expr(j);
           xqtref_t colType = colExpr->get_return_type();
@@ -443,10 +467,11 @@
           if (!TypeOps::is_equal(tm, *colType, *rtm.EMPTY_TYPE, colLoc) &&
               TypeOps::is_subtype(tm, *colType, *rtm.UNTYPED_ATOMIC_TYPE_STAR, colLoc))
           {
-            expr* castExpr = rCtx.theEM->create_cast_expr(colExpr->get_sctx(),
-                                            colExpr->get_loc(),
-                                            colExpr,
-                                            rtm.STRING_TYPE_QUESTION);
+            expr* castExpr = rCtx.theEM->
+            create_cast_expr(colExpr->get_sctx(),
+                             colExpr->get_loc(),
+                             colExpr,
+                             rtm.STRING_TYPE_QUESTION);
 
             obc->set_column_expr(j, castExpr);
             modified = true;
@@ -463,7 +488,10 @@
 }
 
 
-static xqtref_t specialize_numeric(fo_expr* fo, static_context* sctx, RewriterContext& rCtx)
+static xqtref_t specialize_numeric(
+    fo_expr* fo,
+    static_context* sctx,
+    RewriterContext& rCtx)
 {
   TypeManager* tm = fo->get_type_manager();
 

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-09-10 18:50:57 +0000
+++ src/compiler/translator/translator.cpp	2012-09-11 15:56:21 +0000
@@ -10058,7 +10058,7 @@
 
   rchandle<QName> qname = v.get_fname();
 
-  ulong numArgs = 0;
+  csize numArgs = 0;
   if (v.get_arg_list() != NULL)
     numArgs = v.get_arg_list()->size();
 
@@ -10113,9 +10113,9 @@
       }
     }
 
-    size_t numParams = f->getArity();
+    csize numParams = f->getArity();
 
-    for (ulong i = 0; i < numParams; ++i)
+    for (csize i = 0; i < numParams; ++i)
     {
       xqtref_t type = sign[i];
       if (!TypeOps::is_in_scope(tm, *type))
@@ -10178,7 +10178,7 @@
     arguments.push_back(argExpr);
   }
 
-  ulong numArgs = (ulong)arguments.size();
+  csize numArgs = arguments.size();
 
   function* f = lookup_fn(qname, numArgs, loc);
 
@@ -10195,20 +10195,34 @@
     {
       case FunctionConsts::FN_HEAD_1:
       {
-        arguments.push_back(theExprManager->create_const_expr(theRootSctx, loc, xs_integer::one()));
-        arguments.push_back(theExprManager->create_const_expr(theRootSctx, loc, xs_integer::one()));
+        arguments.push_back(theExprManager->
+                            create_const_expr(theRootSctx, loc, xs_integer::one()));
+
+        arguments.push_back(theExprManager->
+                            create_const_expr(theRootSctx, loc, xs_integer::one()));
+
         function* f = GET_BUILTIN_FUNCTION(OP_ZORBA_SUBSEQUENCE_INT_3);
-        fo_expr* foExpr = theExprManager->create_fo_expr(theRootSctx, loc, f, arguments);
+
+        fo_expr* foExpr = theExprManager->
+        create_fo_expr(theRootSctx, loc, f, arguments);
+
         normalize_fo(foExpr);
+
         push_nodestack(foExpr);
         return;
       }
       case FunctionConsts::FN_TAIL_1:
       {
-        arguments.push_back(theExprManager->create_const_expr(theRootSctx, loc, xs_integer(2)));
+        arguments.push_back(theExprManager->
+                            create_const_expr(theRootSctx, loc, xs_integer(2)));
+
         function* f = GET_BUILTIN_FUNCTION(OP_ZORBA_SUBSEQUENCE_INT_2);
-        fo_expr* foExpr = theExprManager->create_fo_expr(theRootSctx, loc, f, arguments);
+
+        fo_expr* foExpr = theExprManager->
+        create_fo_expr(theRootSctx, loc, f, arguments);
+
         normalize_fo(foExpr);
+
         push_nodestack(foExpr);
         return;
       }
@@ -10223,9 +10237,9 @@
 
         if (numArgs == 2)
         {
-          if (TypeOps::is_subtype(tm, *posType, *GENV_TYPESYSTEM.INTEGER_TYPE_STAR, loc))
+          if (TypeOps::is_subtype(tm, *posType, *theRTM.INTEGER_TYPE_STAR, loc))
           {
-            if(f->getKind() == FunctionConsts::FN_SUBSTRING_2)
+            if (f->getKind() == FunctionConsts::FN_SUBSTRING_2)
               f = GET_BUILTIN_FUNCTION(OP_SUBSTRING_INT_2);
             else
               f = GET_BUILTIN_FUNCTION(OP_ZORBA_SUBSEQUENCE_INT_2);
@@ -10235,17 +10249,19 @@
         {
           xqtref_t lenType = arguments[2]->get_return_type();
 
-          if (TypeOps::is_subtype(tm, *posType, *GENV_TYPESYSTEM.INTEGER_TYPE_STAR, loc) &&
-              TypeOps::is_subtype(tm, *lenType, *GENV_TYPESYSTEM.INTEGER_TYPE_STAR, loc))
+          if (TypeOps::is_subtype(tm, *posType, *theRTM.INTEGER_TYPE_STAR, loc) &&
+              TypeOps::is_subtype(tm, *lenType, *theRTM.INTEGER_TYPE_STAR, loc))
           {
-            if(f->getKind() == FunctionConsts::FN_SUBSTRING_3)
+            if (f->getKind() == FunctionConsts::FN_SUBSTRING_3)
               f = GET_BUILTIN_FUNCTION(OP_SUBSTRING_INT_3);
             else
               f = GET_BUILTIN_FUNCTION(OP_ZORBA_SUBSEQUENCE_INT_3);
           }
         }
 
-        fo_expr* foExpr = theExprManager->create_fo_expr(theRootSctx, loc, f, arguments);
+        fo_expr* foExpr = theExprManager->
+        create_fo_expr(theRootSctx, loc, f, arguments);
+
         normalize_fo(foExpr);
         push_nodestack(foExpr);
         return;
@@ -10290,7 +10306,7 @@
 
         expr* data_expr = wrap_in_atomization(arguments[0]);
 
-        push_nodestack(&*wrap_in_let_flwor(theExprManager->create_treat_expr(theRootSctx,
+        push_nodestack(wrap_in_let_flwor(theExprManager->create_treat_expr(theRootSctx,
                                                           loc,
                                                           data_expr,
                                                           theRTM.ANY_ATOMIC_TYPE_QUESTION,
@@ -10314,7 +10330,7 @@
           push_nodestack(theExprManager->create_cast_expr(theRootSctx,
                                        loc,
                                        theExprManager->create_const_expr(theRootSctx, loc, baseuri),
-                                       GENV_TYPESYSTEM.ANY_URI_TYPE_ONE));
+                                       theRTM.ANY_URI_TYPE_ONE));
         return;
       }
       case FunctionConsts::FN_ID_1:
@@ -10421,7 +10437,9 @@
 
   if (f != NULL && f->getKind() ==  FunctionConsts::FN_APPLY_1)
   {
-    expr* applyExpr = theExprManager->create_apply_expr(theRootSctx, loc, arguments[0], false);
+    expr* applyExpr = theExprManager->
+    create_apply_expr(theRootSctx, loc, arguments[0], false);
+
     push_nodestack(applyExpr);
     return;
   }
@@ -10452,7 +10470,7 @@
     }
   }
 
-  numArgs = (ulong)arguments.size();  // recompute size
+  numArgs = arguments.size();  // recompute size
 
   // Check if this is a call to a type constructor function
   xqtref_t type = CTX_TM->create_named_type(qnameItem,
@@ -11361,7 +11379,8 @@
 /*******************************************************************************
   PairConstructor ::= ExprSingle ":" ExprSingle
 
-  The PairConstructor production can appear only on the RHS of a DirectObjectConstructor
+  The PairConstructor production can appear only on the RHS of a 
+  DirectObjectConstructor or in the source list of a JSONObjectInsertExpr
 
   The 1st ExprSingle must return exactly one string.
   The 2nd ExprSingle must contain exactly one item of any kind.
@@ -11396,13 +11415,10 @@
                       NULL);
 
   valueExpr = theExprManager->
-  create_treat_expr(theRootSctx,
-                    valueExpr->get_loc(),
-                    valueExpr,
-                    GENV_TYPESYSTEM.ITEM_TYPE_ONE,
-                    TreatIterator::JSONIQ_VALUE, // JNTY0002
-                    false,
-                    NULL);
+  create_fo_expr(theRootSctx,
+                 valueExpr->get_loc(),
+                 GET_BUILTIN_FUNCTION(OP_ZORBA_JSON_BOX_1),
+                 valueExpr);
 
   push_nodestack(valueExpr);
   push_nodestack(nameExpr);
@@ -11758,10 +11774,8 @@
   }
   else
   {
-    fo_expr* expr_list = theExprManager->create_fo_expr(theRootSctx,
-                                      loc,
-                                      op_concatenate,
-                                      args);
+    fo_expr* expr_list = theExprManager->
+    create_fo_expr(theRootSctx, loc, op_concatenate, args);
 
     normalize_fo(expr_list);
 
@@ -11937,10 +11951,9 @@
   }
   else if (args.size() > 1)
   {
-    fo_expr* expr_list = theExprManager->create_fo_expr(theRootSctx,
-                                      loc,
-                                      op_concatenate,
-                                      args);
+    fo_expr* expr_list = theExprManager->
+    create_fo_expr(theRootSctx, loc, op_concatenate, args);
+
     normalize_fo(expr_list);
 
     push_nodestack(expr_list);
@@ -13148,16 +13161,6 @@
     expr* nameExpr = pop_nodestack();
     expr* valueExpr = pop_nodestack();
 
-    nameExpr = wrap_in_type_promotion(nameExpr,
-                                      theRTM.STRING_TYPE_ONE,
-                                      PromoteIterator::JSONIQ_OBJECT_SELECTOR); // JNUP0007
-
-    valueExpr = wrap_in_type_match(valueExpr,
-                                   rtm.ITEM_TYPE_ONE,
-                                   loc,
-                                   TreatIterator::JSONIQ_OBJECT_UPDATE_VALUE, // JNUP0017
-                                   NULL);
-
     args[2 * (numPairs - 1 - i) + 1] = nameExpr;
     args[2 * (numPairs - 1 - i) + 2] = valueExpr;
   }
@@ -13358,11 +13361,10 @@
                                    PromoteIterator::JSONIQ_SELECTOR, // JNUP0007
                                    NULL);
 
-  args[2] = wrap_in_type_match(valueExpr,
-                               theRTM.ITEM_TYPE_ONE,
-                               loc,
-                               TreatIterator::JSONIQ_OBJECT_UPDATE_VALUE, // JNUP0017
-                               NULL);
+  args[2] = theExprManager->create_fo_expr(theRootSctx,
+                                           valueExpr->get_loc(),
+                                           GET_BUILTIN_FUNCTION(OP_ZORBA_JSON_BOX_1),
+                                           valueExpr);
 
   fo_expr* updExpr = theExprManager->
   create_fo_expr(theRootSctx,

=== modified file 'src/functions/func_jsoniq_functions_impl.cpp'
--- src/functions/func_jsoniq_functions_impl.cpp	2012-09-10 18:50:57 +0000
+++ src/functions/func_jsoniq_functions_impl.cpp	2012-09-11 15:56:21 +0000
@@ -45,7 +45,8 @@
 
   static_context* sctx = fo->get_sctx();
 
-  if (sctx->preserve_mode() != StaticContextConsts::no_preserve_ns)
+  if (sctx->preserve_mode() != StaticContextConsts::no_preserve_ns ||
+      sctx->construction_mode() != StaticContextConsts::cons_preserve)
   {
     return true;
   }
@@ -70,8 +71,11 @@
 ********************************************************************************/
 bool op_zorba_json_array_insert::mustCopyInputNodes(expr* fo, csize producer) const
 {
+  static_context* sctx = fo->get_sctx();
+
   if (producer == 2 &&
-      fo->get_sctx()->preserve_mode() != StaticContextConsts::no_preserve_ns)
+      (sctx->preserve_mode() != StaticContextConsts::no_preserve_ns ||
+       sctx->construction_mode() != StaticContextConsts::cons_preserve))
   {
     return true;
   }
@@ -85,31 +89,17 @@
 ********************************************************************************/
 bool op_zorba_json_replace_value::mustCopyInputNodes(expr* fo, csize producer) const
 {
-  if (producer == 2 &&
-      fo->get_sctx()->preserve_mode() != StaticContextConsts::no_preserve_ns)
-  {
-    return true;
-  }
-
-  return false;
-}
-
-
-
-/*******************************************************************************
-
-********************************************************************************/
-bool op_zorba_json_array_append::mustCopyInputNodes(expr* fo, csize producer) const
-{
-  if (producer == 2 &&
-      fo->get_sctx()->preserve_mode() != StaticContextConsts::no_preserve_ns)
-  {
-    return true;
-  }
-
-  return false;
-}
-
+  static_context* sctx = fo->get_sctx();
+
+  if (producer == 2 &&
+      (sctx->preserve_mode() != StaticContextConsts::no_preserve_ns ||
+       sctx->construction_mode() != StaticContextConsts::cons_preserve))
+  {
+    return true;
+  }
+
+  return false;
+}
 
 
 /*******************************************************************************
@@ -129,6 +119,60 @@
 /*******************************************************************************
 
 ********************************************************************************/
+bool op_zorba_json_array_append::mustCopyInputNodes(expr* fo, csize producer) const
+{
+  static_context* sctx = fo->get_sctx();
+
+  if (producer == 2 &&
+      (sctx->preserve_mode() != StaticContextConsts::no_preserve_ns ||
+       sctx->construction_mode() != StaticContextConsts::cons_preserve))
+  {
+    return true;
+  }
+
+  return false;
+}
+
+
+#if 1
+/*******************************************************************************
+
+********************************************************************************/
+bool op_zorba_json_box::mustCopyInputNodes(expr* fo, csize producer) const
+{
+  static_context* sctx = fo->get_sctx();
+
+  if (sctx->preserve_mode() != StaticContextConsts::no_preserve_ns ||
+      sctx->construction_mode() != StaticContextConsts::cons_preserve)
+  {
+    return true;
+  }
+
+  return false;
+}
+
+
+/*******************************************************************************
+
+********************************************************************************/
+xqtref_t op_zorba_json_box::getReturnType(const fo_expr* fo) const
+{
+  xqtref_t type = fo->get_arg(0)->get_return_type();
+
+  if (type->get_quantifier() == TypeConstants::QUANT_ONE)
+    return type;
+
+  if (type->max_card() == 0)
+    return GENV_TYPESYSTEM.JDM_NULL_TYPE_ONE;
+
+  return theSignature.returnType();
+}
+#endif
+
+
+/*******************************************************************************
+
+********************************************************************************/
 PlanIter_t fn_jsoniq_parse_json::codegen(
   CompilerCB*,
   static_context* sctx,
@@ -160,26 +204,24 @@
   std::vector<PlanIter_t>& argv,
   expr& ann) const
 {
- return new JSONObjectIterator(sctx, loc, argv, true, false);
+  return new JSONObjectIterator(sctx, loc, argv, true, false);
 }
 
 
 void populate_context_jsoniq_functions_impl(static_context* sctx)
 {
   DECL(sctx, op_zorba_object_insert,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops",
-                     "",
-                     "object-insert"), 
-         GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE,
-         true,
-         GENV_TYPESYSTEM.EMPTY_TYPE));
-
+       (createQName("http://www.zorba-xquery.com/internal/zorba-ops",
+                    "",
+                    "object-insert"), 
+        GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE,
+        true,
+        GENV_TYPESYSTEM.EMPTY_TYPE));
+  
   DECL(sctx, jn_object,
-        (createQName("http://www.jsoniq.org/functions",
-                     "",
-                     "object"),
-         GENV_TYPESYSTEM.JSON_OBJECT_TYPE_STAR,
-         GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE));
+       (createQName("http://www.jsoniq.org/functions", "", "object"),
+        GENV_TYPESYSTEM.JSON_OBJECT_TYPE_STAR,
+        GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE));
 }
 
 

=== modified file 'src/functions/pregenerated/func_jsoniq_functions.cpp'
--- src/functions/pregenerated/func_jsoniq_functions.cpp	2012-09-11 14:57:18 +0000
+++ src/functions/pregenerated/func_jsoniq_functions.cpp	2012-09-11 15:56:21 +0000
@@ -192,6 +192,18 @@
 }
 
 #endif
+#ifdef ZORBA_WITH_JSON
+PlanIter_t op_zorba_json_box::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new JSONBoxIterator(sctx, loc, argv[0]);
+}
+
+#endif
 
 void populate_context_jsoniq_functions(static_context* sctx)
 {
@@ -462,6 +474,22 @@
 
 
 #endif
+
+
+#ifdef ZORBA_WITH_JSON
+
+
+      {
+    DECL_WITH_KIND(sctx, op_zorba_json_box,
+        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","json-box"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.ITEM_TYPE_ONE),
+        FunctionConsts::OP_ZORBA_JSON_BOX_1);
+
+  }
+
+
+#endif
 }
 
 

=== modified file 'src/functions/pregenerated/func_jsoniq_functions.h'
--- src/functions/pregenerated/func_jsoniq_functions.h	2012-09-10 18:50:57 +0000
+++ src/functions/pregenerated/func_jsoniq_functions.h	2012-09-11 15:56:21 +0000
@@ -338,6 +338,30 @@
   CODEGEN_DECL();
 };
 #endif
+#ifdef ZORBA_WITH_JSON
+
+//op-zorba:json-box
+class op_zorba_json_box : public function
+{
+public:
+  op_zorba_json_box(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  bool accessesDynCtx() const { return true; }
+
+  bool propagatesInputNodes(expr* fo, csize producer) const { return true; }
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const;
+
+  CODEGEN_DECL();
+};
+#endif
 
 
 } //namespace zorba

=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h	2012-09-11 14:57:18 +0000
+++ src/functions/pregenerated/function_enum.h	2012-09-11 15:56:21 +0000
@@ -241,6 +241,7 @@
   OP_ZORBA_JSON_REPLACE_VALUE_3,
   OP_ZORBA_JSON_RENAME_3,
   OP_ZORBA_JSON_ARRAY_APPEND_2,
+  OP_ZORBA_JSON_BOX_1,
   MATH_SQRT_1,
   MATH_EXP_1,
   MATH_EXP10_1,

=== modified file 'src/runtime/json/jsoniq_functions_impl.cpp'
--- src/runtime/json/jsoniq_functions_impl.cpp	2012-09-11 14:57:18 +0000
+++ src/runtime/json/jsoniq_functions_impl.cpp	2012-09-11 15:56:21 +0000
@@ -26,6 +26,7 @@
 #include "runtime/json/jsoniq_functions.h"
 #include "runtime/json/jsoniq_functions_impl.h"
 #include "runtime/visitors/planiter_visitor.h"
+#include "runtime/api/plan_iterator_wrapper.h"
 
 #include "diagnostics/diagnostic.h"
 #include "diagnostics/xquery_diagnostics.h"
@@ -913,6 +914,45 @@
 }
 
 
+/*******************************************************************************
+
+********************************************************************************/
+bool JSONBoxIterator::nextImpl(
+  store::Item_t& result,
+  PlanState& planState) const
+{
+  store::Item_t value1;
+  store::Item_t value2;
+  store::Item_t value;
+
+  PlanIteratorState* state;
+  DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
+
+  if (!consumeNext(value1, theChild, planState))
+  {
+    GENV_STORE.getItemFactory()->createJSONNull(result);
+  }
+  else if (!consumeNext(value2, theChild, planState))
+  {
+    result.transfer(value1);
+  }
+  else
+  {
+    store::CopyMode copymode;
+    copymode.set(false, true, true, true);
+
+    store::Iterator_t wrapper = new PlanIteratorWrapper(theChild, planState);
+
+    GENV_STORE.getItemFactory()->
+    createJSONArray(result, value1, value2, wrapper, copymode);
+  }
+
+  STACK_PUSH(true, state);
+  STACK_END(state);
+}
+
+
 } /* namespace zorba */
 /* vim:set et sw=2 ts=2: */
+
 #endif /* ZORBA_WITH_JSON */

=== modified file 'src/runtime/json/pregenerated/jsoniq_functions.cpp'
--- src/runtime/json/pregenerated/jsoniq_functions.cpp	2012-09-11 14:57:18 +0000
+++ src/runtime/json/pregenerated/jsoniq_functions.cpp	2012-09-11 15:56:21 +0000
@@ -473,6 +473,31 @@
 // </JSONArrayAppendIterator>
 
 #endif
+#ifdef ZORBA_WITH_JSON
+// <JSONBoxIterator>
+SERIALIZABLE_CLASS_VERSIONS(JSONBoxIterator)
+
+void JSONBoxIterator::serialize(::zorba::serialization::Archiver& ar)
+{
+  serialize_baseclass(ar,
+  (UnaryBaseIterator<JSONBoxIterator, PlanIteratorState>*)this);
+}
+
+
+void JSONBoxIterator::accept(PlanIterVisitor& v) const
+{
+  v.beginVisit(*this);
+
+  theChild->accept(v);
+
+  v.endVisit(*this);
+}
+
+JSONBoxIterator::~JSONBoxIterator() {}
+
+// </JSONBoxIterator>
+
+#endif
 
 }
 

=== modified file 'src/runtime/json/pregenerated/jsoniq_functions.h'
--- src/runtime/json/pregenerated/jsoniq_functions.h	2012-09-11 14:57:18 +0000
+++ src/runtime/json/pregenerated/jsoniq_functions.h	2012-09-11 15:56:21 +0000
@@ -586,6 +586,40 @@
 
 #endif
 
+#ifdef ZORBA_WITH_JSON
+/**
+ * 
+ *      
+ *    
+ * Author: Zorba Team
+ */
+class JSONBoxIterator : public UnaryBaseIterator<JSONBoxIterator, PlanIteratorState>
+{ 
+public:
+  SERIALIZABLE_CLASS(JSONBoxIterator);
+
+  SERIALIZABLE_CLASS_CONSTRUCTOR2T(JSONBoxIterator,
+    UnaryBaseIterator<JSONBoxIterator, PlanIteratorState>);
+
+  void serialize( ::zorba::serialization::Archiver& ar);
+
+  JSONBoxIterator(
+    static_context* sctx,
+    const QueryLoc& loc,
+    PlanIter_t& child)
+    : 
+    UnaryBaseIterator<JSONBoxIterator, PlanIteratorState>(sctx, loc, child)
+  {}
+
+  virtual ~JSONBoxIterator();
+
+  void accept(PlanIterVisitor& v) const;
+
+  bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
+};
+
+#endif
+
 }
 #endif
 /*

=== modified file 'src/runtime/pregenerated/iterator_enum.h'
--- src/runtime/pregenerated/iterator_enum.h	2012-09-10 18:50:57 +0000
+++ src/runtime/pregenerated/iterator_enum.h	2012-09-11 15:56:21 +0000
@@ -166,6 +166,7 @@
   TYPE_JSONReplaceValueIterator,
   TYPE_JSONRenameIterator,
   TYPE_JSONArrayAppendIterator,
+  TYPE_JSONBoxIterator,
   TYPE_SqrtIterator,
   TYPE_ExpIterator,
   TYPE_Exp10Iterator,

=== modified file 'src/runtime/spec/json/jsoniq_functions.xml'
--- src/runtime/spec/json/jsoniq_functions.xml	2012-09-11 14:57:18 +0000
+++ src/runtime/spec/json/jsoniq_functions.xml	2012-09-11 15:56:21 +0000
@@ -479,4 +479,35 @@
     
   </zorba:iterator>
 
+
+<!--
+/*******************************************************************************
+********************************************************************************/
+-->
+<zorba:iterator name="JSONBoxIterator" 
+                arity="unary"
+                preprocessorGuard="#ifdef ZORBA_WITH_JSON">
+
+    <zorba:description author="Zorba Team">
+      
+    </zorba:description>
+      internal function
+    <zorba:function>
+
+      <zorba:signature localname="json-box" prefix="op-zorba">
+        <zorba:param>item()*</zorba:param>
+        <zorba:output>item()</zorba:output>
+      </zorba:signature>
+
+      <zorba:methods>
+        <zorba:getReturnType/>
+        <zorba:accessesDynCtx returnValue="true"/>
+        <zorba:propagatesInputNodes value="true"/>
+        <zorba:mustCopyInputNodes/>
+      </zorba:methods>
+
+    </zorba:function>
+
+</zorba:iterator>
+
 </zorba:iterators>

=== modified file 'src/runtime/visitors/pregenerated/planiter_visitor.h'
--- src/runtime/visitors/pregenerated/planiter_visitor.h	2012-09-10 18:50:57 +0000
+++ src/runtime/visitors/pregenerated/planiter_visitor.h	2012-09-11 15:56:21 +0000
@@ -353,6 +353,9 @@
 #ifdef ZORBA_WITH_JSON
     class JSONArrayAppendIterator;
 #endif
+#ifdef ZORBA_WITH_JSON
+    class JSONBoxIterator;
+#endif
     class SqrtIterator;
 
     class ExpIterator;
@@ -1193,6 +1196,10 @@
     virtual void beginVisit ( const JSONArrayAppendIterator& ) = 0;
     virtual void endVisit   ( const JSONArrayAppendIterator& ) = 0;
 #endif
+#ifdef ZORBA_WITH_JSON
+    virtual void beginVisit ( const JSONBoxIterator& ) = 0;
+    virtual void endVisit   ( const JSONBoxIterator& ) = 0;
+#endif
     virtual void beginVisit ( const SqrtIterator& ) = 0;
     virtual void endVisit   ( const SqrtIterator& ) = 0;
 

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.cpp'
--- src/runtime/visitors/pregenerated/printer_visitor.cpp	2012-09-10 18:50:57 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.cpp	2012-09-11 15:56:21 +0000
@@ -2188,6 +2188,21 @@
 // </JSONArrayAppendIterator>
 
 #endif
+#ifdef ZORBA_WITH_JSON
+// <JSONBoxIterator>
+void PrinterVisitor::beginVisit ( const JSONBoxIterator& a) {
+  thePrinter.startBeginVisit("JSONBoxIterator", ++theId);
+  printCommons( &a, theId );
+  thePrinter.endBeginVisit( theId );
+}
+
+void PrinterVisitor::endVisit ( const JSONBoxIterator& ) {
+  thePrinter.startEndVisit();
+  thePrinter.endEndVisit();
+}
+// </JSONBoxIterator>
+
+#endif
 
 // <SqrtIterator>
 void PrinterVisitor::beginVisit ( const SqrtIterator& a) {

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.h'
--- src/runtime/visitors/pregenerated/printer_visitor.h	2012-09-10 18:50:57 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.h	2012-09-11 15:56:21 +0000
@@ -547,6 +547,11 @@
     void endVisit  ( const JSONArrayAppendIterator& );
 #endif
 
+#ifdef ZORBA_WITH_JSON
+    void beginVisit( const JSONBoxIterator& );
+    void endVisit  ( const JSONBoxIterator& );
+#endif
+
     void beginVisit( const SqrtIterator& );
     void endVisit  ( const SqrtIterator& );
 

=== modified file 'src/store/api/item_factory.h'
--- src/store/api/item_factory.h	2012-09-10 18:50:57 +0000
+++ src/store/api/item_factory.h	2012-09-11 15:56:21 +0000
@@ -717,6 +717,17 @@
       const std::vector<CopyMode>& copyModes) = 0;
 
   /**
+   * This method is used when we want to box a sequence of item into an array,
+   * but only if the sequence has more than 1 items.
+   */
+  virtual bool createJSONArray(
+      Item_t& result,
+      Item_t& item1,
+      Item_t& item2,
+      const Iterator_t& source,
+      const CopyMode& copyMode) = 0;
+
+  /**
    * This method is used by the public API only
    */
   virtual bool createJSONArray(

=== modified file 'src/store/naive/json_items.h'
--- src/store/naive/json_items.h	2012-09-10 18:50:57 +0000
+++ src/store/naive/json_items.h	2012-09-11 15:56:21 +0000
@@ -395,23 +395,22 @@
 
   class ValuesIterator : public store::Iterator
   {
-    protected:
-      SimpleJSONArray_t theArray;
-      Members::iterator theIter;
-
-    public:
-      ValuesIterator(const SimpleJSONArray_t& anArray)
-        : theArray(anArray) {}
-
-      virtual ~ValuesIterator();
-
-      virtual void open();
-
-      virtual bool next(store::Item_t&);
-
-      virtual void reset();
-
-      virtual void close();
+  protected:
+    SimpleJSONArray_t theArray;
+    Members::iterator theIter;
+
+  public:
+    ValuesIterator(const SimpleJSONArray_t& anArray) : theArray(anArray) {}
+
+    virtual ~ValuesIterator();
+    
+    virtual void open();
+
+    virtual bool next(store::Item_t&);
+
+    virtual void reset();
+
+    virtual void close();
   };
 
 private:

=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp	2012-09-10 18:50:57 +0000
+++ src/store/naive/simple_item_factory.cpp	2012-09-11 15:56:21 +0000
@@ -2121,6 +2121,34 @@
 
 bool BasicItemFactory::createJSONArray(
     store::Item_t& result,
+    store::Item_t& item1,
+    store::Item_t& item2,
+    const store::Iterator_t& source,
+    const store::CopyMode& copymode)
+{
+  result = new json::SimpleJSONArray();
+
+  json::SimpleJSONArray* array = static_cast<json::SimpleJSONArray*>(result.getp());
+
+  array->push_back(item1);
+  array->push_back(item2);
+  
+  store::Item_t item;
+
+  while (source->next(item))
+  {
+    if (copymode.theDoCopy && (item->isNode() || item->isJSONItem()))
+      item = item->copy(NULL, copymode);
+      
+    array->push_back(item);
+  }
+
+  return true;
+}
+
+
+bool BasicItemFactory::createJSONArray(
+    store::Item_t& result,
     const std::vector<store::Item_t>& items)
 {
   result = new json::SimpleJSONArray();

=== modified file 'src/store/naive/simple_item_factory.h'
--- src/store/naive/simple_item_factory.h	2012-09-10 18:50:57 +0000
+++ src/store/naive/simple_item_factory.h	2012-09-11 15:56:21 +0000
@@ -413,6 +413,13 @@
 
   bool createJSONArray(
       store::Item_t& result,
+      store::Item_t& item1,
+      store::Item_t& item2,
+      const store::Iterator_t& source,
+      const store::CopyMode& copyMode);
+
+  bool createJSONArray(
+      store::Item_t& result,
       const std::vector<store::Item_t>& items);
 
   bool createJSONObject(

=== modified file 'test/rbkt/ExpQueryResults/zorba/jsoniq/arr_replace_01.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/arr_replace_01.xml.res	2012-03-22 20:59:50 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/arr_replace_01.xml.res	2012-09-11 15:56:21 +0000
@@ -1,1 +1,1 @@
-{ "foo" : [ 1, 2, 3 ] }[ { "foo" : "bar" }, 2, 4 ]
+{ "foo" : [ 1, 2, 3 ] }[ { "foo" : "bar" }, [ 1, 2 ], 4 ]

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/obj_insert_06.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/obj_insert_06.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/obj_insert_06.xml.res	2012-09-11 15:56:21 +0000
@@ -0,0 +1,1 @@
+{ "foo" : [ "bar1", "bar2" ], "blub" : null }

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/obj_replace_05.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/obj_replace_05.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/obj_replace_05.xml.res	2012-09-11 15:56:21 +0000
@@ -0,0 +1,1 @@
+{ "foo" : [ [ 1, 2, 3 ], 10, 100, 1000 ] }

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/pair_value_boxing_01.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/pair_value_boxing_01.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/pair_value_boxing_01.xml.res	2012-09-11 15:56:21 +0000
@@ -0,0 +1,1 @@
+{ "foo" : [ "bar", "bar" ] }

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/pair_value_boxing_02.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/pair_value_boxing_02.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/pair_value_boxing_02.xml.res	2012-09-11 15:56:21 +0000
@@ -0,0 +1,1 @@
+{ "foo" : null }

=== modified file 'test/rbkt/Queries/zorba/jsoniq/arr_replace_01.xq'
--- test/rbkt/Queries/zorba/jsoniq/arr_replace_01.xq	2012-03-20 15:35:18 +0000
+++ test/rbkt/Queries/zorba/jsoniq/arr_replace_01.xq	2012-09-11 15:56:21 +0000
@@ -6,7 +6,8 @@
 (
  replace json value of $o("foo") with $a, 
  replace json value of $a(3) with 4, 
- replace json value of $a(1) with $o
+ replace json value of $a(1) with $o,
+ replace json value of $a(2) with (1, 2)
 );
 
 $o, $a

=== removed file 'test/rbkt/Queries/zorba/jsoniq/jnty0002-1.spec'
--- test/rbkt/Queries/zorba/jsoniq/jnty0002-1.spec	2012-06-19 14:58:25 +0000
+++ test/rbkt/Queries/zorba/jsoniq/jnty0002-1.spec	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Error: http://www.jsoniq.org/errors:JNTY0002

=== removed file 'test/rbkt/Queries/zorba/jsoniq/jnty0002-2.spec'
--- test/rbkt/Queries/zorba/jsoniq/jnty0002-2.spec	2012-06-19 14:58:25 +0000
+++ test/rbkt/Queries/zorba/jsoniq/jnty0002-2.spec	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Error: http://www.jsoniq.org/errors:JNTY0002

=== added file 'test/rbkt/Queries/zorba/jsoniq/obj_insert_06.xq'
--- test/rbkt/Queries/zorba/jsoniq/obj_insert_06.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/obj_insert_06.xq	2012-09-11 15:56:21 +0000
@@ -0,0 +1,5 @@
+declare variable $local:foo := {||};
+
+insert json { "foo" : ("bar1", "bar2"), "blub" : () } into $local:foo;
+
+$local:foo

=== added file 'test/rbkt/Queries/zorba/jsoniq/obj_replace_05.xq'
--- test/rbkt/Queries/zorba/jsoniq/obj_replace_05.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/obj_replace_05.xq	2012-09-11 15:56:21 +0000
@@ -0,0 +1,9 @@
+import module namespace j = "http://www.jsoniq.org/functions";
+
+variable $o := { "foo" : "bar" };
+variable $a :=  [ 1, 2, 3];
+
+replace json value of $o("foo") with ($a, 10, 100, 1000); 
+
+
+$o

=== renamed file 'test/rbkt/Queries/zorba/jsoniq/jnty0002-1.xq' => 'test/rbkt/Queries/zorba/jsoniq/pair_value_boxing_01.xq'
=== renamed file 'test/rbkt/Queries/zorba/jsoniq/jnty0002-2.xq' => 'test/rbkt/Queries/zorba/jsoniq/pair_value_boxing_02.xq'