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

[Markos Zaharioudakis]

1. EBV on jsoniq items returns true instead of error
2. Updated signature (and implementation) of jn and libjn functions according to latest spec
3. Removed from libjn functions that were also in jn
4. Removed jn:json-doc function

1. EBV on jsoniq items returns true instead of error
2. Updated signature (and implementation) of jn and libjn functions according to latest spec
3. Removed from libjn functions that were also in jn
4. Removed jn:json-doc function

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

11205. By Markos Zaharioudakis on 2013-08-14

1. EBV on jsoniq items returns true instead of error, 2. Updated signature (and implementation) of jn and libjn functions according to latest spec, 3. Removed from libjn functions that were also in jn, 4. Removed jn:json-doc function

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/180110

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/180110

Stage "TestZorbaUbuntu" failed.
2 tests failed (8401 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/216/testReport/ to view the results.

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

11206. By Markos Zaharioudakis on 2013-08-14

added documentation to private functions

11207. By Markos Zaharioudakis on 2013-08-14

merge from trunk

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/180110

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/180110

Stage "TestZorbaUbuntu" failed.
1 tests failed (8401 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/219/testReport/ to view the results.

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

11208. By Markos Zaharioudakis on 2013-08-14

fixed ruby test

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/180110

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'ChangeLog'
--- ChangeLog	2013-08-13 19:19:44 +0000
+++ ChangeLog	2013-08-14 19:07:42 +0000
@@ -11,6 +11,7 @@
 New Features:
   * The grouping variable in a group by clause is now optional
   * New syntax for array lookup: expr1[[expr2]]
+  * New jsoniq functions: jn:trim() and libjn:descendant-arrays()
 
 Optimizations:
   * Implemented hoisting optimization for general FLWOR.
@@ -68,8 +69,14 @@
   * Object/array navigation allows item()* as the type of the input sequence
     (doing implicit iteration over the input sequence and skipping items
      that are not objects/arrays).
+  * Several of the jsoniq functions now allow item()* as the type of the input
+    sequence (doing implicit iteration over the input sequence and skipping or
+    simply propagating items that are not objects/arrays).
   * Bug fix: selector value in object/array navigation is always cast to
     string/integer
+  * The function jn:is-null() has been removed.
+  * EBV on jsoniq items now returns true (instead of raising an error).
+  * Removed from libjn module the functions that existed in the jn module as well.
   * Renamed xqxq module to zorba-query module(zq module).
 
 version 2.9

=== modified file 'modules/org/jsoniq/www/function-library.xq'
--- modules/org/jsoniq/www/function-library.xq	2013-08-09 08:27:30 +0000
+++ modules/org/jsoniq/www/function-library.xq	2013-08-14 19:07:42 +0000
@@ -1,4 +1,4 @@
-xquery version "1.0";
+jsoniq version "1.0";
 
 (:
  : Copyright 2006-2012 The FLWOR Foundation.
@@ -36,27 +36,83 @@
 declare namespace ver = "http://zorba.io/options/versioning";
 declare option ver:module-version "1.0";
 
+
 (:~
- : This function dynamically builds an object, like jn:object, except that
- : it does not throw an error upon pair collision. Instead, it aggregates them
- : into an array.
+ : This function dynamically builds an object, like the {||} syntax, except that
+ : it does not throw an error upon pair collision. Instead, it accumulates them
+ : into an array, if more than one.
  :
- : @param $o A sequence of objects.
+ : @param $items A sequence of items, the objects of which are going to be
+ :        accumulated into a single object.
  : @return The accumulated object.
  :)
-declare function libjn:accumulate($o as object()*) as object()
-{
-  {[ $o ]}
-};
-
-(:~
- : This function returns all Objects contained within a JSON item, regardless of
- : depth.
- :
- : @param $i A JSON item.
- : @return Its descendant objects.
- :)
-declare function libjn:descendant-objects($i as json-item()) as object()*
+declare function libjn:accumulate($items as item()*) as object()
+{
+  {[ $items ]}
+};
+
+
+(:~
+ : This function returns all arrays contained at any depth within a sequence of items.
+ :
+ : @param $items A sequence of items.
+ : @return The descendant arrays of the input sequence.
+ :)
+declare function libjn:descendant-arrays($items as item()*) as array()*
+{
+  for $i in $items
+  return libjn:descendant-arrays-priv($i)
+};
+
+
+(:~
+ : Helper function for libjn:descendant-arrays()
+ :
+ : @param $i An item
+ : @return The descendant arrays of the item
+ :)
+declare %private function libjn:descendant-arrays-priv($i as item()) as array()*
+{
+  typeswitch ($i)
+
+  case object() return
+    for $v in libjn:values($i)
+    where $v instance of json-item()
+    return libjn:descendant-arrays-priv($v)
+
+  case array() return
+    (
+    $i,
+    for $v in $i[]
+    where $v instance of json-item()
+    return libjn:descendant-arrays-priv($v)
+    )
+
+  default return
+    ()
+};
+
+
+(:~
+ : This function returns all objects contained at any depth within a sequence of items.
+ :
+ : @param $items A sequence of items.
+ : @return The descendant objects of the input sequence.
+ :)
+declare function libjn:descendant-objects($items as item()*) as object()*
+{
+  for $i in $items
+  return libjn:descendant-objects-priv($i)
+};
+
+
+(:~
+ : Helper function for libjn:descendant-objects()
+ :
+ : @param $i An item
+ : @return The descendant objects of the item
+ :)
+declare %private function libjn:descendant-objects-priv($i as item()) as object()*
 {
   if ($i instance of object())
   then
@@ -64,109 +120,91 @@
       $i,
       for $v in libjn:values($i)
       where $v instance of json-item()
-      return libjn:descendant-objects($v)
+      return libjn:descendant-objects-priv($v)
     )
   else if ($i instance of array())
   then
     (
-      for $v in libjn:members($i)
+      for $v in $i[]
       where $v instance of json-item()
-      return libjn:descendant-objects($v)
+      return libjn:descendant-objects-priv($v)
     )
   else
     ()
 };
 
+
 (:~
- : This function returns all pairs contained within an object, recursively.
+ : This function returns all pairs contained at any depth within an sequence of items.
  :
  : @param $o An object.
  : @return All direct and indirect descendant pairs.
  :)
-declare function libjn:descendant-pairs($o as object()) as object()*
-{
-  for $k in jn:keys($o)
-  return (
-    { $k : $o($k) },
-    if ($o($k) instance of object())
-    then
-      libjn:descendant-pairs($o($k))
-    else ()
-  )
-};
-
-(:~
- : Recursively "flatten" a JSON Array, by replacing any arrays with their
- : members. Equivalent to
- :
- :   define function jn:flatten($arg as array()) {
- :     for $value in jn:values($arg)
- :     return
- :       if ($value instance of array())
- :       then jn:flatten($value)
- :       else $value
- :   };
- :
- : @param $a A JSON Array.
- : @return The flattened version of $a.
- :)
-declare function libjn:flatten($a as array()) as item()*
-{
-  jn:flatten($a)
-};
-
-(:~ This function returns the intersection of two objects, and aggregates
- : values corresponding to the same name into an array.
- :
- : @param $o A sequence of objects.
- : @return Their insersection.
- :)
-declare function libjn:intersect($o as object()*) as object()
+declare function libjn:descendant-pairs($items as item()*) as object()*
+{
+  for $i in $items
+  return libjn:descendant-pairs-priv($i)
+};
+
+
+(:~
+ : Helper function for libjn:descendant-pairs()
+ :
+ : @param $i An item
+ : @return The descendant pairs of the item
+ :)
+declare function libjn:descendant-pairs-priv($i as item()) as object()*
+{
+  typeswitch ($i)
+
+  case $o as object() return
+    for $k in jn:keys($o)
+    return
+      (
+      { $k : $o($k) },
+      libjn:descendant-pairs-priv($o($k))
+      )
+
+  case $a as array() return
+    for $i in $a[]
+    where $i instance of json-item()
+    return libjn:descendant-pairs-priv($i)
+
+  default return
+    ()
+};
+
+
+(:~
+ : This function returns the intersection of the objects contained in the
+ : given sequence of items, aggregating values corresponding to the same key
+ : into an array.
+ :
+ : @param $items A sequence of items.
+ : @return The insersection of the objects contained in $items.
+ :)
+declare function libjn:intersect($items as item()*) as object()
 {
   {|
-    let $common-keys := jn:keys($o[1])[ every $object in $o[position() > 1]
-                                           satisfies jn:keys($object) = . ]
-    for $key in $common-keys
-    let $values := $o($key)
-    return
-      if (count($values) eq 1)
-      then { $key : $values }
-      else { $key : [ $values ] }
+    let $objects := $items[$$ instance of object()]
+    for $key in keys(head($objects))
+    where every $o in tail($objects)
+          satisfies exists(index-of(keys($o), $key))
+    return { $key : $objects.$key }
   |}
 };
 
-(:~
- : Returns the members of an Array.
- :
- : @param $a A JSON Array.
- : @return The members of the specified array.
- :)
-declare function libjn:members($o as array()) as item()*
-{
-  jn:members($o)
-};
-
-(:~
- : Creates an object from the specified pairs of another given object. 
- : Specifically, for each name in $names, if the object $o has a pair with
- : that name, then a copy of that pair is included in the new object.
- :
- : @param $o A JSON Object.
- : @param $names The names of the pairs to copy out of $o and insert into the new object
- : @return The new object.
- :)
-declare function libjn:project($o as object(), $names as xs:string*) as object()
-{
-  jn:project($o, $names)
-};
-
-(:~
- : This functions returns all values in an Object.
- : @param $i An object.
- : @return Its values.
- :)
-declare function libjn:values($i as object()) as item()*
-{
+
+(:~
+ : This functions returns all values of all objects contained in a sequence of items.
+ :
+ : @param $items A sequence of items.
+ : @return The values inside the objects of the sequence.
+ :)
+declare function libjn:values($items as item()*) as item()*
+{
+  for $i in $items
   for $k in jn:keys($i)
-  return $i($k)
+  return ($i treat as object())($k)
 };
+

=== modified file 'modules/org/jsoniq/www/functions.xq'
--- modules/org/jsoniq/www/functions.xq	2013-08-12 12:49:39 +0000
+++ modules/org/jsoniq/www/functions.xq	2013-08-14 19:07:42 +0000
@@ -52,8 +52,7 @@
  : @param $items the items to be decoded.
  : @return the decoded items.
  :)
-declare function jn:decode-from-roundtrip(
-    $items as item()*) as item()* external;
+declare function jn:decode-from-roundtrip($items as item()*) as item()* external;
 
 
 (:~
@@ -90,8 +89,8 @@
  : @return the decoded items.
  :)
 declare function jn:decode-from-roundtrip(
-    $items as item()*,
-    $options as object()) as item()* external;
+    $items as item*,
+    $options as object) as item* external;
 
 
 (:~
@@ -111,8 +110,7 @@
  : @param $items the items to be encoded.
  : @return the encoded items.
  :)
-declare function jn:encode-for-roundtrip(
-    $items as item()*) as item()* external;
+declare function jn:encode-for-roundtrip($items as item()*) as item()* external;
 
 
 (:~
@@ -140,8 +138,8 @@
  : @return the encoded items.
  :)
 declare function jn:encode-for-roundtrip(
-    $items as item()*,
-    $options as object()) as item()* external;
+    $items as item*,
+    $options as object) as item* external;
 
 
 (:~
@@ -157,7 +155,8 @@
  :
  : @error jerr:JNDY0021 if the given string is not valid JSON.
  :)
