Merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba

[Markos Zaharioudakis]

Fix for bug #1167993

Fix for bug #1167993

[lp:~zorba-coders/zorba/markos-scratch]

11098. By Markos Zaharioudakis on 2013-05-05

Fixed bug #1167993

[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/markos-scratch-2013-05-05T05-03-58.062Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-05-05T05-03-58.062Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-05-04 20:20:05 +0000
+++ src/compiler/translator/translator.cpp	2013-05-05 04:52:29 +0000
@@ -4565,7 +4565,6 @@
       RAISE_ERROR(err::XQST0048, loc, ERROR_PARAMS(ve->get_name()->getStringValue()));
     }
 
-
     if (v.is_extern() && initExpr != NULL)
     {
       RAISE_ERROR(err::XPST0003, loc, ERROR_PARAMS(ZED(XPST0003_ExternalVar)));
@@ -11925,6 +11924,22 @@
 
     break;
   }
+  case FunctionConsts::FN_JSONIQ_VALUE_2:
+  {
+    arguments[1] = CREATE(cast)(theRootSctx, theUDF, loc,
+                                arguments[1],
+                                theRTM.STRING_TYPE_ONE,
+                                false);
+    break;
+  }
+  case FunctionConsts::FN_JSONIQ_MEMBER_2:
+  {
+    arguments[1] = CREATE(cast)(theRootSctx, theUDF, loc,
+                                arguments[1],
+                                theRTM.INTEGER_TYPE_ONE,
+                                false);
+    break;
+  }
   case FunctionConsts::FN_CONCAT_N:
   {
     if (numArgs < 2)
@@ -12193,33 +12208,47 @@
     }
 
     function* func;
-
-    if (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_ARRAY_TYPE_STAR))
-    {
-      func = (numArgs == 1 ?
-              BUILTIN_FUNC(FN_JSONIQ_MEMBER_2) :
-              BUILTIN_FUNC(FN_JSONIQ_MEMBERS_1));
-    }
-    else if (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_OBJECT_TYPE_STAR))
-    {
-      func = (numArgs == 1 ?
-              BUILTIN_FUNC(FN_JSONIQ_VALUE_2) :
-              BUILTIN_FUNC(FN_JSONIQ_KEYS_1));
+    expr* accessorExpr;
+
+    if (numArgs == 1)
+    {
+      if (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_ARRAY_TYPE_STAR))
+      {
+        func = BUILTIN_FUNC(FN_JSONIQ_MEMBER_2);
+      }
+      else if (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_OBJECT_TYPE_STAR))
+      {
+        func = BUILTIN_FUNC(FN_JSONIQ_VALUE_2);
+      }
+      else
+      {
+        func = BUILTIN_FUNC(OP_ZORBA_JSON_ITEM_ACCESSOR_2);
+      }
+
+      arguments.insert(arguments.begin(), flworVarExpr);
+
+      accessorExpr = generate_fn_body(func, arguments, loc);
     }
     else
     {
-      func = (numArgs == 1 ?
-              BUILTIN_FUNC(OP_ZORBA_JSON_ITEM_ACCESSOR_2) :
-              BUILTIN_FUNC(OP_ZORBA_JSON_ITEM_ACCESSOR_1));
+      if (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_ARRAY_TYPE_STAR))
+      {
+        func = BUILTIN_FUNC(FN_JSONIQ_MEMBERS_1);
+      }
+      else if (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_OBJECT_TYPE_STAR))
+      {
+        func = BUILTIN_FUNC(FN_JSONIQ_KEYS_1);
+      }
+      else
+      {
+        func = BUILTIN_FUNC(OP_ZORBA_JSON_ITEM_ACCESSOR_1);
+      }
+
+      accessorExpr = CREATE(fo)(theRootSctx, theUDF, loc, func, flworVarExpr);
+
+      normalize_fo(static_cast<fo_expr*>(accessorExpr));
     }
 
-    fo_expr* accessorExpr = 
-    (numArgs == 1 ?
-     CREATE(fo)(theRootSctx, theUDF, loc, func, flworVarExpr, arguments[0]) :
-     CREATE(fo)(theRootSctx, theUDF, loc, func, flworVarExpr));
-
-    normalize_fo(accessorExpr);
-
     flworExpr->set_return_expr(accessorExpr);
   }
   else

=== modified file 'src/runtime/hof/dynamic_fncall_iterator.cpp'
--- src/runtime/hof/dynamic_fncall_iterator.cpp	2013-04-16 20:06:08 +0000
+++ src/runtime/hof/dynamic_fncall_iterator.cpp	2013-05-05 04:52:29 +0000
@@ -176,13 +176,11 @@
   store::Item_t item;
   store::Item_t targetItem;
   FunctionItem* fnItem;