-declare function jn:parse-json($j as xs:string?) as json-item()* external;
+declare function jn:parse-json($j as string?) as json-item* external;
+
 
 (:~
  : This function parses a given string as JSON and returns a sequence
@@ -179,9 +178,7 @@
  :
  : @return a sequence of JSON Object or Array item.
  :)
-declare function jn:parse-json(
-  $j as xs:string?,
-  $o as object()) as json-item()* external;
+declare function jn:parse-json($j as string?, $o as object) as json-item* external;
 
 
 (:~
@@ -193,29 +190,45 @@
  :           items of any other kind are simply skipped.
  : @return The distinct keys of the objects in the input sequence.
  :)
-declare function jn:keys($o as item()*) as xs:string* external;
-
-
-(:~
- : Creates an object from the specified pairs of another given object. 
- : Specifically, for each name in $names, if the object $o has a pair with
- : that name, then a copy of that pair is included in the new object.
- :
- : @param $o A JSON Object.
- : @param $names The names of the pairs to copy out of $o and insert into the new object
- : @return The new object.
- :)
-declare function jn:project($o as object(), $names as xs:string*) as object() external;
-
-
-(:~
- : Returns the size of a JSON Array. The size of an Array is
- : the number of members contained within it.
- :
- : @param $j A JSON Array.
- : @return The number of items in $j.
- :)
-declare function jn:size($j as array()?) as xs:integer? external;
+declare function jn:keys($o as item*) as string* external;
+
+
+(:~
+ : For each item in the given sequence, this function returns the item itself,
+ : if it is not an object, or its "projected" copy if it is an object. Projecting
+ : an object by a set of keys means creating a new object from the specified pairs
+ : of the source object. Specifically, for each key in $keys, if the object has a
+ : pair with that key, then a copy of that pair is included in the new object.
+ :
+ : @param $items A sequence of items.
+ : @param $keys The keys of the pairs to include from each object in $items.
+ : @return The projection of the original sequence.
+ :)
+declare function jn:project($items as item*, $keys as string*) as item* external;
+
+
+(:~
+ : For each item in the given sequence, this function returns the item itself,
+ : if it is not an object, or its "trimmed" copy, if it is an object. Trimming
+ : an object by a set of keys means creating a new object containing all the
+ : pairs of the source object except the ones whose key appears in the given
+ : set of keys.
+ :
+ : @param $items A sequence of items.
+ : @param $keys The keys of the pairs to exclude from each object in $items.
+ : @return The trimmed version of the input sequence.
+ :)
+declare function jn:trim($items as item*, $keys as string*) as item* external;
+
+
+(:~
+ : Returns the size of a JSON array, or the empty sequence if no array is given.
+ : The size of an Array is the number of members contained within it.
+ :
+ : @param $array A JSON array.
+ : @return The number of items in $array, or the empty sequence if $array is empty.
+ :)
+declare function jn:size($a as array?) as integer? external;
 
 
 (:~
@@ -226,30 +239,36 @@
  :           items of any other kind are simply skipped.
  : @return The members of the arrays in the input sequence.
  :)
-declare function jn:members($a as item()*) as item()* external;
+declare function jn:members($a as item*) as item* external;
 
 
 (:~
- : Recursively "flatten" a JSON Array, by replacing any arrays with their
- : members. Equivalent to
- :
- :   define function jn:flatten($arg as item())
+ : For each item in the given sequence, this function returns the item itself,
+ : if it is not an array, or a sequence of items "flattened-out" from the array.
+ : Flattening an array means replacing the array with its members, and recursively
+ : flattening any arrays in the members sequence.
+ :
+ : Note: The function is equivalent to
+ :
+ :   define function jn:flatten($args as item()*)
  :   {
- :     if ($arg instance of array())
- :     then
- :       for $value in jn:values($arg)
- :       return
- :         if ($value instance of array())
- :         then jn:flatten($value)
- :         else $value
- :     else
- :       ()
+ :     for $arg in args
+ :     return
+ :       if ($arg instance of array())
+ :       then
+ :         for $value in $arg[]
+ :         return
+ :           if ($value instance of array())
+ :           then jn:flatten($value[])
+ :           else $value
+ :       else
+ :         $arg
  :   };
  :
- : @param $a A JSON Array.
- : @return The flattened version of $a.
+ : @param $items A sequence of items
+ : @return The flattened-out items of the arrays in $items.
  :)
-declare function jn:flatten($a as item()) as item()* external;
+declare function jn:flatten($items as item*) as item* external;
 
 
 (:~

=== modified file 'src/compiler/rewriter/rules/fold_rules.cpp'
--- src/compiler/rewriter/rules/fold_rules.cpp	2013-07-24 23:29:35 +0000
+++ src/compiler/rewriter/rules/fold_rules.cpp	2013-08-14 19:07:42 +0000
@@ -769,7 +769,7 @@
       xqtref_t argType = arg->get_return_type();
       if (TypeOps::is_subtype(tm,
                               *argType,
-                              *GENV_TYPESYSTEM.ANY_NODE_TYPE_PLUS,
+                              *GENV_TYPESYSTEM.STRUCTURED_ITEM_TYPE_PLUS,
                               arg->get_loc()))
       {
         return rCtx.theEM->create_const_expr(sctx, udf, fo->get_loc(), true);

=== modified file 'src/functions/func_jsoniq_functions_impl.cpp'
--- src/functions/func_jsoniq_functions_impl.cpp	2013-08-12 12:49:39 +0000
+++ src/functions/func_jsoniq_functions_impl.cpp	2013-08-14 19:07:42 +0000
@@ -34,6 +34,30 @@
 /*******************************************************************************
 
 ********************************************************************************/
+PlanIter_t fn_jsoniq_parse_json::codegen(
+    CompilerCB*,
+    static_context* sctx,
+    const QueryLoc& loc,
+    std::vector<PlanIter_t>& argv,
+    expr& ann) const
+{
+  SingletonIterator* lArg = dynamic_cast<SingletonIterator*>(argv[0].getp());
+  if (lArg && lArg->getValue()->isAtomic())
+  {
+    const QueryLoc& lArgLoc = lArg->getLocation();
+    return new JSONParseIterator(sctx, loc, argv, lArgLoc);
+  }
+  else
+  {
+    QueryLoc lArgLoc = QueryLoc::null;
+    return new JSONParseIterator(sctx, loc, argv, lArgLoc);
+  }
+}
+
+
+/*******************************************************************************
+
+********************************************************************************/
 xqtref_t op_zorba_json_item_accessor::getReturnType(const fo_expr* caller) const
 {
   if (caller->get_arg(0)->get_return_type()->max_card() == 0)
@@ -46,6 +70,23 @@
 /*******************************************************************************
 
 ********************************************************************************/
+PlanIter_t fn_jsoniq_keys::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& arg) const
+{
+  if (arg.get_return_type()->max_card() <= 1)
+    return new SingleObjectNamesIterator(sctx, loc, argv[0]);
+
+  return new JSONObjectNamesIterator(sctx, loc, argv[0]);
+}
+
+
+/*******************************************************************************
+
+********************************************************************************/
 xqtref_t op_zorba_object_value::getReturnType(const fo_expr* caller) const
 {
   if (caller->get_arg(0)->get_return_type()->max_card() == 0)
@@ -58,6 +99,24 @@
 /*******************************************************************************
 
 ********************************************************************************/
+xqtref_t fn_jsoniq_project::getReturnType(const fo_expr* caller) const
+{
+  return caller->get_arg(0)->get_return_type();
+}
+
+
+/*******************************************************************************
+
+********************************************************************************/
+xqtref_t fn_jsoniq_trim::getReturnType(const fo_expr* caller) const
+{
+  return caller->get_arg(0)->get_return_type();
+}
+
+
+/*******************************************************************************
+
+********************************************************************************/
 xqtref_t op_zorba_array_member::getReturnType(const fo_expr* caller) const
 {
   if (caller->get_arg(0)->get_return_type()->max_card() == 0)
@@ -82,23 +141,6 @@
 /*******************************************************************************
 
 ********************************************************************************/
-PlanIter_t fn_jsoniq_keys::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& arg) const
-{
-  if (arg.get_return_type()->max_card() <= 1)
-    return new SingleObjectNamesIterator(sctx, loc, argv[0]);
-
-  return new JSONObjectNamesIterator(sctx, loc, argv[0]);
-}
-
-
-/*******************************************************************************
-
-********************************************************************************/
 PlanIter_t fn_jsoniq_members::codegen(
   CompilerCB*,
   static_context* sctx,
@@ -209,30 +251,6 @@
 /*******************************************************************************
 
 ********************************************************************************/
-PlanIter_t fn_jsoniq_parse_json::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  SingletonIterator* lArg = dynamic_cast<SingletonIterator*>(argv[0].getp());
-  if (lArg && lArg->getValue()->isAtomic())
-  {
-    const QueryLoc& lArgLoc = lArg->getLocation();
-    return new JSONParseIterator(sctx, loc, argv, lArgLoc);
-  }
-  else
-  {
-    QueryLoc lArgLoc = QueryLoc::null;
-    return new JSONParseIterator(sctx, loc, argv, lArgLoc);
-  }
-}
-
-
-/*******************************************************************************
-
-********************************************************************************/
 PlanIter_t jn_object::codegen(
   CompilerCB*,
   static_context* sctx,

=== modified file 'src/functions/pregenerated/func_jsoniq_functions.cpp'
--- src/functions/pregenerated/func_jsoniq_functions.cpp	2013-08-12 12:49:39 +0000
+++ src/functions/pregenerated/func_jsoniq_functions.cpp	2013-08-14 19:07:42 +0000
@@ -52,16 +52,6 @@
 }
 
 
-PlanIter_t fn_jsoniq_json_doc::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new JSONDocIterator(sctx, loc, argv);
-}
-
 PlanIter_t op_zorba_json_item_accessor::codegen(
   CompilerCB*,
   static_context* sctx,
@@ -103,6 +93,16 @@
   return new JSONObjectProjectIterator(sctx, loc, argv[0], argv[1]);
 }
 
+PlanIter_t fn_jsoniq_trim::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new JSONObjectTrimIterator(sctx, loc, argv[0], argv[1]);
+}
+
 PlanIter_t op_zorba_array_member::codegen(
   CompilerCB*,
   static_context* sctx,
@@ -295,18 +295,6 @@
 
 
       {
-    DECL_WITH_KIND(sctx, fn_jsoniq_json_doc,
-        (createQName("http://jsoniq.org/functions","","json-doc"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.JSON_ITEM_TYPE_STAR),
-        FunctionConsts::FN_JSONIQ_JSON_DOC_1);
-
-  }
-
-
-
-
-      {
     DECL_WITH_KIND(sctx, op_zorba_json_item_accessor,
         (createQName("http://zorba.io/internal/zorba-ops","","json-item-accessor"), 
         GENV_TYPESYSTEM.ITEM_TYPE_QUESTION, 
@@ -371,9 +359,9 @@
       {
     DECL_WITH_KIND(sctx, fn_jsoniq_project,
         (createQName("http://jsoniq.org/functions","","project"), 
-        GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
         GENV_TYPESYSTEM.STRING_TYPE_STAR, 
-        GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE),
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
         FunctionConsts::FN_JSONIQ_PROJECT_2);
 
   }
@@ -382,6 +370,19 @@
 
 
       {
+    DECL_WITH_KIND(sctx, fn_jsoniq_trim,
+        (createQName("http://jsoniq.org/functions","","trim"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
+        FunctionConsts::FN_JSONIQ_TRIM_2);
+
+  }
+
+
+
+
+      {
     DECL_WITH_KIND(sctx, op_zorba_array_member,
         (createQName("http://zorba.io/internal/zorba-ops","","array-member"), 
         GENV_TYPESYSTEM.ITEM_TYPE_QUESTION, 
@@ -433,7 +434,7 @@
       {
     DECL_WITH_KIND(sctx, fn_jsoniq_flatten,
         (createQName("http://jsoniq.org/functions","","flatten"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_ONE, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
         GENV_TYPESYSTEM.ITEM_TYPE_STAR),
         FunctionConsts::FN_JSONIQ_FLATTEN_1);
 

=== modified file 'src/functions/pregenerated/func_jsoniq_functions.h'
--- src/functions/pregenerated/func_jsoniq_functions.h	2013-08-12 12:49:39 +0000
+++ src/functions/pregenerated/func_jsoniq_functions.h	2013-08-14 19:07:42 +0000
@@ -95,25 +95,6 @@
 };
 
 
-//fn-jsoniq:json-doc
-class fn_jsoniq_json_doc : public function
-{
-public:
-  fn_jsoniq_json_doc(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  bool accessesDynCtx() const { return true; }
-
-  bool isSource() const { return true; }
-
-  CODEGEN_DECL();
-};
-
-
 //op-zorba:json-item-accessor
 class op_zorba_json_item_accessor : public function
 {
@@ -207,9 +188,36 @@
 
   }
 
-  bool propagatesInputNodes(expr* fo, csize producer) const { return producer == 0; }
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  bool propagatesInputNodes(expr* fo, csize producer) const { return producer == 0; }
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  bool isMap(csize producer) const { return producer == 0; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn-jsoniq:trim
+class fn_jsoniq_trim : public function
+{
+public:
+  fn_jsoniq_trim(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  bool propagatesInputNodes(expr* fo, csize producer) const { return producer == 0; }
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  bool isMap(csize producer) const { return producer == 0; }
 
   CODEGEN_DECL();
 };
@@ -312,6 +320,8 @@
 
   bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
 
+  bool isMap(csize producer) const { return producer == 0; }
+
   CODEGEN_DECL();
 };
 

=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h	2013-08-12 12:49:39 +0000
+++ src/functions/pregenerated/function_enum.h	2013-08-14 19:07:42 +0000
@@ -258,13 +258,13 @@
   FN_JSONIQ_ENCODE_FOR_ROUNDTRIP_2,
   FN_JSONIQ_PARSE_JSON_1,
   FN_JSONIQ_PARSE_JSON_2,
-  FN_JSONIQ_JSON_DOC_1,
   OP_ZORBA_JSON_ITEM_ACCESSOR_1,
   OP_ZORBA_JSON_ITEM_ACCESSOR_2,
   FN_JSONIQ_KEYS_1,
   OP_ZORBA_KEYS_1,
   OP_ZORBA_OBJECT_VALUE_2,
   FN_JSONIQ_PROJECT_2,
+  FN_JSONIQ_TRIM_2,
   OP_ZORBA_ARRAY_MEMBER_2,
   FN_JSONIQ_MEMBERS_1,
   OP_ZORBA_MEMBERS_1,

=== modified file 'src/runtime/booleans/BooleanImpl.cpp'
--- src/runtime/booleans/BooleanImpl.cpp	2013-06-11 09:43:21 +0000
+++ src/runtime/booleans/BooleanImpl.cpp	2013-08-14 19:07:42 +0000
@@ -116,18 +116,11 @@
     // empty sequence => false
     result = negate ^ false;
   }
-  else if (item->isNode())
+  else if (item->isNode() || item->isJSONItem())
   {
     // node => true
     result = negate ^ true;
   }
-  else if (item->isJSONItem())
-  {
-    xqtref_t type = tm->create_value_type(item);
-
-    RAISE_ERROR(err::FORG0006, loc,
-    ERROR_PARAMS(ZED(BadArgTypeForFn_2o34o), *type, "fn:boolean" ));
-  }
   else
   {
     store::SchemaTypeCode type = item->getTypeCode();

=== modified file 'src/runtime/json/jsoniq_functions_impl.cpp'
--- src/runtime/json/jsoniq_functions_impl.cpp	2013-08-12 12:49:39 +0000
+++ src/runtime/json/jsoniq_functions_impl.cpp	2013-08-14 19:07:42 +0000
@@ -895,96 +895,6 @@
 
 
 /*******************************************************************************
-
-********************************************************************************/
-void JSONDocIteratorState::init(PlanState& aState)
-{
-  PlanIteratorState::init(aState);
-  theStream = nullptr;
-  theGotOne = false;
-  loader_ = nullptr;
-}
-
-
-void JSONDocIteratorState::reset(PlanState& aState)
-{
-  PlanIteratorState::reset(aState);
-  theGotOne = false;
-  delete loader_;
-  loader_ = nullptr;
-}
-
-
-JSONDocIteratorState::~JSONDocIteratorState()
-{
-  delete loader_;
-}
-
-
-bool JSONDocIterator::nextImpl(store::Item_t& result, PlanState& planState) const
-{
-  store::Item_t uriItem;
-  JSONDocIteratorState* state;
-  zstring uriString;
-  zstring lErrorMessage;
-  internal::StreamResource* lStreamResource;
-  zstring lNormUri;
-  DEFAULT_STACK_INIT(JSONDocIteratorState, state, planState);
-
-  if (consumeNext(uriItem, theChildren[0].getp(), planState))
-  {
-    uriItem->getStringValue2(uriString);
-    // Normalize input to handle filesystem paths, etc.
-    normalizeInputUri(uriString, theSctx, loc, &lNormUri);
-
-    // Resolve URI to a stream
-    state->theResource = theSctx->resolve_uri(
-        lNormUri,
-        internal::EntityData::DOCUMENT,
-        lErrorMessage);
-
-    lStreamResource =
-        dynamic_cast<internal::StreamResource*>(state->theResource.get());
-    if (lStreamResource == NULL)
-    {
-      throw XQUERY_EXCEPTION(
-          err::FODC0002,
-          ERROR_PARAMS(uriString, lErrorMessage),
-          ERROR_LOC(loc));
-    }
-
-    state->theStream = lStreamResource->getStream();
-    if (state->theStream == NULL)
-    {
-      throw XQUERY_EXCEPTION(
-          err::FODC0002,
-          ERROR_PARAMS( uriString ),
-          ERROR_LOC(loc));
-    }
-
-    state->theGotOne = false;
-    state->loader_ = new json::loader( *state->theStream, true );
-
-    while ( state->loader_->next( &result ) )
-    {
-      if (!state->theGotOne)
-      {
-        state->theGotOne = true;
-        STACK_PUSH(true, state);
-      }
-      else
-      {
-        RAISE_ERROR(jerr::JNDY0021, loc,
-        ERROR_PARAMS(ZED(JNDY0021_UnexpectedExtraContent)));
-      }
-    }
-  }
-  
-  STACK_END(state);
-}
-
-
-/*******************************************************************************
   op_zorba:json-item-accessor($i as item()?, $sel as item()?) as item()?
 
   op_zorba:json-item-accessor($i as item()?) as item()*
@@ -1071,7 +981,7 @@
 
 
 /*******************************************************************************
-  op-zorba:names($o as item()) as xs:string*
+  op-zorba:keys($o as item()) as xs:string*
 ********************************************************************************/
 bool SingleObjectNamesIterator::nextImpl(
     store::Item_t& result,
@@ -1125,7 +1035,7 @@
 
 
 /*******************************************************************************
-  jn:names($o as item()*) as xs:string*
+  jn:keys($o as item()*) as xs:string*
 ********************************************************************************/
 
 void JSONObjectNamesIteratorState::init(PlanState& planState)
@@ -1161,12 +1071,14 @@
       while (state->theNames->next(result))
       {
         name = result->getStringValue();
+
         if (!state->theNamesSet->exists(name))
         {
           state->theNamesSet->insert(name);
           STACK_PUSH(true, state);
         }
       }
+
       state->theNames = NULL;
     }
   }
@@ -1176,7 +1088,7 @@
 
 
 /*******************************************************************************
-  json:value($o as item(), $name as item()?) as item()?
+  op-zorba:object-value($o as item()?, $name as item()?) as item()?
 
   Note: the translator always wraps the $name param to a [cast as xs:string?]
   expr, so we don's have to check the type of the selector item here.
@@ -1199,7 +1111,7 @@
       {
         result = input->getObjectValue(name);
         
-      STACK_PUSH(result != NULL, state);
+        STACK_PUSH(result != NULL, state);
       }
     }
   }
@@ -1209,86 +1121,137 @@
 
 
 /*******************************************************************************
-  json:project($o as object(), $names as xs:string*) as object()
+  jn:project($items as item()*, $names as xs:string*) as item()*
 ********************************************************************************/
 bool JSONObjectProjectIterator::nextImpl(
-  store::Item_t& result,
-  PlanState& planState) const
+    store::Item_t& result,
+    PlanState& planState) const
 {
-  store::Item_t obj;
   store::Item_t key;
   store::Iterator_t keysIte;
   store::Item_t value;
-  store::Item_t name;
-  std::vector<store::Item_t> names;
-  csize numNames = 0;
+  csize numKeys = 0;
   store::CopyMode copymode;
-  std::vector<store::Item_t> newNames;
+  std::vector<store::Item_t> newKeys;
   std::vector<store::Item_t> newValues;
   csize i;
 
-  PlanIteratorState* state;
-  DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
-
-  consumeNext(obj, theChild0.getp(), planState);
-
-  while (consumeNext(name, theChild1.getp(), planState))
-  {
-    ++numNames;
-    names.resize(numNames);
-    names[numNames - 1].transfer(name);
-  }
-
-  keysIte = obj->getObjectKeys();
-  keysIte->open();
-
-  while (keysIte->next(key))
-  {
-    for (i = 0; i < numNames; ++i)
-    {
-      if (names[i]->getStringValue() == key->getStringValue())
-        break;
-    }
-
-    if (i < numNames)
-    {
-      value = obj->getObjectValue(key);
-
-      if (value->isStructuredItem())
-        value = value->copy(NULL, copymode);
-
-      newValues.push_back(value);
-      newNames.push_back(key);
-    }
-  }
-
-  keysIte->close();
-
-  GENV_ITEMFACTORY->createJSONObject(result, newNames, newValues);
-
-  STACK_PUSH(true, state);
+  JSONObjectProjectIteratorState* state;
+  DEFAULT_STACK_INIT(JSONObjectProjectIteratorState, state, planState);
+
+  state->theFilterKeys.clear();
+
+  while (consumeNext(key, theChild1.getp(), planState))
+  {
+    ++numKeys;
+    state->theFilterKeys.resize(numKeys);
+    state->theFilterKeys[numKeys - 1].transfer(key);
+  }
+
+  while (consumeNext(result, theChild0.getp(), planState))
+  {
+    if (result->isObject())
+    {
+      numKeys = state->theFilterKeys.size();
+
+      keysIte = result->getObjectKeys();
+      keysIte->open();
+
+      while (keysIte->next(key))
+      {
+        for (i = 0; i < numKeys; ++i)
+        {
+          if (state->theFilterKeys[i]->getStringValue() == key->getStringValue())
+            break;
+        }
+        
+        if (i < numKeys)
+        {
+          value = result->getObjectValue(key);
+          
+          if (value->isStructuredItem())
+            value = value->copy(NULL, copymode);
+          
+          newValues.push_back(value);
+          newKeys.push_back(key);
+        }
+      }
+
+      keysIte->close();
+
+      GENV_ITEMFACTORY->createJSONObject(result, newKeys, newValues);
+    }
+
+    STACK_PUSH(true, state);
+  }
+
   STACK_END(state);
 }
 
 
 /*******************************************************************************
-  j:size($i as array()) as xs:integer*
+  jn:trim($items as item()*, $names as xs:string*) as item()*
 ********************************************************************************/
-bool JSONArraySizeIterator::nextImpl(
+bool JSONObjectTrimIterator::nextImpl(
     store::Item_t& result,
     PlanState& planState) const
 {
-  store::Item_t item;
-  xs_integer size;
-
-  PlanIteratorState* state;
-  DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
-
-  if (consumeNext(item, theChild.getp(), planState))
-  {
-    size = item->getArraySize();
-
-    STACK_PUSH(GENV_ITEMFACTORY->createInteger(result, size), state);
+  store::Item_t key;
+  store::Iterator_t keysIte;
+  store::Item_t value;
+  csize numKeys = 0;
+  store::CopyMode copymode;
+  std::vector<store::Item_t> newKeys;
+  std::vector<store::Item_t> newValues;
+  csize i;
+
+  JSONObjectTrimIteratorState* state;
+  DEFAULT_STACK_INIT(JSONObjectTrimIteratorState, state, planState);
+
+  state->theFilterKeys.clear();
+
+  while (consumeNext(key, theChild1.getp(), planState))
+  {
+    ++numKeys;
+    state->theFilterKeys.resize(numKeys);
+    state->theFilterKeys[numKeys - 1].transfer(key);
+  }
+
+  while (consumeNext(result, theChild0.getp(), planState))
+  {
+    if (result->isObject())
+    {
+      numKeys = state->theFilterKeys.size();
+
+      keysIte = result->getObjectKeys();
+      keysIte->open();
+
+      while (keysIte->next(key))
+      {
+        for (i = 0; i < numKeys; ++i)
+        {
+          if (state->theFilterKeys[i]->getStringValue() == key->getStringValue())
+            break;
+        }
+        
+        if (i >= numKeys)
+        {
+          value = result->getObjectValue(key);
+          
+          if (value->isStructuredItem())
+            value = value->copy(NULL, copymode);
+          
+          newValues.push_back(value);
+          newKeys.push_back(key);
+        }
+      }
+
+      keysIte->close();
+
+      GENV_ITEMFACTORY->createJSONObject(result, newKeys, newValues);
+    }
+
+    STACK_PUSH(true, state);
   }
 
   STACK_END(state);
@@ -1296,7 +1259,7 @@
 
 
 /*******************************************************************************
-  json:member($a as item(), $pos as item()?) as item()?
+  op-zorba:member($a as item()?, $pos as item()?) as item()?
 
   Note: the translator always wraps the $pos param to a [cast as xs:integer?]
   expr, so we don's have to check the type of the selector item here.
@@ -1438,9 +1401,31 @@
 
 
 /*******************************************************************************
-  json:flatten($a as item()) as item()*
-
-  op-zorba:flatten-internal($a as item()*) as item()*
+  jn:size($i as array()?) as xs:integer?
+********************************************************************************/
+bool JSONArraySizeIterator::nextImpl(
+    store::Item_t& result,
+    PlanState& planState) const
+{
+  store::Item_t item;
+  xs_integer size;
+
+  PlanIteratorState* state;
+  DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
+
+  if (consumeNext(item, theChild.getp(), planState))
+  {
+    size = item->getArraySize();
+
+    STACK_PUSH(GENV_ITEMFACTORY->createInteger(result, size), state);
+  }
+
+  STACK_END(state);
+}
+
+
+/*******************************************************************************
+  jn:flatten($items as item()*) as item()*
 ********************************************************************************/
 void JSONArrayFlattenIteratorState::reset(PlanState& planState)
 {
@@ -1453,47 +1438,51 @@
 
 
 bool JSONArrayFlattenIterator::nextImpl(
-  store::Item_t& result,
-  PlanState& planState) const
+    store::Item_t& result,
+    PlanState& planState) const
 {
-  store::Item_t item;
   bool foundArray = false;
 
   JSONArrayFlattenIteratorState* state;
   DEFAULT_STACK_INIT(JSONArrayFlattenIteratorState, state, planState);
 
-  consumeNext(item, theChild.getp(), planState);
-
-  if (item->isArray())
+  while (consumeNext(result, theChild.getp(), planState))
   {
-    state->theStack.push(item->getArrayValues());
-
-    state->theStack.top()->open();
-
-    while (!state->theStack.empty())
+    if (result->isArray())
     {
-      while (state->theStack.top()->next(result))
+      state->theStack.push(result->getArrayValues());
+
+      state->theStack.top()->open();
+
+      while (!state->theStack.empty())
       {
-        if (result->isArray())
+        while (state->theStack.top()->next(result))
         {
-          state->theStack.push(result->getArrayValues());
-          state->theStack.top()->open();
+          if (result->isArray())
+          {
+            state->theStack.push(result->getArrayValues());
+            state->theStack.top()->open();
 
-          foundArray = true;
-          break;
-        }
+            foundArray = true;
+            break;
+          }
       
-        STACK_PUSH(true, state);
-      }
-    
-      if (foundArray)
-      {
-        foundArray = false;
-        continue;
-      }
-    
-      state->theStack.top()->close();
-      state->theStack.pop();
+          STACK_PUSH(true, state);
+        }
+    
+        if (foundArray)
+        {
+          foundArray = false;
+          continue;
+        }
+    
+        state->theStack.top()->close();
+        state->theStack.pop();
+      }
+    }
+    else
+    {
+      STACK_PUSH(true, state);
     }
   }
 

=== modified file 'src/runtime/json/pregenerated/jsoniq_functions.cpp'
--- src/runtime/json/pregenerated/jsoniq_functions.cpp	2013-08-12 12:49:39 +0000
+++ src/runtime/json/pregenerated/jsoniq_functions.cpp	2013-08-14 19:07:42 +0000
@@ -144,36 +144,6 @@
 // </JSONParseIterator>
 
 
-// <JSONDocIterator>
-SERIALIZABLE_CLASS_VERSIONS(JSONDocIterator)
-
-void JSONDocIterator::serialize(::zorba::serialization::Archiver& ar)
-{
-  serialize_baseclass(ar,
-  (NaryBaseIterator<JSONDocIterator, JSONDocIteratorState>*)this);
-}
-
-
-void JSONDocIterator::accept(PlanIterVisitor& v) const
-{
-  v.beginVisit(*this);
-
-  std::vector<PlanIter_t>::const_iterator lIter = theChildren.begin();
-  std::vector<PlanIter_t>::const_iterator lEnd = theChildren.end();
-  for ( ; lIter != lEnd; ++lIter ){
-    (*lIter)->accept(v);
-  }
-
-  v.endVisit(*this);
-}
-
-JSONDocIterator::~JSONDocIterator() {}
-
-JSONDocIteratorState::JSONDocIteratorState() {}
-
-// </JSONDocIterator>
-
-
 // <JSONItemAccessorIterator>
 SERIALIZABLE_CLASS_VERSIONS(JSONItemAccessorIterator)
 
@@ -309,7 +279,7 @@
 void JSONObjectProjectIterator::serialize(::zorba::serialization::Archiver& ar)
 {
   serialize_baseclass(ar,
-  (BinaryBaseIterator<JSONObjectProjectIterator, PlanIteratorState>*)this);
+  (BinaryBaseIterator<JSONObjectProjectIterator, JSONObjectProjectIteratorState>*)this);
 }
 
 
@@ -325,9 +295,58 @@
 
 JSONObjectProjectIterator::~JSONObjectProjectIterator() {}
 
+JSONObjectProjectIteratorState::JSONObjectProjectIteratorState() {}
+
+JSONObjectProjectIteratorState::~JSONObjectProjectIteratorState() {}
+
+
+void JSONObjectProjectIteratorState::init(PlanState& planState) {
+  PlanIteratorState::init(planState);
+}
+
+void JSONObjectProjectIteratorState::reset(PlanState& planState) {
+  PlanIteratorState::reset(planState);
+}
 // </JSONObjectProjectIterator>
 
 
+// <JSONObjectTrimIterator>
+SERIALIZABLE_CLASS_VERSIONS(JSONObjectTrimIterator)
+
+void JSONObjectTrimIterator::serialize(::zorba::serialization::Archiver& ar)
+{
+  serialize_baseclass(ar,
+  (BinaryBaseIterator<JSONObjectTrimIterator, JSONObjectTrimIteratorState>*)this);
+}
+
+
+void JSONObjectTrimIterator::accept(PlanIterVisitor& v) const
+{
+  v.beginVisit(*this);
+
+  theChild0->accept(v);
+theChild1->accept(v);
+
+  v.endVisit(*this);
+}
+
+JSONObjectTrimIterator::~JSONObjectTrimIterator() {}
+
+JSONObjectTrimIteratorState::JSONObjectTrimIteratorState() {}
+
+JSONObjectTrimIteratorState::~JSONObjectTrimIteratorState() {}
+
+
+void JSONObjectTrimIteratorState::init(PlanState& planState) {
+  PlanIteratorState::init(planState);
+}
+
+void JSONObjectTrimIteratorState::reset(PlanState& planState) {
+  PlanIteratorState::reset(planState);
+}
+// </JSONObjectTrimIterator>
+
+
 // <JSONArrayMemberIterator>
 SERIALIZABLE_CLASS_VERSIONS(JSONArrayMemberIterator)
 

=== modified file 'src/runtime/json/pregenerated/jsoniq_functions.h'
--- src/runtime/json/pregenerated/jsoniq_functions.h	2013-08-12 12:49:39 +0000
+++ src/runtime/json/pregenerated/jsoniq_functions.h	2013-08-14 19:07:42 +0000
@@ -192,52 +192,6 @@
 
 
 /**
- * jn:json-doc
- * Author: Zorba Team
- */
-class JSONDocIteratorState : public PlanIteratorState
-{
-public:
-  std::auto_ptr<internal::Resource> theResource; //
-  std::istream* theStream; //
-  bool theGotOne; //
-  json::loader* loader_; //
-
-  JSONDocIteratorState();
-
-  ~JSONDocIteratorState();
-
-  void init(PlanState&);
-  void reset(PlanState&);
-};
-
-class JSONDocIterator : public NaryBaseIterator<JSONDocIterator, JSONDocIteratorState>
-{ 
-public:
-  SERIALIZABLE_CLASS(JSONDocIterator);
-
-  SERIALIZABLE_CLASS_CONSTRUCTOR2T(JSONDocIterator,
-    NaryBaseIterator<JSONDocIterator, JSONDocIteratorState>);
-
-  void serialize( ::zorba::serialization::Archiver& ar);
-
-  JSONDocIterator(
-    static_context* sctx,
-    const QueryLoc& loc,
-    std::vector<PlanIter_t>& children)
-    : 
-    NaryBaseIterator<JSONDocIterator, JSONDocIteratorState>(sctx, loc, children)
-  {}
-
-  virtual ~JSONDocIterator();
-
-  void accept(PlanIterVisitor& v) const;
-
-  bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
-};
-
-
-/**
  * 
  * Author: 
  */
@@ -288,7 +242,7 @@
 {
 public:
   store::Iterator_t theNames; //
-  std::auto_ptr<HashSet<zstring, HashMapZStringCmp> > theNamesSet; //
+  std::unique_ptr<HashSet<zstring, HashMapZStringCmp> > theNamesSet; //
 
   JSONObjectNamesIteratorState();
 
@@ -403,13 +357,26 @@
  * 
  * Author: 
  */
-class JSONObjectProjectIterator : public BinaryBaseIterator<JSONObjectProjectIterator, PlanIteratorState>
+class JSONObjectProjectIteratorState : public PlanIteratorState
+{
+public:
+  std::vector<store::Item_t> theFilterKeys; //
+
+  JSONObjectProjectIteratorState();
+
+  ~JSONObjectProjectIteratorState();
+
+  void init(PlanState&);
+  void reset(PlanState&);
+};
+
+class JSONObjectProjectIterator : public BinaryBaseIterator<JSONObjectProjectIterator, JSONObjectProjectIteratorState>
 { 
 public:
   SERIALIZABLE_CLASS(JSONObjectProjectIterator);
 
   SERIALIZABLE_CLASS_CONSTRUCTOR2T(JSONObjectProjectIterator,
-    BinaryBaseIterator<JSONObjectProjectIterator, PlanIteratorState>);
+    BinaryBaseIterator<JSONObjectProjectIterator, JSONObjectProjectIteratorState>);
 
   void serialize( ::zorba::serialization::Archiver& ar);
 
@@ -418,7 +385,7 @@
     const QueryLoc& loc,
     PlanIter_t& child1, PlanIter_t& child2)
     : 
-    BinaryBaseIterator<JSONObjectProjectIterator, PlanIteratorState>(sctx, loc, child1, child2)
+    BinaryBaseIterator<JSONObjectProjectIterator, JSONObjectProjectIteratorState>(sctx, loc, child1, child2)
   {}
 
   virtual ~JSONObjectProjectIterator();
@@ -433,6 +400,49 @@
  * 
  * Author: 
  */
+class JSONObjectTrimIteratorState : public PlanIteratorState
+{
+public:
+  std::vector<store::Item_t> theFilterKeys; //
+
+  JSONObjectTrimIteratorState();
+
+  ~JSONObjectTrimIteratorState();
+
+  void init(PlanState&);
+  void reset(PlanState&);
+};
+
+class JSONObjectTrimIterator : public BinaryBaseIterator<JSONObjectTrimIterator, JSONObjectTrimIteratorState>
+{ 
+public:
+  SERIALIZABLE_CLASS(JSONObjectTrimIterator);
+
+  SERIALIZABLE_CLASS_CONSTRUCTOR2T(JSONObjectTrimIterator,
+    BinaryBaseIterator<JSONObjectTrimIterator, JSONObjectTrimIteratorState>);
+
+  void serialize( ::zorba::serialization::Archiver& ar);
+
+  JSONObjectTrimIterator(
+    static_context* sctx,
+    const QueryLoc& loc,
+    PlanIter_t& child1, PlanIter_t& child2)
+    : 
+    BinaryBaseIterator<JSONObjectTrimIterator, JSONObjectTrimIteratorState>(sctx, loc, child1, child2)
+  {}
+
+  virtual ~JSONObjectTrimIterator();
+
+  void accept(PlanIterVisitor& v) const;
+
+  bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
+};
+
+
+/**
+ * 
+ * Author: 
+ */
 class JSONArrayMemberIterator : public BinaryBaseIterator<JSONArrayMemberIterator, PlanIteratorState>
 { 
 public:

=== modified file 'src/runtime/pregenerated/iterator_enum.h'
--- src/runtime/pregenerated/iterator_enum.h	2013-08-12 12:49:39 +0000
+++ src/runtime/pregenerated/iterator_enum.h	2013-08-14 19:07:42 +0000
@@ -167,12 +167,12 @@
   TYPE_JSONDecodeFromRoundtripIterator,
   TYPE_JSONEncodeForRoundtripIterator,
   TYPE_JSONParseIterator,
-  TYPE_JSONDocIterator,
   TYPE_JSONItemAccessorIterator,
   TYPE_JSONObjectNamesIterator,
   TYPE_SingleObjectNamesIterator,
   TYPE_JSONObjectValueIterator,
   TYPE_JSONObjectProjectIterator,
+  TYPE_JSONObjectTrimIterator,
   TYPE_JSONArrayMemberIterator,
   TYPE_JSONArrayMembersIterator,
   TYPE_SingleArrayMembersIterator,

=== modified file 'src/runtime/spec/json/jsoniq_functions.xml'
--- src/runtime/spec/json/jsoniq_functions.xml	2013-08-12 12:49:39 +0000
+++ src/runtime/spec/json/jsoniq_functions.xml	2013-08-14 19:07:42 +0000
@@ -202,39 +202,6 @@
 /*******************************************************************************
 ********************************************************************************/
 -->
-<zorba:iterator name="JSONDocIterator">
-  
-  <zorba:description author="Zorba Team">jn:json-doc</zorba:description>
-  
-  <zorba:function>
-    
-    <zorba:signature localname="json-doc" prefix="fn-jsoniq">
-      <zorba:param>xs:string?</zorba:param>
-      <zorba:output>json-item()*</zorba:output>
-    </zorba:signature>
-    
-    <zorba:methods>
-      <zorba:accessesDynCtx returnValue="true"/>
-      <zorba:isSource returnValue="true"/>
-    </zorba:methods>
-    
-  </zorba:function>
-  
-  <zorba:state generateInit="false" generateReset="false" generateDestructor="false">
-    <zorba:member type="std::auto_ptr&lt;internal::Resource&gt;" name="theResource" brief=""/>
-    <zorba:member type="std::istream*" name="theStream" brief=""/>
-    <zorba:member type="bool" name="theGotOne" brief=""/>
-    <zorba:member type="json::loader*" name="loader_" brief=""/>
-  </zorba:state>
-  
-</zorba:iterator>
-
-
-
-<!--
-/*******************************************************************************
-********************************************************************************/
--->
 <zorba:iterator name="JSONItemAccessorIterator">
 
   <zorba:function isDeterministic="true">
@@ -292,7 +259,7 @@
 
     <zorba:member type="store::Iterator_t" name="theNames"/>
 
-    <zorba:member type="std::auto_ptr&lt;HashSet&lt;zstring, HashMapZStringCmp> >"
+    <zorba:member type="std::unique_ptr&lt;HashSet&lt;zstring, HashMapZStringCmp> >"
                   name="theNamesSet"/>
   </zorba:state>
 
@@ -365,17 +332,53 @@
   <zorba:function isDeterministic="true">
 
     <zorba:signature localname="project" prefix="fn-jsoniq">
-      <zorba:param>object()</zorba:param>
-      <zorba:param>xs:string*</zorba:param>
-      <zorba:output>object()</zorba:output>
-    </zorba:signature>
-
-    <zorba:methods>
-      <zorba:propagatesInputNodes producer="0"/>
-      <zorba:mustCopyInputNodes value="false"/>
-    </zorba:methods>
-
-  </zorba:function>
+      <zorba:param>item()*</zorba:param>
+      <zorba:param>xs:string*</zorba:param>
+      <zorba:output>item()*</zorba:output>
+    </zorba:signature>
+
+    <zorba:methods>
+      <zorba:getReturnType/>
+      <zorba:propagatesInputNodes producer="0"/>
+      <zorba:mustCopyInputNodes value="false"/>
+      <zorba:isMap producer="0"/>
+    </zorba:methods>
+
+  </zorba:function>
+
+  <zorba:state>
+    <zorba:member type="std::vector&lt;store::Item_t&gt;" name="theFilterKeys"/>
+  </zorba:state>
+
+</zorba:iterator>
+
+
+<!--
+/*******************************************************************************
+********************************************************************************/
+-->
+<zorba:iterator name="JSONObjectTrimIterator" arity="binary">
+
+  <zorba:function isDeterministic="true">
+
+    <zorba:signature localname="trim" prefix="fn-jsoniq">
+      <zorba:param>item()*</zorba:param>
+      <zorba:param>xs:string*</zorba:param>
+      <zorba:output>item()*</zorba:output>
+    </zorba:signature>
+
+    <zorba:methods>
+      <zorba:getReturnType/>
+      <zorba:propagatesInputNodes producer="0"/>
+      <zorba:mustCopyInputNodes value="false"/>
+      <zorba:isMap producer="0"/>
+    </zorba:methods>
+
+  </zorba:function>
+
+  <zorba:state>
+    <zorba:member type="std::vector&lt;store::Item_t&gt;" name="theFilterKeys"/>
+  </zorba:state>
 
 </zorba:iterator>
 
@@ -507,13 +510,14 @@
   <zorba:function isDeterministic="true">
 
     <zorba:signature localname="flatten" prefix="fn-jsoniq">
-      <zorba:param>item()</zorba:param>
+      <zorba:param>item()*</zorba:param>
       <zorba:output>item()*</zorba:output>
     </zorba:signature>
 
     <zorba:methods>
       <zorba:propagatesInputNodes value="true"/>
       <zorba:mustCopyInputNodes value="false"/>
+      <zorba:isMap producer="0"/>
     </zorba:methods>
 
   </zorba:function>

=== modified file 'src/runtime/visitors/pregenerated/planiter_visitor.h'
--- src/runtime/visitors/pregenerated/planiter_visitor.h	2013-08-12 12:49:39 +0000
+++ src/runtime/visitors/pregenerated/planiter_visitor.h	2013-08-14 19:07:42 +0000
@@ -340,8 +340,6 @@
 
     class JSONParseIterator;
 
-    class JSONDocIterator;
-
     class JSONItemAccessorIterator;
 
     class JSONObjectNamesIterator;
@@ -352,6 +350,8 @@
 
     class JSONObjectProjectIterator;
 
+    class JSONObjectTrimIterator;
+
     class JSONArrayMemberIterator;
 
     class JSONArrayMembersIterator;
@@ -1214,9 +1214,6 @@
     virtual void beginVisit ( const JSONParseIterator& ) = 0;
     virtual void endVisit   ( const JSONParseIterator& ) = 0;
 
-    virtual void beginVisit ( const JSONDocIterator& ) = 0;
-    virtual void endVisit   ( const JSONDocIterator& ) = 0;
-
     virtual void beginVisit ( const JSONItemAccessorIterator& ) = 0;
     virtual void endVisit   ( const JSONItemAccessorIterator& ) = 0;
 
@@ -1232,6 +1229,9 @@
     virtual void beginVisit ( const JSONObjectProjectIterator& ) = 0;
     virtual void endVisit   ( const JSONObjectProjectIterator& ) = 0;
 
+    virtual void beginVisit ( const JSONObjectTrimIterator& ) = 0;
+    virtual void endVisit   ( const JSONObjectTrimIterator& ) = 0;
+
     virtual void beginVisit ( const JSONArrayMemberIterator& ) = 0;
     virtual void endVisit   ( const JSONArrayMemberIterator& ) = 0;
 

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.cpp'
--- src/runtime/visitors/pregenerated/printer_visitor.cpp	2013-08-12 12:49:39 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.cpp	2013-08-14 19:07:42 +0000
@@ -2052,20 +2052,6 @@
 // </JSONParseIterator>
 
 
-// <JSONDocIterator>
-void PrinterVisitor::beginVisit ( const JSONDocIterator& a) {
-  thePrinter.startBeginVisit("JSONDocIterator", ++theId);
-  printCommons( &a, theId );
-  thePrinter.endBeginVisit( theId );
-}
-
-void PrinterVisitor::endVisit ( const JSONDocIterator& ) {
-  thePrinter.startEndVisit();
-  thePrinter.endEndVisit();
-}
-// </JSONDocIterator>
-
-
 // <JSONItemAccessorIterator>
 void PrinterVisitor::beginVisit ( const JSONItemAccessorIterator& a) {
   thePrinter.startBeginVisit("JSONItemAccessorIterator", ++theId);
@@ -2136,6 +2122,20 @@
 // </JSONObjectProjectIterator>
 
 
+// <JSONObjectTrimIterator>
+void PrinterVisitor::beginVisit ( const JSONObjectTrimIterator& a) {
+  thePrinter.startBeginVisit("JSONObjectTrimIterator", ++theId);
+  printCommons( &a, theId );
+  thePrinter.endBeginVisit( theId );
+}
+
+void PrinterVisitor::endVisit ( const JSONObjectTrimIterator& ) {
+  thePrinter.startEndVisit();
+  thePrinter.endEndVisit();
+}
+// </JSONObjectTrimIterator>
+
+
 // <JSONArrayMemberIterator>
 void PrinterVisitor::beginVisit ( const JSONArrayMemberIterator& a) {
   thePrinter.startBeginVisit("JSONArrayMemberIterator", ++theId);

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.h'
--- src/runtime/visitors/pregenerated/printer_visitor.h	2013-08-12 12:49:39 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.h	2013-08-14 19:07:42 +0000
@@ -520,9 +520,6 @@
     void beginVisit( const JSONParseIterator& );
     void endVisit  ( const JSONParseIterator& );
 
-    void beginVisit( const JSONDocIterator& );
-    void endVisit  ( const JSONDocIterator& );
-
     void beginVisit( const JSONItemAccessorIterator& );
     void endVisit  ( const JSONItemAccessorIterator& );
 
@@ -538,6 +535,9 @@
     void beginVisit( const JSONObjectProjectIterator& );
     void endVisit  ( const JSONObjectProjectIterator& );
 
+    void beginVisit( const JSONObjectTrimIterator& );
+    void endVisit  ( const JSONObjectTrimIterator& );
+
     void beginVisit( const JSONArrayMemberIterator& );
     void endVisit  ( const JSONArrayMemberIterator& );
 

=== modified file 'swig/ruby/tests/test12.rb'
--- swig/ruby/tests/test12.rb	2013-04-17 16:58:03 +0000
+++ swig/ruby/tests/test12.rb	2013-08-14 19:07:42 +0000
@@ -31,7 +31,8 @@
 
 print "Running: Compile query string using JSONiq \n"
 query = <<-eoquery
- let $sats := jn:json-doc("@rubyPathFiles@/tests/satellites.json")('satellites') 
+ import module namespace file='http://expath.org/ns/file';
+ let $sats := jn:parse-json(file:read-text("@rubyPathFiles@/tests/satellites.json"))('satellites') 
  return { 
    'visible' : [ 
       for $sat in jn:keys($sats) 
@@ -49,4 +50,4 @@
 test(zorba, query)
 
 zorba.shutdown()
-Zorba_api::InMemoryStore.shutdown(store)
\ No newline at end of file
+Zorba_api::InMemoryStore.shutdown(store)

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/ebv02.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/ebv02.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/ebv02.xml.res	2013-08-14 19:07:42 +0000
@@ -0,0 +1,1 @@
+true

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/ebv03.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/ebv03.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/ebv03.xml.res	2013-08-14 19:07:42 +0000
@@ -0,0 +1,1 @@
+true

=== added file 'test/rbkt/ExpQueryResults/zorba/jsoniq/json_doc_3.xml.res'
--- test/rbkt/ExpQueryResults/zorba/jsoniq/json_doc_3.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/jsoniq/json_doc_3.xml.res	2013-08-14 19:07:42 +0000
@@ -0,0 +1,1 @@
+{ "foo" : "bar" }{ "bar" : "foo" }

=== removed file 'test/rbkt/ExpQueryResults/zorba/jsoniq/json_doc_4.xml.res'
=== removed file 'test/rbkt/Queries/zorba/jsoniq/ebv02.spec'
--- test/rbkt/Queries/zorba/jsoniq/ebv02.spec	2012-03-12 17:04:56 +0000
+++ test/rbkt/Queries/zorba/jsoniq/ebv02.spec	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Error: http://www.w3.org/2005/xqt-errors:FORG0006

=== removed file 'test/rbkt/Queries/zorba/jsoniq/ebv03.spec'
--- test/rbkt/Queries/zorba/jsoniq/ebv03.spec	2012-02-07 20:19:48 +0000
+++ test/rbkt/Queries/zorba/jsoniq/ebv03.spec	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Error: http://www.w3.org/2005/xqt-errors:FORG0006

=== modified file 'test/rbkt/Queries/zorba/jsoniq/input2.json'
--- test/rbkt/Queries/zorba/jsoniq/input2.json	2012-10-15 13:39:36 +0000
+++ test/rbkt/Queries/zorba/jsoniq/input2.json	2013-08-14 19:07:42 +0000
@@ -1,1 +1,1 @@
-{ "foo" : "bar" } { "bar" : "foo" }
+{ "foo" : "bar" }{ "bar" : "foo" }

=== modified file 'test/rbkt/Queries/zorba/jsoniq/json_doc_1.xq'
--- test/rbkt/Queries/zorba/jsoniq/json_doc_1.xq	2012-10-15 13:39:36 +0000
+++ test/rbkt/Queries/zorba/jsoniq/json_doc_1.xq	2013-08-14 19:07:42 +0000
@@ -1,1 +1,7 @@
-jn:json-doc("input1.json")
\ No newline at end of file
+
+import module namespace fetch="http://www.zorba-xquery.com/modules/fetch";
+
+import module namespace file="http://expath.org/ns/file";
+
+
+jn:parse-json(file:read-text("$RBKT_SRC_DIR/Queries/zorba/jsoniq/input1.json"))

=== modified file 'test/rbkt/Queries/zorba/jsoniq/json_doc_2.xq'
--- test/rbkt/Queries/zorba/jsoniq/json_doc_2.xq	2012-10-15 13:39:36 +0000
+++ test/rbkt/Queries/zorba/jsoniq/json_doc_2.xq	2013-08-14 19:07:42 +0000
@@ -1,1 +1,5 @@
-[ jn:json-doc("input1.json")("foo") ]
\ No newline at end of file
+
+import module namespace file="http://expath.org/ns/file";
+
+
+[ jn:parse-json(file:read-text("$RBKT_SRC_DIR/Queries/zorba/jsoniq/input1.json"))("foo") ]

=== removed file 'test/rbkt/Queries/zorba/jsoniq/json_doc_3.spec'
--- test/rbkt/Queries/zorba/jsoniq/json_doc_3.spec	2012-10-15 13:49:49 +0000
+++ test/rbkt/Queries/zorba/jsoniq/json_doc_3.spec	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-Error: http://jsoniq.org/errors:JNDY0021

=== modified file 'test/rbkt/Queries/zorba/jsoniq/json_doc_3.xq'
--- test/rbkt/Queries/zorba/jsoniq/json_doc_3.xq	2012-10-15 13:39:36 +0000
+++ test/rbkt/Queries/zorba/jsoniq/json_doc_3.xq	2013-08-14 19:07:42 +0000
@@ -1,1 +1,4 @@
-jn:json-doc("input2.json")
\ No newline at end of file
+
+import module namespace file="http://expath.org/ns/file";
+
+jn:parse-json(file:read-text("$RBKT_SRC_DIR/Queries/zorba/jsoniq/input2.json"))

=== removed file 'test/rbkt/Queries/zorba/jsoniq/json_doc_4.xq'
--- test/rbkt/Queries/zorba/jsoniq/json_doc_4.xq	2012-10-15 13:49:49 +0000
+++ test/rbkt/Queries/zorba/jsoniq/json_doc_4.xq	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-jn:json-doc(())
\ No newline at end of file

=== modified file 'test/rbkt/Queries/zorba/jsoniq/json_doc_5.xq'
--- test/rbkt/Queries/zorba/jsoniq/json_doc_5.xq	2012-10-15 13:49:49 +0000
+++ test/rbkt/Queries/zorba/jsoniq/json_doc_5.xq	2013-08-14 19:07:42 +0000
@@ -1,1 +1,4 @@
-jn:json-doc("input3.json")
\ No newline at end of file
+
+import module namespace file="http://expath.org/ns/file";
+
+jn:parse-json(file:read-text("$RBKT_SRC_DIR/Queries/zorba/jsoniq/input3.json"))