-#ifdef ZORBA_WITH_JSON
   store::Item_t selectorItem1;
   store::Item_t selectorItem2;
   store::Item_t selectorItem3;
   bool isObjectNav;
   bool selectorError;
-#endif
 
   TypeManager* tm = theSctx->get_typemanager();
 
@@ -268,7 +266,7 @@
     } // if (theIsPartialApply)
 
   } // if (targetItem->isFunction())
-#ifdef ZORBA_WITH_JSON
+
   else if (targetItem->isJSONObject() || targetItem->isJSONArray())
   {
     if (theChildren.size() > 2)
@@ -366,7 +364,6 @@
       state->theIterator->close();
     }
   }
-#endif
   else
   {
     xqtref_t type = tm->create_value_type(targetItem);

=== modified file 'src/runtime/json/jsoniq_functions_impl.cpp'
--- src/runtime/json/jsoniq_functions_impl.cpp	2013-04-05 22:56:02 +0000
+++ src/runtime/json/jsoniq_functions_impl.cpp	2013-05-05 04:52:29 +0000
@@ -249,6 +249,7 @@
   return true;
 }
 
+
 bool
 JSONDecodeFromRoundtripIterator::decodeXDM(
   const store::Item_t& anObj,
@@ -318,6 +319,7 @@
   }
 }
 
+
 bool
 JSONDecodeFromRoundtripIterator::decodeObject(
   const store::Item_t& anObj,
@@ -356,6 +358,7 @@
   return false;
 }
 
+
 bool
 JSONDecodeFromRoundtripIterator::decodeArray(
   const store::Item_t& anArray,
@@ -384,6 +387,7 @@
   return false;
 }
 
+
 bool
 JSONDecodeFromRoundtripIterator::decodeItem(
   const store::Item_t& anItem,
@@ -405,6 +409,7 @@
   }
 }
 
+
 bool
 JSONDecodeFromRoundtripIterator::nextImpl(
   store::Item_t& aResult,
@@ -492,6 +497,7 @@
   return false;
 }
 
+
 bool
 JSONEncodeForRoundtripIterator::encodeArray(
   const store::Item_t& anArray,
@@ -608,6 +614,7 @@
   return true;
 }
 
+
 bool
 JSONEncodeForRoundtripIterator::encodeNode(
     const store::Item_t& aNode,
@@ -657,6 +664,7 @@
   return true;
 }
 
+
 bool
 JSONEncodeForRoundtripIterator::encodeItem(
   const store::Item_t& anItem,
@@ -681,6 +689,7 @@
   }
 }
 
+
 bool
 JSONEncodeForRoundtripIterator::nextImpl(
   store::Item_t& aResult,
@@ -772,6 +781,7 @@
   loader_ = nullptr;
 }
 
+
 JSONParseIteratorState::~JSONParseIteratorState()
 {
   if (theInput == NULL)
@@ -779,6 +789,7 @@
   delete loader_;
 }
 
+
 bool JSONParseIterator::processBooleanOption( store::Item_t const &options,
                                               char const *option_name,
                                               bool *option_value ) const
@@ -809,6 +820,7 @@
   return false;
 }
 
+
 bool
 JSONParseIterator::nextImpl(
   store::Item_t& result,

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/member_04.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/member_04.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/member_04.xml.res	2013-05-05 04:52:29 +0000
@@ -0,0 +1,1 @@
+1

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/value_03.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/value_03.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/value_03.xml.res	2013-05-05 04:52:29 +0000
@@ -0,0 +1,1 @@
+2

=== modified file 'test/rbkt/Queries/zorba/jsoniq/member_03.spec'
--- test/rbkt/Queries/zorba/jsoniq/member_03.spec	2012-02-05 17:39:57 +0000
+++ test/rbkt/Queries/zorba/jsoniq/member_03.spec	2013-05-05 04:52:29 +0000
@@ -1,1 +1,1 @@
-Error: http://www.w3.org/2005/xqt-errors:XPTY0004
+Error: http://www.w3.org/2005/xqt-errors:FORG0001

=== added file 'test/rbkt/Queries/zorba/jsoniq/member_04.xq'
--- test/rbkt/Queries/zorba/jsoniq/member_04.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/member_04.xq	2013-05-05 04:52:29 +0000
@@ -0,0 +1,1 @@
+[ 1 ]("1")

=== added file 'test/rbkt/Queries/zorba/jsoniq/value_03.xq'
--- test/rbkt/Queries/zorba/jsoniq/value_03.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/jsoniq/value_03.xq	2013-05-05 04:52:29 +0000
@@ -0,0 +1,3 @@
+
+
+{"1":2}(1)