Merge lp:~zorba-coders/zorba/jsoniq into lp:zorba

[Matthias Brantner]

...

Adds JSONiq.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/-2012-01-31T00-53-26.285Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:zorba/3.0 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:71 (list):
  list index: 2 out of range (-2, 1)

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job -2012-01-31T00-53-26.285Z is finished. The final
  status was:

  43 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/-2012-01-31T01-44-59.475Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:zorba/3.0 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:71 (list):
  list index: 2 out of range (-2, 1)

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job -2012-01-31T01-44-59.475Z is finished. The final
  status was:

  17 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in src/store/naive/item.cpp
text conflict in src/store/naive/simple_pul.cpp

[lp:~zorba-coders/zorba/jsoniq]

10645. By Chris Hillery on 2012-02-08

Adding documentation for all functions.

10646. By Chris Hillery on 2012-02-08

Merge from trunk.

10647. By Chris Hillery on 2012-02-08

Added ItemFactory methods to create JSON items, along with test cases.

10648. By Markos Zaharioudakis on 2012-02-08

predeclared jn prefix

10649. By Markos Zaharioudakis on 2012-02-08

predeclared jn prefix (2nd try)

10650. By Matthias Brantner on 2012-02-08

commit the pre-generated parser files

10651. By Matthias Brantner on 2012-02-08

fixed jsoniq namespace + always process the jsoniq module because it contains udfs

10652. By Matthias Brantner on 2012-02-08

build fixes for without json

10653. By Matthias Brantner on 2012-02-08

added two tutorials as html. also temporarily removed the json module declaration
in order to make xqdoc work

10654. By Matthias Brantner on 2012-02-09

merge with trunk

10655. By Matthias Brantner on 2012-02-09

always indent by default in the swig bindings (this is a hack to get a nicer output in the web interface)

10656. By Matthias Brantner on 2012-02-09

fixed output of JSON_Test in xqdoc (e.g. array())

10657. By Chris Hillery on 2012-02-09

Allow "jsoniq" serialization method to serve for SAX output.

10658. By Chris Hillery on 2012-02-09

There are now 6 built-in namespace bindings (including jn: ).

10659. By Chris Hillery on 2012-02-09

Use Store::populateJSONArray() in ItemFactory.

10660. By Matthias Brantner on 2012-02-09

updated namespace prefix in the jsoniq module to jn

10661. By Matthias Brantner on 2012-02-09

- revert rev. 10655
- in execute, make the default indent + no xml decl

10662. By Matthias Brantner on 2012-02-09

updated jsoniq tutorials to latest drafts

10663. By Nicolae Brinza on 2012-03-07

Implementation of the new Cloudscript grammar.

10664. By Markos Zaharioudakis on 2012-03-08

removed pairs from type system and compiler

10665. By Markos Zaharioudakis on 2012-03-08

merge from trunk

10666. By Markos Zaharioudakis on 2012-03-09

forbid json items in xml constructors

10667. By Markos Zaharioudakis on 2012-03-09

translation of json constructor exprs

10668. By Markos Zaharioudakis on 2012-03-12

re-implemented json constructors

10669. By Markos Zaharioudakis on 2012-03-12

fixed EBV for jsoniq

10670. By Markos Zaharioudakis on 2012-03-13

work on jsoniq functions

10671. By Markos Zaharioudakis on 2012-03-13

fixed error codes and tests

10672. By Markos Zaharioudakis on 2012-03-13

implemented values( as object()) function

10673. By Markos Zaharioudakis on 2012-03-13

implemented accumulating object constructor

10674. By Markos Zaharioudakis on 2012-03-13

implemented the project function

10675. By Markos Zaharioudakis on 2012-03-16

implemented object insertions

10676. By Markos Zaharioudakis on 2012-03-19

more work on jsoniq updates

10677. By Markos Zaharioudakis on 2012-03-20

more work on jsoniq updates

10678. By Chris Hillery on 2012-03-20

Add Cloudscript-defined serialization parameters (boilerplate; not all
features implemented fully yet). Enable setting of serialization
parameters via .spec files.

10679. By Chris Hillery on 2012-03-20

Added CloudScript serialization error codes, and implementation checks to
throw them when appropriate. Several test cases.

10680. By Markos Zaharioudakis on 2012-03-20

done with object updates

10681. By Markos Zaharioudakis on 2012-03-20

fixed tests failing due to serialization changes

10682. By Markos Zaharioudakis on 2012-03-22

more work on array updates

10683. By Markos Zaharioudakis on 2012-03-23

done with array updates

10684. By Markos Zaharioudakis on 2012-03-23

renamed jn:names to jn:keys + removed 0-arity navigation

10685. By Markos Zaharioudakis on 2012-03-24

removed array(ItemType) type

10686. By Markos Zaharioudakis on 2012-04-03

introduced JNTY0002 error

10687. By Markos Zaharioudakis on 2012-04-11

merge from trunk + work on static and dynamic collection modules

10688. By Markos Zaharioudakis on 2012-04-12

merged with trunk

10689. By Markos Zaharioudakis on 2012-04-17

fixed no-copy rule omission

10690. By Chris Hillery on 2012-04-19

Re-enable support for "old-style" Serialization: .spec file options
(should be deprecated, but still used by some non-core modules)

10691. By Chris Hillery on 2012-04-24

Remove public API methods that are specific to Object Pairs (no longer part
of the JSONiq spec).

10692. By Ghislain Fourny on 2012-05-10

Merged jsoniq-plan_serialization branch.

10693. By Ghislain Fourny on 2012-05-10

Merged trunk back.

10694. By Ghislain Fourny on 2012-05-10

Fixed flwor expression clause getter.

10695. By Ghislain Fourny on 2012-05-10

Now compiles and links.

10696. By Ghislain Fourny on 2012-05-14

Merged trunk back (10838).

10697. By Ghislain Fourny on 2012-05-15

Fixed some tests.

10698. By Chris Hillery on 2012-05-15

Additional fixes to handle old-style --method Serialization args correctly.

10699. By Ghislain Fourny on 2012-05-15

Copied pregenerated scanner and parser files.

10700. By Ghislain Fourny on 2012-05-18

Merged changes from child branch.

10701. By Ghislain Fourny on 2012-06-08

Merged trunk back.

10702. By Ghislain Fourny on 2012-06-08

Added curly braces in JSON insert expressions.

10703. By Ghislain Fourny on 2012-06-08

Extended update syntax to general FilterExprs.

10704. By Ghislain Fourny on 2012-06-11

Solved memory leak.

10705. By Ghislain Fourny on 2012-06-11

Adding tests.

10706. By Ghislain Fourny on 2012-06-11

Collection functions now work with general items.

10707. By Ghislain Fourny on 2012-06-11

Began removing pairs in the implementation. Still build errors.

10708. By Ghislain Fourny on 2012-06-12

Now compiles, but does not link yet.

10709. By Ghislain Fourny on 2012-06-12

Now links.

10710. By Ghislain Fourny on 2012-06-12

All JSONiq tests now pass.

10711. By Ghislain Fourny on 2012-06-12

Renamed cloudscript-extensions to jsoniq-extensions

10712. By Ghislain Fourny on 2012-06-12

Renamed cloudscript to jsoniq.

10713. By Ghislain Fourny on 2012-06-12

Renamed cloudscript to jsoniq.

10714. By Ghislain Fourny on 2012-06-12

Renamed cloudscript to jsoniq.

10715. By Ghislain Fourny on 2012-06-12

Now outputs INF upon positive infinity.

10716. By Ghislain Fourny on 2012-06-12

Using the pre-imported jn: prefix in some tests.

10717. By Ghislain Fourny on 2012-06-13

JSON items are now pointing to the root of their tree.

10718. By Ghislain Fourny on 2012-06-14

Indices should now work.

10719. By Ghislain Fourny on 2012-06-14

Index creation and probe should now work.

10720. By Ghislain Fourny on 2012-06-14

Reverted rename.

10721. By Ghislain Fourny on 2012-06-15

Reverted renaming.

10722. By Ghislain Fourny on 2012-06-15

Merged trunk back.

10723. By Ghislain Fourny on 2012-06-15

Merged jsoniq-deactivated back.

10724. By Ghislain Fourny on 2012-06-15

Fixed index maintenance.

10725. By Ghislain Fourny on 2012-06-15

Fixed tests.

10726. By Ghislain Fourny on 2012-06-18

Merged trunk back.

10727. By Ghislain Fourny on 2012-06-18

Synced error codes.

10728. By Ghislain Fourny on 2012-06-18

Added guards.

10729. By Ghislain Fourny on 2012-06-18

Deactivating JSON for merge proposal and one more fix.

10730. By Ghislain Fourny on 2012-06-19

Synced error codes.

10731. By Ghislain Fourny on 2012-06-19

Solved bug 918151 by allowing mixed items if a flag is set.

10732. By Ghislain Fourny on 2012-06-19

Removed useless and obsolete code that still contained JSON Pairs.

10733. By Ghislain Fourny on 2012-06-19

Fixed comment.

10734. By Ghislain Fourny on 2012-06-19

Added files.

10735. By Markos Zaharioudakis on 2012-06-20

small cosmetic changes

10736. By Ghislain Fourny on 2012-06-20

Implemented Markos' comments 1 through 5.

10737. By Ghislain Fourny on 2012-06-20

Implemented Markos' comments 7, 8 and 9.

10738. By Ghislain Fourny on 2012-06-20

Changed signature of getArraySize() to xs_integer.

10739. By Ghislain Fourny on 2012-06-20

Corrected bug and reverted mappings.xml to JSONiq deactivated version.

10740. By Ghislain Fourny on 2012-06-20

Adding tests.

10741. By Ghislain Fourny on 2012-06-20

Updated pregenerated parser files.

10742. By Ghislain Fourny on 2012-06-20

Generating preprocessor guards for STRUCTURED_ITEM.

10743. By Ghislain Fourny on 2012-06-21

Fixed emit_end().

10744. By Ghislain Fourny on 2012-06-21

Updated updating error code and adding wrappers.

10745. By Ghislain Fourny on 2012-06-22

Now back to original order when outputting keys.

10746. By Ghislain Fourny on 2012-06-22

Optimized JSON root management system.

10747. By Ghislain Fourny on 2012-06-22

Optimized JSON item value memory management.

10748. By Ghislain Fourny on 2012-06-22

Using items instead of zstrings as keys in JSON objects.

10749. By Ghislain Fourny on 2012-06-22

Replaced dynamic casts with static casts and added dynamic cast assertions for debug mode.

10750. By Ghislain Fourny on 2012-06-22

Merged trunk back.

10751. By Markos Zaharioudakis on 2012-06-26

compilation fixes

10752. By Markos Zaharioudakis on 2012-06-26

compilation fixes

10753. By Markos Zaharioudakis on 2012-06-26

added all variants of getStringValue() for JSONNull + cosmetic

10754. By Markos Zaharioudakis on 2012-06-26

merge from trunk

10755. By Ghislain Fourny on 2012-06-26

Implemented Markos' comments, except 10.

10756. By Ghislain Fourny on 2012-06-26

Merged trunk back.

10757. By Ghislain Fourny on 2012-06-26

Fixed tests.

10758. By Ghislain Fourny on 2012-06-27

Merged trunk back.

10759. By Ghislain Fourny on 2012-06-28

Implemented more efficient data structure on objects.

10760. By Ghislain Fourny on 2012-06-28

Changed parameter of getObjectValue() to an item.

10761. By Ghislain Fourny on 2012-06-28

Removed free list.

10762. By Ghislain Fourny on 2012-06-28

changed 1st param of setJSONRoot() to Item* to save some ref counting + eliminated some compiler warnings

10763. By Ghislain Fourny on 2012-06-28

Fixed compilation error on Windows.

10764. By Ghislain Fourny on 2012-06-28

Improved efficiency of removing an object pair.

10765. By Markos Zaharioudakis on 2012-06-28

a better implementation for SimpleJSONObject::remove()

10766. By Markos Zaharioudakis on 2012-06-28

small optimizations + cosmetic

10767. By Markos Zaharioudakis on 2012-06-28

commented out ZORBA_TEST_PLAN_SERIALIZATION flag in testdriver.cpp

10768. By Markos Zaharioudakis on 2012-06-29

fixed compiler warnings

10769. By Markos Zaharioudakis on 2012-06-29

fixed print out of jsoniq errors

10770. By Markos Zaharioudakis on 2012-06-29

added missing <value> to a couple of jsoniq errors

10771. By Ghislain Fourny on 2012-07-02

Deactivated invariant assertions for the moment.

10772. By Ghislain Fourny on 2012-07-04

Merged trunk back.

10773. By Ghislain Fourny on 2012-07-04

Regenerated files.

10774. By Ghislain Fourny on 2012-07-04

A small fix (already in trunk).

Unmerged revisions

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2012-02-08 21:22:19 +0000
@@ -0,0 +1,2 @@
+CMakeLists.txt.user
+build

=== modified file 'CMakeConfiguration.txt'
--- CMakeConfiguration.txt	2012-01-11 17:30:25 +0000
+++ CMakeConfiguration.txt	2012-02-08 21:22:19 +0000
@@ -152,6 +152,9 @@
 SET(ZORBA_WITH_BIG_INTEGER OFF CACHE BOOL "enable arbitrary precision integers")
 MESSAGE(STATUS "ZORBA_WITH_BIG_INTEGER:               " ${ZORBA_WITH_BIG_INTEGER})
 
+SET(ZORBA_WITH_JSON ON CACHE BOOL "enable integrated JSON support")
+MESSAGE(STATUS "ZORBA_WITH_JSON:                      " ${ZORBA_WITH_JSON})
+
 IF (ZORBA_SUPPRESS_SWIG)
   SET (no_swig ON)
 ELSE (ZORBA_SUPPRESS_SWIG)

=== modified file 'ChangeLog'
--- ChangeLog	2012-02-07 14:26:42 +0000
+++ ChangeLog	2012-02-08 21:22:19 +0000
@@ -36,6 +36,7 @@
   * Fixed bug #918157 (Add XQFTTS to validation queue)
   * Fixed bug with unversioned modules with C++ external functions
 
+	
 version 2.1
 
 New Features:

=== added file 'NOTICE.txt'
--- NOTICE.txt	1970-01-01 00:00:00 +0000
+++ NOTICE.txt	2012-02-08 21:22:19 +0000
@@ -0,0 +1,740 @@
+-----------
+Zorba 2.1.0
+-----------
+
+(Note: This file is generated automatically from NOTICE.xml.
+Please do not modify this file directly.)
+
+
+
+
+Apache 2
+
+      Copyright 2006-2011 The FLWOR Foundation
+
+      See LICENSE.txt for license information.
+
+      ------------------------
+      This product includes software developed at
+      The FLWOR Foundation (http://www.flworfound.org/).
+
+      ------------------------
+      Portions of this software were developed at the Systems
+      Group of the ETH Zurich, Switzerland.
+    
+
+Other files used by this project:
+----------------------------------------------------
+
+src/zorbatypes/m_apm.h
+src/zorbatypes/mapm/
+
+Copyright: 1999-2007 Michael C. Ring
+Website: http://www.tc.umn.edu/~ringx004/mapm-main.html
+
+      This software is Freeware.
+
+      Permission to use, copy, and distribute this software and its
+      documentation for any purpose with or without fee is hereby granted,
+      provided that the above copyright notice appear in all copies and
+      that both that copyright notice and this permission notice appear
+      in supporting documentation.
+
+      Permission to modify the software is granted. Permission to distribute
+      the modified code is granted. Modifications are to be distributed by
+      using the file 'license.txt' as a template to modify the file header.
+      'license.txt' is available in the official MAPM distribution.
+
+      To distribute modified source code, insert the file 'license.txt'
+      at the top of all modified source code files and edit accordingly.
+
+      This software is provided "as is" without express or implied warranty.
+    
+----------------------------------------------------
+
+src/zorbamisc/config/stdint.h
+
+Copyright: 2006 Alexander Chemeris
+
+
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions are met:
+
+      1. Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+      2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+      3. The name of the author may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+      WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+      EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+      OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+      OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+      ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    
+----------------------------------------------------
+
+src/zorbautils/stemmer/
+
+Copyright: 2001 Dr. Martin Porter
+
+
+      All the software given out on this Snowball site is covered by the BSD
+      License (see http://www.opensource.org/licenses/bsd-license.html), with
+      Copyright (c) 2001, Dr Martin Porter, and (for the Java developments)
+      Copyright (c) 2002, Richard Boulton.
+
+      Essentially, all this means is that you can do what you like with the code,
+      except claim another Copyright for it, or claim that it is issued under a
+      different license. The software is also issued without warranties, which
+      means that if anyone suffers through its use, they cannot come back and sue
+      you. You also have to alert anyone to whom you give the Snowball software to
+      the fact that it is covered by the BSD license.
+
+      We have not bothered to insert the licensing arrangement into the text of
+      the Snowball software.
+    
+----------------------------------------------------
+
+src/util/less.h
+
+Copyright: 1998 Paul J. Lucas
+
+
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions are met:
+
+      o  Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+      o  Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+      o  The name of the author may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE.
+    
+----------------------------------------------------
+
+src/util/auto_vector.h (has been modified)
+
+Copyright: 2003 Reliable Software
+
+
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions are met:
+
+      o  Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+      o  Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+      o  The name of the author may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      POSSIBILITY OF SUCH DAMAGE.
+    
+----------------------------------------------------
+
+cmake_modules/FindBoost.cmake
+
+Copyright: 
+      2006-2008 Andreas Schneider <[e-mail]>
+      2007      Wengo
+      2007      Mike Jackson
+      2008      Andreas Pakulat <[e-mail]>
+    
+
+
+      Redistribution AND use is allowed according to the terms of the New BSD license.
+      For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+    
+----------------------------------------------------
+
+cmake_modules/FindJNI.cmake
+cmake_modules/FindPythonLibs.cmake
+cmake_modules/FindSWIG.cmake
+
+Copyright: 2001-2009 Kitware, Inc.
+
+
+      Distributed under the OSI-approved BSD License (the "License");
+      see accompanying file Copyright.txt for details.
+
+      This software is distributed WITHOUT ANY WARRANTY; without even the
+      implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+      See the License for more information.
+
+      CMake - Cross Platform Makefile Generator
+      Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+      All rights reserved.
+
+      Redistribution and use in source and binary forms, with or without
+      modification, are permitted provided that the following conditions
+      are met:
+
+      * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+      * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+      * Neither the names of Kitware, Inc., the Insight Software Consortium,
+      nor the names of their contributors may be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+      "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+      LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+      A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+      HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+      LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+      DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+      THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+      (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+      OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+      ------------------------------------------------------------------------------
+
+      The above copyright and license notice applies to distributions of
+      CMake in source and binary form.  Some source files contain additional
+      notices of original copyright by their contributors; see each source
+      for details.  Third-party software packages supplied with CMake under
+      compatible licenses provide their own copyright notices documented in
+      corresponding subdirectories.
+
+      ------------------------------------------------------------------------------
+
+      CMake was initially developed by Kitware with the following sponsorship:
+
+      * National Library of Medicine at the National Institutes of Health
+      as part of the Insight Segmentation and Registration Toolkit (ITK).
+
+      * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
+      Visualization Initiative.
+
+      * National Alliance for Medical Image Computing (NAMIC) is funded by the
+      National Institutes of Health through the NIH Roadmap for Medical Research,
+      Grant U54 EB005149.
+
+      * Kitware, Inc.
+    
+----------------------------------------------------
+
+/xml.xsd
+
+Copyright: 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
+
+
+      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+      W3C Software Notice and License
+
+      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
+
+      License
+
+      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+
+      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
+      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
+      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+      Disclaimers
+
+      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+    
+----------------------------------------------------
+
+schemas/xslt-xquery-serialization.xsd
+
+Copyright: 2010 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
+
+
+      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+      W3C Software Notice and License
+
+      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
+
+      License
+
+      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+
+      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
+      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
+      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+      Disclaimers
+
+      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+    
+----------------------------------------------------
+
+modules/w3c/xpath-functions.xsd
+
+Copyright: 2005 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
+
+
+      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+      W3C Software Notice and License
+
+      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
+
+      License
+
+      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
+
+      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
+      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
+      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
+      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
+
+      Disclaimers
+
+      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
+    
+----------------------------------------------------
+
+include/xqc.h
+
+Copyright: 2008, Matthias Brantner, John Snelson
+
+
+      * All rights reserved.
+      *
+      * Redistribution and use in source and binary forms, with or without
+      * modification, are permitted provided that the following conditions are met:
+      *
+      *     * Redistributions of source code must retain the above copyright notice,
+      *       this list of conditions and the following disclaimer.
+      *     * Redistributions in binary form must reproduce the above copyright
+      *       notice, this list of conditions and the following disclaimer in the
+      *       documentation and/or other materials provided with the distribution.
+      *     * Neither the name of the developers nor the names of contributors may be
+      *       used to endorse or promote products derived from this software without
+      *       specific prior written permission.
+      *
+      * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+      * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+      * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+      * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+      * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+      * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+      * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+      * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+      * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+      * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+      * POSSIBILITY OF SUCH DAMAGE.
+    
+----------------------------------------------------
+
+modules/functx/functx.xq
+
+Copyright: 2007 Datypic
+
+
+      : This library is free software; you can redistribute it and/or
+      : modify it under the terms of the GNU Lesser General Public
+      : License as published by the Free Software Foundation; either
+      : version 2.1 of the License.
+
+      : This library is distributed in the hope that it will be useful,
+      : but WITHOUT ANY WARRANTY; without even the implied warranty of
+      : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      : Lesser General Public License for more details.
+
+      : You should have received a copy of the GNU Lesser General Public
+      : License along with this library; if not, write to the Free Software
+      : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    
+----------------------------------------------------
+
+src/compiler/parser/FlexLexer.h
+
+Copyright: 1993 The Regents of the University of California
+
+
+      // All rights reserved.
+      //
+      // This code is derived from software contributed to Berkeley by
+      // Kent Williams and Tom Epperly.
+      //
+      //  Redistribution and use in source and binary forms, with or without
+      //  modification, are permitted provided that the following conditions
+      //  are met:
+
+      //  1. Redistributions of source code must retain the above copyright
+      //  notice, this list of conditions and the following disclaimer.
+      //  2. Redistributions in binary form must reproduce the above copyright
+      //  notice, this list of conditions and the following disclaimer in the
+      //  documentation and/or other materials provided with the distribution.
+
+      //  Neither the name of the University nor the names of its contributors
+      //  may be used to endorse or promote products derived from this software
+      //  without specific prior written permission.
+
+      //  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+      //  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+      //  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+      //  PURPOSE.
+    
+----------------------------------------------------
+
+src/diagnostics/StackWalker.cpp
+src/diagnostics/StackWalker.h
+
+Copyright: 2005 Jochen Kalmbach 
+
+
+      Under BSD License: http://www.opensource.org/licenses/bsd-license.php
+    
+----------------------------------------------------
+
+src/util/singleton.h
+src/util/threads.h
+
+Copyright: 2001 Andrei Alexandrescu
+
+
+      This code accompanies the book:
+      Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design
+          Patterns Applied". Copyright (c) 2001. Addison-Wesley.
+      Permission to use, copy, modify, distribute and sell this software for any
+          purpose is hereby granted without fee, provided that the above copyright
+          notice appear in all copies and that both that copyright notice and this
+          permission notice appear in supporting documentation.
+      The author or Addison-Wesley Longman make no representations about the
+          suitability of this software for any purpose. It is provided "as is"
+          without express or implied warranty.
+    
+
+External libraries used by this project:
+----------------------------------------------------
+
+Name: LIBXML2
+Preferred version: 2.2.16 or higher
+Is mandatory: true
+Website: http://xmlsoft.org/
+License: MIT
+Copyright: 1998-2002 Daniel Veillard.  All Rights Reserved.
+External notice: 
+
+      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+      Except as contained in this notice, the name of Daniel Veillard shall not
+      be used in advertising or otherwise to promote the sale, use or other deal-
+      ings in this Software without prior written authorization from him.
+    
+----------------------------------------------------
+
+Name: LIBXSLT
+Preferred version: 1.1.26
+Is mandatory: false
+Website: http://xmlsoft.org/XSLT/
+License: MIT
+Copyright: 2001-2002 Daniel Veillard.  All Rights Reserved.
+External notice: 
+
+      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+      Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from him.
+
+    
+----------------------------------------------------
+
+Name: ICU4C
+Preferred version: 3.6 or higher
+Is mandatory: true
+Website: http://www.icu-project.org/
+License: ICU License
+Copyright: 1995-2011 International Business Machines Corporation and others 
+External notice: 
+
+      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+      Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
+    
+----------------------------------------------------
+
+Name: CURL
+Preferred version: above 7.12
+Is mandatory: false
+Website: http://curl.haxx.se/
+License: MIT/X derivate license
+Copyright: 1996 - 2011, Daniel Stenberg, <[e-mail]>.
+External notice: 
+
+      All rights reserved.
+
+      Permission to use, copy, modify, and distribute this software for any purpose
+      with or without fee is hereby granted, provided that the above copyright
+      notice and this permission notice appear in all copies.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+      NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+      DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+      OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+      OR OTHER DEALINGS IN THE SOFTWARE.
+
+      Except as contained in this notice, the name of a copyright holder shall not
+      be used in advertising or otherwise to promote the sale, use or other dealings
+      in this Software without prior written authorization of the copyright holder.
+    
+----------------------------------------------------
+
+Name: ICONV
+Preferred version: above 1.12
+Is mandatory: true
+Website: http://www.gnu.org/software/libiconv/
+License: LGPL
+Copyright: 1998, 2010 Free Software Foundation, Inc.
+External notice: 
+
+----------------------------------------------------
+
+Name: ZLIB
+Preferred version: 1.2.5
+Is mandatory: true
+Website: http://www.zlib.net/
+Copyright: 1995-2004 Jean-loup Gailly and Mark Adler
+External notice: 
+
+      This software is provided 'as-is', without any express or implied
+      warranty.  In no event will the authors be held liable for any damages
+      arising from the use of this software.
+
+      Permission is granted to anyone to use this software for any purpose,
+      including commercial applications, and to alter it and redistribute it
+      freely, subject to the following restrictions:
+
+      1. The origin of this software must not be misrepresented; you must not
+      claim that you wrote the original software. If you use this software
+      in a product, an acknowledgment in the product documentation would be
+      appreciated but is not required.
+      2. Altered source versions must be plainly marked as such, and must not be
+      misrepresented as being the original software.
+      3. This notice may not be removed or altered from any source distribution.
+
+      Jean-loup Gailly [e-mail]
+      Mark Adler [e-mail]
+    
+----------------------------------------------------
+
+Name: XERCES
+Preferred version: 2.8.0 or higher
+Is mandatory: true
+Website: http://xerces.apache.org/xerces-c/
+License: Apache 2
+Copyright: Copyright © 1999-2010 The Apache Software Foundation. All Rights Reserved.
+External notice: 
+
+      http://www.apache.org/licenses/LICENSE-2.0
+    
+----------------------------------------------------
+
+Name: BOOST (boost_filesystem)
+Preferred version: 1.32 or higher
+Is mandatory: false
+Website: http://www.boost.org/
+License: Boost Software License v1.0
+Copyright: 
+      Beman Dawes, David Abrahams, 1998-2005.
+      Rene Rivera 2004-2007
+    
+External notice: 
+
+      Permission is hereby granted, free of charge, to any person or organization
+      obtaining a copy of the software and accompanying documentation covered by
+      this license (the "Software") to use, reproduce, display, distribute,
+      execute, and transmit the Software, and to prepare derivative works of the
+      Software, and to permit third-parties to whom the Software is furnished to
+      do so, all subject to the following:
+
+      The copyright notices in the Software and this entire statement, including
+      the above license grant, this restriction and the following disclaimer,
+      must be included in all copies of the Software, in whole or in part, and
+      all derivative works of the Software, unless such copies or derivative
+      works are solely in the form of machine-executable object code generated by
+      a source language processor.
+
+      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+      FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+      SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+      FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+      DEALINGS IN THE SOFTWARE.
+    
+
+External applications used by this project:
+----------------------------------------------------
+
+Name: FLEX
+Preferred version: 2.5.33
+Is mandatory: false
+Website: http://flex.sourceforge.net/
+Copyright: 
+      2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The Flex Project.
+      1990, 1997 The Regents of the University of California. All rights reserved.
+    
+External notice: 
+
+      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+      1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+      2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+      
+      Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED “AS IS” AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+    
+----------------------------------------------------
+
+Name: BISON
+Preferred version: 2.4 or higher
+Is mandatory: false
+Website: http://www.gnu.org/software/bison/
+License: GPL
+Copyright: 1998, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+External notice: 
+
+----------------------------------------------------
+
+Name: DOXYGEN
+Preferred version: v1.7.4 
+Is mandatory: false
+Website: www.doxygen.org
+License: GPL
+Copyright: 1997-2011 by Dimitri van Heesch
+External notice: 
+
+      Permission to use, copy, modify, and distribute this software and its documentation under the terms of the GNU General Public License is hereby granted.
+      No representations are made about the suitability of this software for any purpose. 
+      It is provided "as is" without express or implied warranty. 
+      See the GNU General Public License for more details.
+
+      Documents produced by doxygen are derivative works derived from the input used in their production; they are not affected by this license.
+    
+----------------------------------------------------
+
+Name: CMAKE
+Preferred version: 2.8.4
+Is mandatory: true
+Website: http://www.cmake.org/
+License: Creative Commons Attribution-NoDerivs 3.0 Unported License
+Copyright: 2000-2009 Kitware, Inc., Insight Software Consortium. All rights reserved.
+External notice: 
+
+      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+      Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+      Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+      Neither the names of Kitware, Inc., the Insight Software Consortium, nor the names of their contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    
+----------------------------------------------------
+
+Name: SWIG
+Preferred version: 2.0.4 or above
+Is mandatory: false
+Website: http://www.swig.org/
+License: GPL
+Copyright: 
+      1995-2011 The SWIG Developers
+      2005-2006 Arizona Board of Regents (University of Arizona).
+      1998-2005 University of Chicago.
+      1995-1998 The University of Utah and the Regents of the University of California
+    
+External notice: 
+
+      SWIG is free software: you can redistribute it and/or modify it
+      under the terms of the GNU General Public License as published by
+      the Free Software Foundation, either version 3 of the License, or
+      (at your option) any later version. See the LICENSE-GPL file for
+      the full terms of the GNU General Public license version 3.
+
+      Portions of SWIG are also licensed under the terms of the licenses
+      in the file LICENSE-UNIVERSITIES. You must observe the terms of
+      these licenses, as well as the terms of the GNU General Public License,
+      when you distribute SWIG.
+
+      The SWIG library and examples, under the Lib and Examples top level
+      directories, are distributed under the following terms:
+
+      You may copy, modify, distribute, and make derivative works based on
+      this software, in source code or object code form, without
+      restriction. If you distribute the software to others, you may do
+      so according to the terms of your choice. This software is offered as
+      is, without warranty of any kind.
+
+      See the COPYRIGHT file for a list of contributors to SWIG and their
+      copyright notices.
+    
\ No newline at end of file

=== removed file 'NOTICE.txt'
--- NOTICE.txt	2011-10-21 08:09:17 +0000
+++ NOTICE.txt	1970-01-01 00:00:00 +0000
@@ -1,740 +0,0 @@
------------
-Zorba 2.1.0
------------
-
-(Note: This file is generated automatically from NOTICE.xml.
-Please do not modify this file directly.)
-
-
-
-
-Apache 2
-
-      Copyright 2006-2011 The FLWOR Foundation
-
-      See LICENSE.txt for license information.
-
-      ------------------------
-      This product includes software developed at
-      The FLWOR Foundation (http://www.flworfound.org/).
-
-      ------------------------
-      Portions of this software were developed at the Systems
-      Group of the ETH Zurich, Switzerland.
-    
-
-Other files used by this project:
-----------------------------------------------------
-
-src/zorbatypes/m_apm.h
-src/zorbatypes/mapm/
-
-Copyright: 1999-2007 Michael C. Ring
-Website: http://www.tc.umn.edu/~ringx004/mapm-main.html
-
-      This software is Freeware.
-
-      Permission to use, copy, and distribute this software and its
-      documentation for any purpose with or without fee is hereby granted,
-      provided that the above copyright notice appear in all copies and
-      that both that copyright notice and this permission notice appear
-      in supporting documentation.
-
-      Permission to modify the software is granted. Permission to distribute
-      the modified code is granted. Modifications are to be distributed by
-      using the file 'license.txt' as a template to modify the file header.
-      'license.txt' is available in the official MAPM distribution.
-
-      To distribute modified source code, insert the file 'license.txt'
-      at the top of all modified source code files and edit accordingly.
-
-      This software is provided "as is" without express or implied warranty.
-    
-----------------------------------------------------
-
-src/zorbamisc/config/stdint.h
-
-Copyright: 2006 Alexander Chemeris
-
-
-      Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions are met:
-
-      1. Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-      2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-      3. The name of the author may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-      WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-      MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-      EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-      PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-      OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-      WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-      OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-      ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    
-----------------------------------------------------
-
-src/zorbautils/stemmer/
-
-Copyright: 2001 Dr. Martin Porter
-
-
-      All the software given out on this Snowball site is covered by the BSD
-      License (see http://www.opensource.org/licenses/bsd-license.html), with
-      Copyright (c) 2001, Dr Martin Porter, and (for the Java developments)
-      Copyright (c) 2002, Richard Boulton.
-
-      Essentially, all this means is that you can do what you like with the code,
-      except claim another Copyright for it, or claim that it is issued under a
-      different license. The software is also issued without warranties, which
-      means that if anyone suffers through its use, they cannot come back and sue
-      you. You also have to alert anyone to whom you give the Snowball software to
-      the fact that it is covered by the BSD license.
-
-      We have not bothered to insert the licensing arrangement into the text of
-      the Snowball software.
-    
-----------------------------------------------------
-
-src/util/less.h
-
-Copyright: 1998 Paul J. Lucas
-
-
-      Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions are met:
-
-      o  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-      o  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-      o  The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-    
-----------------------------------------------------
-
-src/util/auto_vector.h (has been modified)
-
-Copyright: 2003 Reliable Software
-
-
-      Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions are met:
-
-      o  Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-      o  Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-      o  The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-      AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-      IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-      ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-      LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-      CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-      SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-      INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-      CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-      ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-      POSSIBILITY OF SUCH DAMAGE.
-    
-----------------------------------------------------
-
-cmake_modules/FindBoost.cmake
-
-Copyright: 
-      2006-2008 Andreas Schneider <[e-mail]>
-      2007      Wengo
-      2007      Mike Jackson
-      2008      Andreas Pakulat <[e-mail]>
-    
-
-
-      Redistribution AND use is allowed according to the terms of the New BSD license.
-      For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-    
-----------------------------------------------------
-
-cmake_modules/FindJNI.cmake
-cmake_modules/FindPythonLibs.cmake
-cmake_modules/FindSWIG.cmake
-
-Copyright: 2001-2009 Kitware, Inc.
-
-
-      Distributed under the OSI-approved BSD License (the "License");
-      see accompanying file Copyright.txt for details.
-
-      This software is distributed WITHOUT ANY WARRANTY; without even the
-      implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-      See the License for more information.
-
-      CMake - Cross Platform Makefile Generator
-      Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
-      All rights reserved.
-
-      Redistribution and use in source and binary forms, with or without
-      modification, are permitted provided that the following conditions
-      are met:
-
-      * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-
-      * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-      * Neither the names of Kitware, Inc., the Insight Software Consortium,
-      nor the names of their contributors may be used to endorse or promote
-      products derived from this software without specific prior written
-      permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-      "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-      LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-      A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-      HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-      SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-      LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-      DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-      THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-      (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-      OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-      ------------------------------------------------------------------------------
-
-      The above copyright and license notice applies to distributions of
-      CMake in source and binary form.  Some source files contain additional
-      notices of original copyright by their contributors; see each source
-      for details.  Third-party software packages supplied with CMake under
-      compatible licenses provide their own copyright notices documented in
-      corresponding subdirectories.
-
-      ------------------------------------------------------------------------------
-
-      CMake was initially developed by Kitware with the following sponsorship:
-
-      * National Library of Medicine at the National Institutes of Health
-      as part of the Insight Segmentation and Registration Toolkit (ITK).
-
-      * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
-      Visualization Initiative.
-
-      * National Alliance for Medical Image Computing (NAMIC) is funded by the
-      National Institutes of Health through the NIH Roadmap for Medical Research,
-      Grant U54 EB005149.
-
-      * Kitware, Inc.
-    
-----------------------------------------------------
-
-/xml.xsd
-
-Copyright: 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
-
-
-      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-      W3C Software Notice and License
-
-      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
-
-      License
-
-      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
-
-      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
-      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
-      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
-
-      Disclaimers
-
-      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-    
-----------------------------------------------------
-
-schemas/xslt-xquery-serialization.xsd
-
-Copyright: 2010 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
-
-
-      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-      W3C Software Notice and License
-
-      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
-
-      License
-
-      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
-
-      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
-      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
-      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
-
-      Disclaimers
-
-      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-    
-----------------------------------------------------
-
-modules/w3c/xpath-functions.xsd
-
-Copyright: 2005 World Wide Web Consortium, (Massachusetts Institute of Technology, European Research Consortium for Informatics and Mathematics, Keio University)
-
-
-      All Rights Reserved. This work is distributed under the W3C Software License [1] in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-      W3C Software Notice and License
-
-      This work (and included software, documentation such as READMEs, or other related items) is being provided by the copyright holders under the following license.
-
-      License
-
-      By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.
-
-      Permission to copy, modify, and distribute this software and its documentation, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications:
-      •The full text of this NOTICE in a location viewable to users of the redistributed or derivative work.
-      •Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the W3C Software Short Notice should be included (hypertext is preferred, text is permitted) within the body of any redistributed or derivative code.
-      •Notice of any changes or modifications to the files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)
-
-      Disclaimers
-
-      THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-      COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-      The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-    
-----------------------------------------------------
-
-include/xqc.h
-
-Copyright: 2008, Matthias Brantner, John Snelson
-
-
-      * All rights reserved.
-      *
-      * Redistribution and use in source and binary forms, with or without
-      * modification, are permitted provided that the following conditions are met:
-      *
-      *     * Redistributions of source code must retain the above copyright notice,
-      *       this list of conditions and the following disclaimer.
-      *     * Redistributions in binary form must reproduce the above copyright
-      *       notice, this list of conditions and the following disclaimer in the
-      *       documentation and/or other materials provided with the distribution.
-      *     * Neither the name of the developers nor the names of contributors may be
-      *       used to endorse or promote products derived from this software without
-      *       specific prior written permission.
-      *
-      * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-      * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-      * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-      * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-      * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-      * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-      * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-      * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-      * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-      * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-      * POSSIBILITY OF SUCH DAMAGE.
-    
-----------------------------------------------------
-
-modules/functx/functx.xq
-
-Copyright: 2007 Datypic
-
-
-      : This library is free software; you can redistribute it and/or
-      : modify it under the terms of the GNU Lesser General Public
-      : License as published by the Free Software Foundation; either
-      : version 2.1 of the License.
-
-      : This library is distributed in the hope that it will be useful,
-      : but WITHOUT ANY WARRANTY; without even the implied warranty of
-      : MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-      : Lesser General Public License for more details.
-
-      : You should have received a copy of the GNU Lesser General Public
-      : License along with this library; if not, write to the Free Software
-      : Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-    
-----------------------------------------------------
-
-src/compiler/parser/FlexLexer.h
-
-Copyright: 1993 The Regents of the University of California
-
-
-      // All rights reserved.
-      //
-      // This code is derived from software contributed to Berkeley by
-      // Kent Williams and Tom Epperly.
-      //
-      //  Redistribution and use in source and binary forms, with or without
-      //  modification, are permitted provided that the following conditions
-      //  are met:
-
-      //  1. Redistributions of source code must retain the above copyright
-      //  notice, this list of conditions and the following disclaimer.
-      //  2. Redistributions in binary form must reproduce the above copyright
-      //  notice, this list of conditions and the following disclaimer in the
-      //  documentation and/or other materials provided with the distribution.
-
-      //  Neither the name of the University nor the names of its contributors
-      //  may be used to endorse or promote products derived from this software
-      //  without specific prior written permission.
-
-      //  THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-      //  IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-      //  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-      //  PURPOSE.
-    
-----------------------------------------------------
-
-src/diagnostics/StackWalker.cpp
-src/diagnostics/StackWalker.h
-
-Copyright: 2005 Jochen Kalmbach 
-
-
-      Under BSD License: http://www.opensource.org/licenses/bsd-license.php
-    
-----------------------------------------------------
-
-src/util/singleton.h
-src/util/threads.h
-
-Copyright: 2001 Andrei Alexandrescu
-
-
-      This code accompanies the book:
-      Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design
-          Patterns Applied". Copyright (c) 2001. Addison-Wesley.
-      Permission to use, copy, modify, distribute and sell this software for any
-          purpose is hereby granted without fee, provided that the above copyright
-          notice appear in all copies and that both that copyright notice and this
-          permission notice appear in supporting documentation.
-      The author or Addison-Wesley Longman make no representations about the
-          suitability of this software for any purpose. It is provided "as is"
-          without express or implied warranty.
-    
-
-External libraries used by this project:
-----------------------------------------------------
-
-Name: LIBXML2
-Preferred version: 2.2.16 or higher
-Is mandatory: true
-Website: http://xmlsoft.org/
-License: MIT
-Copyright: 1998-2002 Daniel Veillard.  All Rights Reserved.
-External notice: 
-
-      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-      Except as contained in this notice, the name of Daniel Veillard shall not
-      be used in advertising or otherwise to promote the sale, use or other deal-
-      ings in this Software without prior written authorization from him.
-    
-----------------------------------------------------
-
-Name: LIBXSLT
-Preferred version: 1.1.26
-Is mandatory: false
-Website: http://xmlsoft.org/XSLT/
-License: MIT
-Copyright: 2001-2002 Daniel Veillard.  All Rights Reserved.
-External notice: 
-
-      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-      The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-      Except as contained in this notice, the name of Daniel Veillard shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from him.
-
-    
-----------------------------------------------------
-
-Name: ICU4C
-Preferred version: 3.6 or higher
-Is mandatory: true
-Website: http://www.icu-project.org/
-License: ICU License
-Copyright: 1995-2011 International Business Machines Corporation and others 
-External notice: 
-
-      Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-      Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization of the copyright holder.
-    
-----------------------------------------------------
-
-Name: CURL
-Preferred version: above 7.12
-Is mandatory: false
-Website: http://curl.haxx.se/
-License: MIT/X derivate license
-Copyright: 1996 - 2011, Daniel Stenberg, <[e-mail]>.
-External notice: 
-
-      All rights reserved.
-
-      Permission to use, copy, modify, and distribute this software for any purpose
-      with or without fee is hereby granted, provided that the above copyright
-      notice and this permission notice appear in all copies.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
-      NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-      DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-      OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
-      OR OTHER DEALINGS IN THE SOFTWARE.
-
-      Except as contained in this notice, the name of a copyright holder shall not
-      be used in advertising or otherwise to promote the sale, use or other dealings
-      in this Software without prior written authorization of the copyright holder.
-    
-----------------------------------------------------
-
-Name: ICONV
-Preferred version: above 1.12
-Is mandatory: true
-Website: http://www.gnu.org/software/libiconv/
-License: LGPL
-Copyright: 1998, 2010 Free Software Foundation, Inc.
-External notice: 
-
-----------------------------------------------------
-
-Name: ZLIB
-Preferred version: 1.2.5
-Is mandatory: true
-Website: http://www.zlib.net/
-Copyright: 1995-2004 Jean-loup Gailly and Mark Adler
-External notice: 
-
-      This software is provided 'as-is', without any express or implied
-      warranty.  In no event will the authors be held liable for any damages
-      arising from the use of this software.
-
-      Permission is granted to anyone to use this software for any purpose,
-      including commercial applications, and to alter it and redistribute it
-      freely, subject to the following restrictions:
-
-      1. The origin of this software must not be misrepresented; you must not
-      claim that you wrote the original software. If you use this software
-      in a product, an acknowledgment in the product documentation would be
-      appreciated but is not required.
-      2. Altered source versions must be plainly marked as such, and must not be
-      misrepresented as being the original software.
-      3. This notice may not be removed or altered from any source distribution.
-
-      Jean-loup Gailly [e-mail]
-      Mark Adler [e-mail]
-    
-----------------------------------------------------
-
-Name: XERCES
-Preferred version: 2.8.0 or higher
-Is mandatory: true
-Website: http://xerces.apache.org/xerces-c/
-License: Apache 2
-Copyright: Copyright © 1999-2010 The Apache Software Foundation. All Rights Reserved.
-External notice: 
-
-      http://www.apache.org/licenses/LICENSE-2.0
-    
-----------------------------------------------------
-
-Name: BOOST (boost_filesystem)
-Preferred version: 1.32 or higher
-Is mandatory: false
-Website: http://www.boost.org/
-License: Boost Software License v1.0
-Copyright: 
-      Beman Dawes, David Abrahams, 1998-2005.
-      Rene Rivera 2004-2007
-    
-External notice: 
-
-      Permission is hereby granted, free of charge, to any person or organization
-      obtaining a copy of the software and accompanying documentation covered by
-      this license (the "Software") to use, reproduce, display, distribute,
-      execute, and transmit the Software, and to prepare derivative works of the
-      Software, and to permit third-parties to whom the Software is furnished to
-      do so, all subject to the following:
-
-      The copyright notices in the Software and this entire statement, including
-      the above license grant, this restriction and the following disclaimer,
-      must be included in all copies of the Software, in whole or in part, and
-      all derivative works of the Software, unless such copies or derivative
-      works are solely in the form of machine-executable object code generated by
-      a source language processor.
-
-      THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-      FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-      SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-      FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-      ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-      DEALINGS IN THE SOFTWARE.
-    
-
-External applications used by this project:
-----------------------------------------------------
-
-Name: FLEX
-Preferred version: 2.5.33
-Is mandatory: false
-Website: http://flex.sourceforge.net/
-Copyright: 
-      2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The Flex Project.
-      1990, 1997 The Regents of the University of California. All rights reserved.
-    
-External notice: 
-
-      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-      1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-      2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-      
-      Neither the name of the University nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED “AS IS” AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-    
-----------------------------------------------------
-
-Name: BISON
-Preferred version: 2.4 or higher
-Is mandatory: false
-Website: http://www.gnu.org/software/bison/
-License: GPL
-Copyright: 1998, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-External notice: 
-
-----------------------------------------------------
-
-Name: DOXYGEN
-Preferred version: v1.7.4 
-Is mandatory: false
-Website: www.doxygen.org
-License: GPL
-Copyright: 1997-2011 by Dimitri van Heesch
-External notice: 
-
-      Permission to use, copy, modify, and distribute this software and its documentation under the terms of the GNU General Public License is hereby granted.
-      No representations are made about the suitability of this software for any purpose. 
-      It is provided "as is" without express or implied warranty. 
-      See the GNU General Public License for more details.
-
-      Documents produced by doxygen are derivative works derived from the input used in their production; they are not affected by this license.
-    
-----------------------------------------------------
-
-Name: CMAKE
-Preferred version: 2.8.4
-Is mandatory: true
-Website: http://www.cmake.org/
-License: Creative Commons Attribution-NoDerivs 3.0 Unported License
-Copyright: 2000-2009 Kitware, Inc., Insight Software Consortium. All rights reserved.
-External notice: 
-
-      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-      Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-      Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-      Neither the names of Kitware, Inc., the Insight Software Consortium, nor the names of their contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-      THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-    
-----------------------------------------------------
-
-Name: SWIG
-Preferred version: 2.0.4 or above
-Is mandatory: false
-Website: http://www.swig.org/
-License: GPL
-Copyright: 
-      1995-2011 The SWIG Developers
-      2005-2006 Arizona Board of Regents (University of Arizona).
-      1998-2005 University of Chicago.
-      1995-1998 The University of Utah and the Regents of the University of California
-    
-External notice: 
-
-      SWIG is free software: you can redistribute it and/or modify it
-      under the terms of the GNU General Public License as published by
-      the Free Software Foundation, either version 3 of the License, or
-      (at your option) any later version. See the LICENSE-GPL file for
-      the full terms of the GNU General Public license version 3.
-
-      Portions of SWIG are also licensed under the terms of the licenses
-      in the file LICENSE-UNIVERSITIES. You must observe the terms of
-      these licenses, as well as the terms of the GNU General Public License,
-      when you distribute SWIG.
-
-      The SWIG library and examples, under the Lib and Examples top level
-      directories, are distributed under the following terms:
-
-      You may copy, modify, distribute, and make derivative works based on
-      this software, in source code or object code form, without
-      restriction. If you distribute the software to others, you may do
-      so according to the terms of your choice. This software is offered as
-      is, without warranty of any kind.
-
-      See the COPYRIGHT file for a list of contributors to SWIG and their
-      copyright notices.
-    
\ No newline at end of file

=== modified file 'doc/cxx/examples/CMakeLists.txt'
--- doc/cxx/examples/CMakeLists.txt	2011-08-19 00:03:31 +0000
+++ doc/cxx/examples/CMakeLists.txt	2012-02-08 21:22:19 +0000
@@ -36,6 +36,10 @@
 #  LIST(APPEND API_EXAMPLES debugger.cpp)
 ENDIF(ZORBA_WITH_DEBUGGER)
 
+IF (ZORBA_WITH_JSON)
+  LIST (APPEND API_EXAMPLES jsoniq.cpp)
+ENDIF (ZORBA_WITH_JSON)
+
 CREATE_TEST_SOURCELIST(
   examples
   examples.cpp
@@ -63,6 +67,11 @@
   ZORBA_ADD_TEST(${TName} examples ${NAME_WITHOUT_EXT})
 ENDFOREACH(test)
 
+# Any known bugs
+IF (ZORBA_WITH_JSON)
+  EXPECTED_FAILURE(doc/cxx/examples/jsoniq.cpp 928710)
+ENDIF (ZORBA_WITH_JSON)
+
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Makefile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Makefile.zorba)
 MESSAGE(STATUS "configured ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Makefile.zorba") 
 

=== added file 'doc/cxx/examples/jsoniq.cpp'
--- doc/cxx/examples/jsoniq.cpp	1970-01-01 00:00:00 +0000
+++ doc/cxx/examples/jsoniq.cpp	2012-02-08 21:22:19 +0000
@@ -0,0 +1,392 @@
+/*
+ * Copyright 2006-2008 The FLWOR Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <iostream>
+#include <sstream>
+
+#include <zorba/zorba.h>
+#include <zorba/store_manager.h>
+#include <zorba/serializer.h>
+#include <zorba/singleton_item_sequence.h>
+#include <zorba/zorba_exception.h>
+
+using namespace zorba;
+
+namespace jsoniq_test {
+
+/**
+ * Test accessing a JSONArray's members
+ */
+bool
+example_1(Zorba* aZorba)
+{
+  Iterator_t lIterator, lMembers;
+  XQuery_t lQuery = aZorba->compileQuery("[ 1, 2, 3 ]");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  // Ensure we got a JSON array
+  if (!lItem.isJSONItem() ||
+      lItem.getJSONItemKind() != store::StoreConsts::jsonArray) {
+    std::cerr << "Item is not JSON Array!" << std::endl;
+    return false;
+  }
+
+  // Ensure array has 3 integer members
+  lMembers = lItem.getArrayMembers();
+  lMembers->open();
+  Item lMember;
+  int count = 0;
+  while (lMembers->next(lMember)) {
+    // This will throw an exception if the item isn't an integer
+    std::cout << lMember.getLongValue() << std::endl;
+    count++;
+  }
+  if (count != 3) {
+    std::cerr << count << " array members returned, expecting 3" << std::endl;
+    return false;
+  }
+  lMembers->close();
+  lIterator->close();
+
+  return true;
+}
+
+
+/**
+ * Test accessing a JSONObject's Object Pairs, as well as the Pairs'
+ * names and values
+ */
+bool
+example_2(Zorba* aZorba)
+{
+  Iterator_t lIterator, lPairs;
+  XQuery_t lQuery = aZorba->compileQuery("{ \"one\" : 1, \"two\" : 2 }");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  // Ensure we got a JSON object
+  if (!lItem.isJSONItem() ||
+      lItem.getJSONItemKind() != store::StoreConsts::jsonObject) {
+    std::cerr << "Item is not JSON object!" << std::endl;
+    return false;
+  }
+
+  // Ensure object has 2 pairs with integer values
+  lPairs = lItem.getObjectPairs();
+  lPairs->open();
+  Item lPair;
+  int count = 0;
+  while (lPairs->next(lPair)) {
+    if (!lPair.isJSONItem() ||
+        lPair.getJSONItemKind() != store::StoreConsts::jsonPair) {
+      std::cerr << "Item is not a JSON pair!" << std::endl;
+    }
+    Item lName = lPair.getPairName();
+    std::cout << "   \"" << lName.getStringValue() << "\": ";
+    Item lValue = lPair.getPairValue();
+    std::cout << lValue.getLongValue() << std::endl;
+    count++;
+  }
+  if (count != 2) {
+    std::cerr << count << " object pairs returned, expecting 2" << std::endl;
+    return false;
+  }
+  lPairs->close();
+  lIterator->close();
+
+  return true;}
+
+
+/**
+ * Test accessing a JSONArray's members directly by index
+ */
+bool
+example_3(Zorba* aZorba)
+{
+  Iterator_t lIterator;
+  XQuery_t lQuery = aZorba->compileQuery("[ 1, 2, 3 ]");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  Item lMember;
+  for (int i = 1; i <= 3; i++) {
+    lMember = lItem.getArrayMember(i);
+    std::cout << lMember.getLongValue() << std::endl;
+  }
+
+  lIterator->close();
+
+  return true;
+}
+
+
+/**
+ * Test accessing a JSONObject's values directly by name
+ */
+bool
+example_4(Zorba* aZorba)
+{
+  Iterator_t lIterator;
+  XQuery_t lQuery = aZorba->compileQuery("{ \"one\" : 1, \"two\" : 2 }");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  Item lValue;
+  lValue = lItem.getObjectValue("one");
+  std::cout << lValue.getLongValue() << std::endl;
+  lValue = lItem.getObjectValue("two");
+  std::cout << lValue.getLongValue() << std::endl;
+
+  lIterator->close();
+
+  return true;
+}
+
+/**
+ * Test accessing a non-existent JSONArray member
+ */
+bool
+example_5(Zorba* aZorba)
+{
+  Iterator_t lIterator, lMembers;
+  XQuery_t lQuery = aZorba->compileQuery("[ 1, 2, 3 ]");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  Item lNonMember = lItem.getArrayMember(4);
+  lIterator->close();
+
+  if (!lNonMember.isNull()) {
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Test accessing a non-existent JSONObject pair value
+ */
+bool
+example_6(Zorba* aZorba)
+{
+  Iterator_t lIterator;
+  XQuery_t lQuery = aZorba->compileQuery("{ \"one\" : 1, \"two\" : 2 }");
+  lIterator = lQuery->iterator();
+  lIterator->open();
+  Item lItem;
+  lIterator->next(lItem);
+
+  Item lNonValue = lItem.getObjectValue("three");
+  lIterator->close();
+
+  if (!lNonValue.isNull()) {
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Utility function: Given an item, bind that item to a simple query and
+ * serialize the result, then ensure the result matches the expected string.
+ */
+bool
+serialize(Zorba* aZorba, Item aItem, std::string aExpected)
+{
+  Zorba_SerializerOptions lSerialOpt;
+  lSerialOpt.omit_xml_declaration = ZORBA_OMIT_XML_DECLARATION_YES;
+  XQuery_t lQuery = aZorba->compileQuery("declare variable $i external; $i");
+  lQuery->getDynamicContext()->setVariable("i", aItem);
+  std::stringstream lStream;
+  lQuery->execute(lStream, &lSerialOpt);
+  std::string lResult = lStream.str();
+  std::cout << lResult << std::endl;
+  if (lResult.compare(aExpected) != 0) {
+    std::cout << "Wrong value! Expected " << aExpected << std::endl;
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Test creating a JSON null value.
+ */
+bool
+example_7(Zorba* aZorba)
+{
+  Item lNull = aZorba->getItemFactory()->createJSONNull();
+  return serialize(aZorba, lNull, "null");
+}
+
+/**
+ * Test creating some JSON numbers.
+ */
+bool
+example_8(Zorba* aZorba)
+{
+  Item lNum = aZorba->getItemFactory()->createJSONNumber(String("12345"));
+  if (lNum.getType().getLocalName().compare("integer") != 0) {
+    std::cout << "Didn't create an xs:integer!";
+    return false;
+  }
+  if (!serialize(aZorba, lNum, "12345")) {
+    return false;
+  }
+
+  lNum = aZorba->getItemFactory()->createJSONNumber(String("123.345"));
+  if (lNum.getType().getLocalName().compare("decimal") != 0) {
+    std::cout << "Didn't create an xs:decimal!";
+    return false;
+  }
+  if (!serialize(aZorba, lNum, "123.345")) {
+    return false;
+  }
+
+  lNum = aZorba->getItemFactory()->createJSONNumber(String("12.34e5"));
+  if (lNum.getType().getLocalName().compare("double") != 0) {
+    std::cout << "Didn't create an xs:double!";
+    return false;
+  }
+  if (!serialize(aZorba, lNum, "1.234E6")) {
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Test creating a JSON pair.
+ */
+bool example_9(Zorba* aZorba)
+{
+  Item lValue = aZorba->getItemFactory()->createJSONNumber("1234");
+  Item lPair = aZorba->getItemFactory()->createJSONPair("name", lValue);
+  // Standalone Pairs get boxed into a JSON Object
+  return serialize(aZorba, lPair, "{ \"name\" : 1234 }");
+}
+
+/**
+ * Test creating a JSON array.
+ */
+bool example_10(Zorba* aZorba)
+{
+  std::vector<Item> lMembers;
+  for (int i = 1; i <= 4; i++) {
+    // xs:int is fine for JSON arrays
+    lMembers.push_back(aZorba->getItemFactory()->createInt(i));
+  }
+  Item lArray = aZorba->getItemFactory()->createJSONArray(lMembers);
+  return serialize(aZorba, lArray, "[ 1, 2, 3, 4 ]");
+}
+
+/**
+ * Test creating a JSON object.
+ */
+bool example_11(Zorba* aZorba)
+{
+  Item lValue = aZorba->getItemFactory()->createInt(1234);
+  std::vector<Item> lPairs;
+  lPairs.push_back(aZorba->getItemFactory()->createJSONPair("foo", lValue));
+
+  Item lObject = aZorba->getItemFactory()->createJSONObject(lPairs);
+  return serialize(aZorba, lObject, "{ \"foo\" : 1234 }");
+}
+
+} /* namespace jsoniq-test */
+
+int 
+jsoniq(int argc, char* argv[])
+{
+  void* lStore = StoreManager::getStore();
+  Zorba *lZorba = Zorba::getInstance(lStore);
+
+  bool res = false;
+
+  try {
+    std::cout << "executing jsoniq example 1" << std::endl;
+    res = jsoniq_test::example_1(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+
+    std::cout << "executing jsoniq example 2" << std::endl;
+    res = jsoniq_test::example_2(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+
+    std::cout << "executing jsoniq example 3" << std::endl;
+    res = jsoniq_test::example_3(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+
+    std::cout << "executing jsoniq example 4" << std::endl;
+    res = jsoniq_test::example_4(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+
+    std::cout << "executing jsoniq example 5" << std::endl;
+    res = jsoniq_test::example_5(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+
+    std::cout << "executing jsoniq example 6" << std::endl;
+    res = jsoniq_test::example_6(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+
+    std::cout << "executing jsoniq example 7" << std::endl;
+    res = jsoniq_test::example_7(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+
+    std::cout << "executing jsoniq example 8" << std::endl;
+    res = jsoniq_test::example_8(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+
+    std::cout << "executing jsoniq example 9" << std::endl;
+    res = jsoniq_test::example_9(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+
+    std::cout << "executing jsoniq example 10" << std::endl;
+    res = jsoniq_test::example_10(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+
+    std::cout << "executing jsoniq example 11" << std::endl;
+    res = jsoniq_test::example_11(lZorba);
+    if (!res) return 1;
+    std::cout << std::endl;
+  }
+  catch (ZorbaException& e) {
+    std::cout << "ZorbaException raised: " << e.what() << std::endl;
+    return 2;
+  }
+
+  lZorba->shutdown();
+  StoreManager::shutdownStore(lStore);
+  return 0;
+}

=== modified file 'doc/zorba/CMakeLists.txt'
--- doc/zorba/CMakeLists.txt	2011-10-07 08:28:43 +0000
+++ doc/zorba/CMakeLists.txt	2012-02-08 21:22:19 +0000
@@ -46,6 +46,10 @@
                   ${CMAKE_CURRENT_BINARY_DIR}/html/noisepattern.png COPYONLY)
   CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/scripting_spec.html
                   ${CMAKE_CURRENT_BINARY_DIR}/html/scripting_spec.html COPYONLY)
+  CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/XQueryforJSON.html
+                  ${CMAKE_CURRENT_BINARY_DIR}/html/XQueryforJSON.html COPYONLY)
+  CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/JSONforXQuery.html
+                  ${CMAKE_CURRENT_BINARY_DIR}/html/JSONforXQuery.html COPYONLY)
   CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/W3C-WD.css
                   ${CMAKE_CURRENT_BINARY_DIR}/html/W3C-WD.css COPYONLY)
 

=== added file 'doc/zorba/JSONforXQuery.html'
--- doc/zorba/JSONforXQuery.html	1970-01-01 00:00:00 +0000
+++ doc/zorba/JSONforXQuery.html	2012-02-08 21:22:19 +0000
@@ -0,0 +1,1 @@
+<html><head><title>JSON for XQuery</title><style type="text/css">@import url('https://themes.googleusercontent.com/fonts/css?kit=lhDjYqiy3mZ0x6ROQEUoUw');ol{margin:0;padding:0}p{margin:0}.c8{padding-left:0pt;text-align:justify;margin-left:36pt}.c19{max-width:468pt;background-color:#ffffff;padding:72pt 72pt 72pt 72pt}.c20{list-style-type:disc;margin:0;padding:0}.c0{color:#1155cc;text-decoration:underline}.c13{color:inherit;text-decoration:inherit}.c1{text-indent:139.5pt;direction:ltr}.c17{text-align:center}.c11{margin-left:36pt}.c10{margin-left:18pt}.c14{text-indent:144pt}.c15{font-weight:bold}.c22{color:#4a86e8}.c18{height:18pt}.c6{margin-left:144pt}.c9{height:11pt}.c3{direction:ltr}.c4{text-align:right}.c7{font-style:italic}.c16{margin-left:58.5pt}.c12{text-align:justify}.c5{color:#38761d}.c2{font-family:Consolas}.c21{margin-left:49.5pt}.title{padding-top:24pt;line-height:1.15;text-align:center;color:#4a86e8;font-size:36pt;font-family:Arial;font-weight:bold;padding-bottom:6pt}.subtitle{padding-top:18pt;line-height:1.15;text-align:left;color:#666666;font-style:italic;font-size:24pt;font-family:Georgia;padding-bottom:4pt}body{color:#000000;font-size:11pt;font-family:Arial}h1{padding-top:24pt;line-height:1.15;text-align:left;color:#4a86e8;font-size:24pt;font-family:Arial;font-weight:bold;padding-bottom:6pt}h2{padding-top:18pt;line-height:1.15;text-align:left;color:#ff9900;font-size:18pt;font-family:Arial;font-weight:bold;padding-bottom:4pt}h3{padding-top:14pt;line-height:1.15;text-align:left;color:#000000;font-size:14pt;font-family:Arial;font-weight:bold;padding-bottom:4pt}h4{padding-top:12pt;line-height:1.15;text-align:left;color:#000000;font-size:12pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}h5{padding-top:11pt;line-height:1.15;text-align:left;color:#000000;font-size:11pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}h6{padding-top:10pt;line-height:1.15;text-align:left;color:#000000;font-size:10pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}</style></head><body class="c19"><p class="c3 title"><a name="h.li2wdq8unbq"></a><span>JSONiq for XQuery users</span></p><p class="c3 title"><a name="h.5ipqqclfxk4n"></a><span class="c5">JSON for XQuery</span></p><hr><p class="c17 c3"><span>This tutorial introduces the JSONiq language, which declaratively manipulates JSON data.</span></p><p class="c17 c3"><span>Why don&#39;t you go ahead can try the queries of this document on our online demo interface?</span></p><p class="c3 c17"><span>&nbsp;</span><span class="c0 c15"><a class="c13" href="http://jsoniq.zorba-xquery.com/">http://jsoniq.zorba-xquery.com/</a></span></p><hr><p class="c9 c3"><span></span></p><h2 class="c3 c18"><a name="h.8gra0ylxutrv"></a></h2><p class="c10 c3"><span class="c0"><a class="c13" href="#h.f453h84m2u1a">JSON</a></span></p><p class="c3 c10"><span class="c0"><a class="c13" href="#h.qtfakecy3fr7">Elevator Pitch</a></span></p><p class="c10 c3"><span class="c0"><a class="c13" href="#h.yugk1mszt0re">And here you go</a></span></p><p class="c3 c11"><span class="c0"><a class="c13" href="#h.39rm37noeh9g">JSONiq types</a></span></p><p class="c11 c3"><span class="c0"><a class="c13" href="#h.j0wg8654ivtw">JSON Constructors</a></span></p><p class="c11 c3"><span class="c0"><a class="c13" href="#h.qe57mgdf5ql">JSON as a subset of JSONiq</a></span></p><p class="c10 c3"><span class="c0"><a class="c13" href="#h.mjv7kyjurri2">JSON Navigation</a></span></p><p class="c11 c3"><span class="c0"><a class="c13" href="#h.xosiyb17dh24">Objects</a></span></p><p class="c11 c3"><span class="c0"><a class="c13" href="#h.mrf42gizl3y6">Arrays</a></span></p><p class="c11 c3"><span class="c0"><a class="c13" href="#h.hdc3dgohtdut">Pairs</a></span></p><p class="c10 c3"><span class="c0"><a class="c13" href="#h.eb0bxle2oykl">Relational Algebra</a></span></p><p class="c10 c3"><span class="c0"><a class="c13" href="#h.oii6pvliilhi">Access external data</a></span></p><p class="c10 c3"><span class="c0"><a class="c13" href="#h.bm3buqmzhtko">I want more</a></span></p><p><span></span></p><p class="c9 c3"><span></span></p><h1 class="c3"><a name="h.f453h84m2u1a"></a><span>JSON</span></h1><p class="c3 c12"><span>As explained on </span><span class="c0"><a class="c13" href="http://www.json.org/">http://www.json.org/</a></span><span>, JSON is a lightweight data-interchange format designed for humans as well as for computers. It supports as values:</span></p><ol class="c20" start="1"><li class="c8 c3"><span>objects (string-to-value map)</span></li><li class="c8 c3"><span>arrays (ordered sequence of values)</span></li><li class="c8 c3"><span>strings</span></li><li class="c8 c3"><span>numbers</span></li><li class="c8 c3"><span>booleans (true, false)</span></li><li class="c8 c3"><span>null</span></li></ol><p class="c9 c3"><span></span></p><p class="c3"><span>JSONiq extends XQuery to query and update JSON data, like XML data.</span></p><h1 class="c3"><a name="h.qtfakecy3fr7"></a><span>Elevator Pitch</span></h1><p class="c3 c12"><span>Here is an appetizer before we start the tutorial from scratch.</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">let $stores :=</span></p><p class="c3"><span class="c2">[</span></p><p class="c3"><span class="c2">&nbsp; { &quot;store number&quot; : 1, &quot;state&quot; : &quot;MA&quot; },</span></p><p class="c3"><span class="c2">&nbsp; { &quot;store number&quot; : 2, &quot;state&quot; : &quot;MA&quot; },</span></p><p class="c3"><span class="c2">&nbsp; { &quot;store number&quot; : 3, &quot;state&quot; : &quot;CA&quot; },</span></p><p class="c3"><span class="c2">&nbsp; { &quot;store number&quot; : 4, &quot;state&quot; : &quot;CA&quot; }</span></p><p class="c3"><span class="c2">]</span></p><p class="c3"><span class="c2">let $sales := [</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;broiler&quot;, &quot;store number&quot; : 1, &quot;quantity&quot; : 20 &nbsp;},</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 100 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 50 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 50 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;blender&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 100 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;blender&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 150 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;socks&quot;, &quot;store number&quot; : 1, &quot;quantity&quot; : 500 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;socks&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 10 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;shirt&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 10 }</span></p><p class="c3"><span class="c2">]</span></p><p class="c3"><span class="c2">let $join :=</span></p><p class="c3"><span class="c2">&nbsp; for $store in jn:values($stores), $sale in jn:values($sales)</span></p><p class="c3"><span class="c2">&nbsp; where $store(&quot;store number&quot;) = $sale(&quot;store number&quot;)</span></p><p class="c3"><span class="c2">&nbsp; return {</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &quot;nb&quot; : $store(&quot;store number&quot;),</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &quot;state&quot; : $store(&quot;state&quot;),</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &quot;sold&quot; : $sale(&quot;product&quot;)</span></p><p class="c3"><span class="c2">&nbsp; }</span></p><p class="c3"><span class="c2">return [$join]</span></p><p class="c6 c3"><span class="c5 c2">[ </span></p><p class="c6 c3"><span class="c5 c2">&nbsp; { &quot;nb&quot; : 1, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;broiler&quot; },</span></p><p class="c6 c3"><span class="c5 c2">&nbsp; { &quot;nb&quot; : 1, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;socks&quot; },</span></p><p class="c6 c3"><span class="c5 c2">&nbsp; { &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c6 c3"><span class="c5 c2">&nbsp; { &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c6 c3"><span class="c5 c2">&nbsp; { &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;socks&quot; },</span></p><p class="c6 c3"><span class="c5 c2">&nbsp; { &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c6 c3"><span class="c5 c2">&nbsp; { &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;blender&quot; },</span></p><p class="c6 c3"><span class="c5 c2">&nbsp; { &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;blender&quot; },</span></p><p class="c6 c3"><span class="c5 c2">&nbsp; { &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;shirt&quot; }</span></p><p class="c6 c3"><span class="c5 c2">&nbsp;]</span></p><p class="c9 c3"><span></span></p><h1 class="c3"><a name="h.yugk1mszt0re"></a><span>And here you go</span></h1><h2 class="c3"><a name="h.39rm37noeh9g"></a><span>JSONiq types</span></h2><p class="c3"><span>JSONiq maps JSON types to XQuery. Numbers are xs:integer or xs:decimal, strings are xs:string, true and false are xs:boolean and null is a new atomic type jn:null.</span></p><p class="c9 c3"><span></span></p><p class="c3"><span>JSONiq introduces new items: objects, arrays and pairs. Objects have pairs. Pairs have a string name and a value. Array have members which are values. Values are objects, arrays, XML nodes or atomic items.</span></p><p class="c9 c3"><span></span></p><p class="c3"><span>The new item types for objects and arrays are object() and array(). json-item() is a supertype of both, and json-pair() is the item type for pairs.</span></p><h2 class="c3"><a name="h.j0wg8654ivtw"></a><span>JSON Constructors</span></h2><p class="c3"><span>JSONiq introduces JSON constructors, in a similar way to XML constructors.</span></p><p class="c9 c3"><span></span></p><p class="c3"><span>You can put any expression in a array. The items in the sequence produced by the expression will become members of the array:</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">[ 1 to 10 ]</span></p><p class="c3 c4"><span class="c5 c2">[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]</span></p><p class="c9 c3 c4"><span class="c5 c2"></span></p><p class="c3"><span>Or you can dynamically compute an object:</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">{</span></p><p class="c3"><span class="c2">&nbsp; &quot;Greeting&quot; : let $d := &quot;Mister Spock&quot;</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return concat(&quot;Hello, &quot;, $d),</span></p><p class="c3"><span class="c2">&nbsp; &quot;Farewell&quot; : string-join((&quot;Live&quot;, &quot;long&quot;, &quot;and&quot;, &quot;prosper&quot;),</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot; &quot;)</span></p><p class="c3"><span class="c2">}</span></p><p class="c9 c3"><span class="c2 c5"></span></p><p class="c3 c4"><span class="c5 c2">{ &quot;Greeting&quot; : &quot;Hello, Mister Spock&quot;, &quot;Farewell&quot; : &quot;Live long and prosper&quot; }</span></p><p class="c9 c3"><span class="c5"></span></p><p class="c3"><span>You can also dynamically generate pairs:</span></p><p class="c9 c3"><span class="c2"></span></p><p class="c3"><span class="c2">concat(&quot;Integer &quot;, 2) : 2 * 2</span></p><p class="c3 c4"><span class="c5 c2">&quot;Integer 2&quot; : 4</span></p><p class="c9 c3 c4"><span class="c5 c2"></span></p><p class="c3"><span>and then wrap lots of them in an object:</span></p><p class="c9 c3"><span class="c2"></span></p><p class="c3"><span class="c2">{</span></p><p class="c3"><span class="c2">&nbsp; for $i in 1 to 10</span></p><p class="c3"><span class="c2">&nbsp; return concat(&quot;Square of &quot;, $i) : $i * $i</span></p><p class="c3"><span class="c2">}</span></p><p class="c6 c3"><span class="c5 c2">{</span></p><p class="c6 c3"><span class="c5 c2">&quot;Square of 1&quot; : 1,</span></p><p class="c6 c3"><span class="c5 c2">&quot;Square of 2&quot; : 4,</span></p><p class="c6 c3"><span class="c5 c2">&quot;Square of 3&quot; : 9,</span></p><p class="c6 c3"><span class="c5 c2">&quot;Square of 4&quot; : 16,</span></p><p class="c3 c6"><span class="c5 c2">&quot;Square of 5&quot; : 25,</span></p><p class="c6 c3"><span class="c5 c2">&quot;Square of 6&quot; : 36,</span></p><p class="c6 c3"><span class="c5 c2">&quot;Square of 7&quot; : 49,</span></p><p class="c6 c3"><span class="c5 c2">&quot;Square of 8&quot; : 64,</span></p><p class="c6 c3"><span class="c5 c2">&quot;Square of 9&quot; : 81,</span></p><p class="c6 c3"><span class="c5 c2">&quot;Square of 10&quot; : 100</span></p><p class="c6 c3"><span class="c5 c2">}</span></p><p class="c9 c3"><span></span></p><h2 class="c3"><a name="h.qe57mgdf5ql"></a><span>JSON as a subset of JSONiq</span></h2><p class="c3 c12"><span>Every well-formed JSON document is a JSONiq query as well, because This means that you can copy-and-paste a JSON document into a query. The following are JSONiq queries that are &quot;idempotent&quot; (they just output themselves):</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">{ &quot;pi&quot; : 3.14, &quot;sq2&quot; : 1.4 }</span></p><p class="c3 c4"><span class="c5 c2">{ &quot;pi&quot; : 3.14, &quot;sq2&quot; : 1.4 }</span></p><p class="c9 c3"><span class="c5 c2"></span></p><p class="c3"><span class="c2">[ 2, 3, 5, 7, 11, 13 ]</span></p><p class="c3 c4"><span class="c5 c2">[ 2, 3, 5, 7, 11, 13 ]</span></p><p class="c9 c3"><span class="c2"></span></p><p class="c3"><span class="c2">{</span></p><p class="c3"><span class="c2">&nbsp; &quot;operations&quot; : [</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; { &quot;binary&quot; : [ &quot;and&quot;, &quot;or&quot;] },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; { &quot;unary&quot; : [&quot;not&quot;] }</span></p><p class="c3"><span class="c2">&nbsp; ],</span></p><p class="c3"><span class="c2">&nbsp; &quot;bits&quot; : [</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; 0, 1</span></p><p class="c3"><span class="c2">&nbsp; ]</span></p><p class="c3"><span class="c2">}</span></p><p class="c14 c3"><span class="c5 c2">{</span></p><p class="c14 c3"><span class="c5 c2">&nbsp; &quot;operations&quot; : [</span></p><p class="c14 c3"><span class="c5 c2">&nbsp; &nbsp; { &quot;binary&quot; : [ &quot;and&quot;, &quot;or&quot; ] },</span></p><p class="c14 c3"><span class="c5 c2">&nbsp; &nbsp; { &quot;unary&quot; : [ &quot;not&quot; ] }</span></p><p class="c14 c3"><span class="c5 c2">&nbsp; ],</span></p><p class="c14 c3"><span class="c5 c2">&nbsp; &quot;bits&quot; : [</span></p><p class="c14 c3"><span class="c5 c2">&nbsp; &nbsp; 0, 1</span></p><p class="c3 c14"><span class="c5 c2">&nbsp; ]</span></p><p class="c14 c3"><span class="c5 c2">}</span></p><p class="c9 c3 c4"><span class="c5 c2"></span></p><p class="c3 c12"><span>This works with objects, arrays (even nested), strings, numbers, booleans, null. </span><span class="c7">The exceptions to this rule (but we are working on it!) are that:</span></p><p class="c3 c12"><span class="c7">(i) if a pair has a true, false or null value, there must be a space on at least one side of the colon (this will be fixed).</span></p><p class="c3 c12"><span class="c7">(ii) empty objects are not recognized</span></p><p class="c3 c12"><span class="c7">(iii) characters escaped with the \ in JSON strings are not recognized</span></p><p class="c3 c9"><span class="c7 c2"></span></p><p class="c3 c12"><span>It also works the other way round: if your query outputs an object or an array, you can readily use it as a JSON document.</span></p><p class="c9 c3 c4"><span class="c5 c2"></span></p><h1 class="c3"><a name="h.mjv7kyjurri2"></a><span>JSON Navigation</span></h1><p class="c3 c12"><span>I</span><span>f you have some JSON data, you can access it and navigate.</span></p><p class="c9 c3 c12"><span></span></p><p class="c3 c12"><span>All you need to know is, again: JSONiq views</span></p><ol class="c20" start="1"><li class="c3 c8"><span>an array as a sequence of values,</span></li><li class="c8 c3"><span>an object as a set of pairs,</span></li><li class="c8 c3"><span>a pair as a (name, value) tuple.</span></li></ol><h2 class="c3 c12"><a name="h.xosiyb17dh24"></a><span>Objects</span></h2><p class="c3 c12"><span>If you use an object as a functor and provide it with a string, it will return the pair named after its parameter:</span></p><p class="c9 c3"><span class="c2"></span></p><p class="c3"><span class="c2">let $person := {</span></p><p class="c3"><span class="c2">&nbsp; &quot;first name&quot; : &quot;Sarah&quot;,</span></p><p class="c3"><span class="c2">&nbsp; &quot;age&quot; : 13,</span></p><p class="c3"><span class="c2">&nbsp; &quot;gender&quot; : &quot;female&quot;,</span></p><p class="c3"><span class="c2">&nbsp; &quot;friends&quot; : [ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot;]</span></p><p class="c3"><span class="c2">}</span></p><p class="c3"><span class="c2">return $person(&quot;first name&quot;)</span></p><p class="c3 c4"><span class="c5 c2">&quot;first name&quot; : &quot;Sarah&quot;</span></p><p class="c9 c3 c4"><span class="c5 c2"></span></p><h2 class="c3"><a name="h.mrf42gizl3y6"></a><span>Arrays</span></h2><p class="c3 c12"><span>If you use an array as a functor and provide it with an integer, it will return the corresponding entry:</span></p><p class="c9 c3"><span class="c2"></span></p><p class="c3"><span class="c2">let $friends := [ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot;]</span></p><p class="c3"><span class="c2">return $friends(2)</span></p><p class="c3 c4"><span class="c5 c2">Mary</span></p><h2 class="c3"><a name="h.hdc3dgohtdut"></a><span>Pairs</span></h2><p class="c3"><span>Given a pair, you can get its name and value using the functions jn:name and jn:value:</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">let $pair := &quot;name of the pair&quot; : &quot;value of the pair&quot;</span></p><p class="c3"><span class="c2">return { &nbsp;&quot;name&quot; : jn:name($pair), &quot;value&quot; : jn:value($pair) }</span></p><p class="c9 c3"><span class="c2"></span></p><p class="c3 c4"><span class="c5 c2">{ &quot;name&quot; : &quot;name of the pair&quot;, &quot;value&quot; : &quot;value of the pair&quot; }</span></p><p class="c9 c3"><span class="c5"></span></p><p class="c3"><span>This functions also exist in plural form for objects:</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">let $person := {</span></p><p class="c3"><span class="c2">&nbsp; &quot;name&quot; : &quot;Sarah&quot;,</span></p><p class="c3"><span class="c2">&nbsp; &quot;age&quot; : 13,</span></p><p class="c3"><span class="c2">&nbsp; &quot;gender&quot; : &quot;female&quot;,</span></p><p class="c3"><span class="c2">&nbsp; &quot;friends&quot; : [ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot;]</span></p><p class="c3"><span class="c2">}</span></p><p class="c3"><span class="c2">return { &quot;names&quot; : [ jn:names($person)],</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;values&quot; : [ jn:values($person)]</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &nbsp; &nbsp;}</span></p><p class="c3 c16"><span class="c5 c2">{</span></p><p class="c3 c16"><span class="c5 c2">&quot;names&quot; : [ &quot;name&quot;, &quot;age&quot;, &quot;gender&quot;, &quot;friends&quot; ],</span></p><p class="c3 c16"><span class="c5 c2">&quot;values&quot; : [ &quot;Sarah&quot;, 13, &quot;female&quot;, [ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot; ] ]</span></p><p class="c3 c16"><span class="c5 c2">}</span></p><p class="c3"><span>jn:values can also be used for an array:</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">let $person := {</span></p><p class="c3"><span class="c2">&nbsp; &quot;name&quot; : &quot;Sarah&quot;,</span></p><p class="c3"><span class="c2">&nbsp; &quot;age&quot; : 13,</span></p><p class="c3"><span class="c2">&nbsp; &quot;gender&quot; : &quot;female&quot;,</span></p><p class="c3"><span class="c2">&nbsp; &quot;friends&quot; : [ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot;]</span></p><p class="c3"><span class="c2">}</span></p><p class="c3"><span class="c2">return jn:values($person(&quot;friends&quot;))</span></p><p class="c3 c4"><span class="c5">[ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot; ]</span></p><p class="c9 c3 c4"><span class="c5"></span></p><h1 class="c3"><a name="h.eb0bxle2oykl"></a><span>Relational Algebra</span></h1><p class="c3 c12"><span>Remember last century&#39;s SELECT FROM WHERE statements? Well, JSONiq didn&#39;t throw out the baby with the bathwater. It has selection, projection and join capability.</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">let $stores :=</span></p><p class="c3"><span class="c2">[</span></p><p class="c3"><span class="c2">&nbsp; { &quot;store number&quot; : 1, &quot;state&quot; : &quot;MA&quot; },</span></p><p class="c3"><span class="c2">&nbsp; { &quot;store number&quot; : 2, &quot;state&quot; : &quot;MA&quot; },</span></p><p class="c3"><span class="c2">&nbsp; { &quot;store number&quot; : 3, &quot;state&quot; : &quot;CA&quot; },</span></p><p class="c3"><span class="c2">&nbsp; { &quot;store number&quot; : 4, &quot;state&quot; : &quot;CA&quot; }</span></p><p class="c3"><span class="c2">]</span></p><p class="c3"><span class="c2">let $sales := [</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;broiler&quot;, &quot;store number&quot; : 1, &quot;quantity&quot; : 20 &nbsp;},</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 100 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 50 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 50 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;blender&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 100 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;blender&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 150 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;socks&quot;, &quot;store number&quot; : 1, &quot;quantity&quot; : 500 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;socks&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 10 },</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;{ &quot;product&quot; : &quot;shirt&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 10 }</span></p><p class="c3"><span class="c2">]</span></p><p class="c3"><span class="c2">let $join :=</span></p><p class="c3"><span class="c2">&nbsp; for $store in jn:values($stores), $sale in jn:values($sales)</span></p><p class="c3"><span class="c2">&nbsp; where $store(&quot;store number&quot;) = $sale(&quot;store number&quot;)</span></p><p class="c3"><span class="c2">&nbsp; return {</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &quot;nb&quot; : $store(&quot;store number&quot;),</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &quot;state&quot; : $store(&quot;state&quot;),</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &quot;sold&quot; : $sale(&quot;product&quot;)</span></p><p class="c3"><span class="c2">&nbsp; }</span></p><p class="c3"><span class="c2">return [$join]</span></p><p class="c1"><span class="c5 c2">[ </span></p><p class="c1"><span class="c5 c2">{ &quot;nb&quot; : 1, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;broiler&quot; },</span></p><p class="c1"><span class="c5 c2">{ &quot;nb&quot; : 1, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;socks&quot; },</span></p><p class="c1"><span class="c5 c2">{ &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c1"><span class="c5 c2">{ &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c1"><span class="c5 c2">{ &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;socks&quot; },</span></p><p class="c1"><span class="c5 c2">{ &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c1"><span class="c5 c2">{ &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;blender&quot; },</span></p><p class="c1"><span class="c5 c2">{ &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;blender&quot; },</span></p><p class="c1"><span class="c5 c2">{ &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;shirt&quot; }</span></p><p class="c1"><span class="c5 c2">&nbsp;]</span></p><h1 class="c3"><a name="h.oii6pvliilhi"></a><span>Access external data</span></h1><p class="c3"><span>You can access a JSON file on your local disk with</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">jn:json(&quot;file.json&quot;)</span></p><p class="c3 c4"><span class="c5 c2">[ &quot;The&quot;, &quot;contents&quot;, &quot;of&quot;, &quot;your&quot;, &quot;file&quot; ]</span></p><p class="c9 c3"><span></span></p><p class="c3"><span>Our implementation even supports collections of JSON objects or arrays:</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">dml:collection(&quot;my:data&quot;)</span></p><p class="c3 c4"><span class="c5 c2">{ &quot;foo&quot; : &quot;Your&quot; }</span></p><p class="c3 c4"><span class="c5 c2">{ &quot;foo&quot; : &quot;Collection&quot; }</span></p><p class="c3 c4"><span class="c5 c2">{ &quot;foo&quot; : &quot;of&quot; }</span></p><p class="c3 c4"><span class="c5 c2">{ &quot;foo&quot; : &quot;JSON&quot; }</span></p><p class="c3 c4"><span class="c5 c2">{ &quot;foo&quot; : &quot;objects&quot; }</span></p><h1 class="c3"><a name="h.fopcxnkoydgt"></a><span>JSON and XML</span></h1><p class="c3 c12"><span>You can readily use XML and JSON in the same program. If you put a JSON array in an XML constructor, it will be flattened (its member values are recursively taken, even in arrays of arrays). If you put a JSON pair in an XML constructor, it will be unboxed (its value is taken).</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">let $data := {</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;&quot;color&quot; : &quot;blue&quot;,</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;&quot;closed&quot; : true,</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;&quot;points&quot; : [[10,10], [20,10], [20,20], [10,20]]</span></p><p class="c3"><span class="c2">&nbsp; &nbsp;}</span></p><p class="c9 c3"><span class="c2"></span></p><p class="c3"><span class="c2">let $stroke := attribute stroke { $data(&quot;color&quot;) }</span></p><p class="c3"><span class="c2">let $points := attribute points { $data(&quot;points&quot;) }</span></p><p class="c3"><span class="c2">return</span></p><p class="c3"><span class="c2">&nbsp; if ($data(&quot;closed&quot;)) then</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &lt;svg&gt;&lt;polygon&gt;{ $stroke, $points }&lt;/polygon&gt;&lt;/svg&gt;</span></p><p class="c3"><span class="c2">&nbsp; else</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &lt;svg&gt;&lt;polyline&gt;{ $stroke, $points }&lt;/polyline&gt;&lt;/svg&gt;</span></p><p class="c9 c3"><span class="c2"></span></p><p class="c3 c21"><span class="c5 c2">&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;</span></p><p class="c3 c21"><span class="c5 c2">&lt;svg&gt;&lt;polygon stroke=&quot;blue&quot; points=&quot;10 10 20 10 20 20 10 20&quot;/&gt;&lt;/svg&gt;</span></p><p class="c9 c3"><span></span></p><h1 class="c3"><a name="h.bm3buqmzhtko"></a><span>I want more</span></h1><p class="c3 c12"><span>JSONiq supports JSON updates. You can declaratively update your JSON data. JSONiq provides functions that produce a list of updates. The list of updates that is eventually output by your program is then applied to your JSON data.</span></p><p class="c9 c3"><span></span></p><p class="c3"><span class="c2">let $my-data := jn:json(&quot;persons.json&quot;)</span></p><p class="c3"><span class="c2">let $john := jn:value($my-data(&quot;John&quot;))</span></p><p class="c3"><span class="c2">let $mary := jn:value($my-data(&quot;Mary&quot;))</span></p><p class="c3"><span class="c2">return (jn:replace-value($john, &quot;status&quot;, &quot;married&quot;),</span></p><p class="c3"><span class="c2">&nbsp; &nbsp; &nbsp; &nbsp; j:replace-value($mary, &quot;status&quot;, &quot;married&quot;))</span></p><p class="c9 c3"><span></span></p><p class="c3"><span>JSONiq works with the XQuery 3.0 standard (switch, typeswitch and try-catch expressions, universal/existential quantifiers, path expressions, filtering expressions, functors, mappings, grouping, windowing will work). The Zorba implementation is also compatible with the proprietary Zorba scripting.</span></p></body></html>
\ No newline at end of file

=== added file 'doc/zorba/XQueryforJSON.html'
--- doc/zorba/XQueryforJSON.html	1970-01-01 00:00:00 +0000
+++ doc/zorba/XQueryforJSON.html	2012-02-08 21:22:19 +0000
@@ -0,0 +1,1 @@
+<html><head><title>XQuery for JSON</title><style type="text/css">@import url('https://themes.googleusercontent.com/fonts/css?kit=lhDjYqiy3mZ0x6ROQEUoUw');ol{margin:0;padding:0}p{margin:0}.c10{list-style-type:disc;margin:0;padding:0}.c21{max-width:468pt;background-color:#ffffff;padding:72pt 72pt 72pt 72pt}.c1{height:11pt;direction:ltr}.c9{color:#ff0000;font-style:italic}.c13{text-indent:-13.5pt;margin-left:76.5pt}.c2{color:#1155cc;text-decoration:underline}.c15{color:inherit;text-decoration:inherit}.c3{direction:ltr}.c6{text-align:justify}.c5{text-align:right}.c4{margin-left:144pt}.c11{font-style:italic}.c18{color:#ff9900}.c20{height:18pt}.c8{margin-left:36pt}.c19{text-align:center}.c17{color:#4a86e8}.c0{font-family:Consolas}.c7{color:#38761d}.c12{font-weight:bold}.c14{padding-left:0pt}.c16{margin-left:18pt}.title{padding-top:24pt;line-height:1.15;text-align:center;color:#4a86e8;font-size:36pt;font-family:Arial;font-weight:bold;padding-bottom:6pt}.subtitle{padding-top:18pt;line-height:1.15;text-align:left;color:#666666;font-style:italic;font-size:24pt;font-family:Georgia;padding-bottom:4pt}body{color:#000000;font-size:11pt;font-family:Arial}h1{padding-top:24pt;line-height:1.15;text-align:left;color:#4a86e8;font-size:24pt;font-family:Arial;font-weight:bold;padding-bottom:6pt}h2{padding-top:18pt;line-height:1.15;text-align:left;color:#ff9900;font-size:18pt;font-family:Arial;font-weight:bold;padding-bottom:4pt}h3{padding-top:14pt;line-height:1.15;text-align:left;color:#000000;font-size:14pt;font-family:Arial;font-weight:bold;padding-bottom:4pt}h4{padding-top:12pt;line-height:1.15;text-align:left;color:#000000;font-size:12pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}h5{padding-top:11pt;line-height:1.15;text-align:left;color:#000000;font-size:11pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}h6{padding-top:10pt;line-height:1.15;text-align:left;color:#000000;font-size:10pt;font-family:Arial;font-weight:bold;padding-bottom:2pt}</style></head><body class="c21"><p class="c3 title"><a name="h.li2wdq8unbq"></a><span>JSONiq for JSON users</span></p><p class="c3 title"><a name="h.5ipqqclfxk4n"></a><span class="c7">XQuery for JSON</span></p><hr><p class="c3 c19"><span>This tutorial introduces the JSONiq language, which declaratively manipulates JSON data.</span></p><p class="c3 c19"><span>Why don&#39;t you go ahead can try the queries of this document on our online demo interface?</span></p><p class="c3 c19"><span>&nbsp;</span><span class="c2 c12"><a class="c15" href="http://jsoniq.zorba-xquery.com/">http://jsoniq.zorba-xquery.com/</a></span></p><hr><p class="c1"><span></span></p><h2 class="c3 c20"><a name="h.8gra0ylxutrv"></a></h2><p class="c3 c16"><span class="c2"><a class="c15" href="#h.f453h84m2u1a">JSON</a></span></p><p class="c3 c16"><span class="c2"><a class="c15" href="#h.qtfakecy3fr7">Elevator Pitch</a></span></p><p class="c3 c16"><span class="c2"><a class="c15" href="#h.yugk1mszt0re">And here you go</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.4uvhbej4btrt">Like Monsieur Jourdain, you already knew some JSONiq</a></span></p><p class="c3 c16"><span class="c2"><a class="c15" href="#h.1gal1zhyffu4">JSONiq basics</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.ncbxtez2z3rn">The real JSONiq Hello, World!</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.ifcjheuaxoqc">Numbers and arithmetic operations</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.jmbc6c1fqqwx">Logical operations</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.iq1ixg5ywx0r">Strings</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.rv6w8p4wenfa">Sequences</a></span></p><p class="c3 c16"><span class="c2"><a class="c15" href="#h.7x2r8sj1zjwe">A bit more in depth</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.b6c9zq9um8cu">Variables</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.92ak2udyfghp">Iteration</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.zdhx60a5duyu">Conditions</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.ccs6lkxiixw4">Composability of Expressions</a></span></p><p class="c3 c16"><span class="c2"><a class="c15" href="#h.mjv7kyjurri2">JSON Navigation</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.xosiyb17dh24">Objects</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.mrf42gizl3y6">Arrays</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.hdc3dgohtdut">Pairs</a></span></p><p class="c3 c16"><span class="c2"><a class="c15" href="#h.eb0bxle2oykl">Relational Algebra</a></span></p><p class="c3 c16"><span class="c2"><a class="c15" href="#h.oii6pvliilhi">Access external data</a></span></p><p class="c3 c16"><span class="c2"><a class="c15" href="#h.bm3buqmzhtko">I want more</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.5itcphr8262b">Even more</a></span></p><p class="c3 c8"><span class="c2"><a class="c15" href="#h.j7oh3cyhem38">More is not enough</a></span></p><p><span></span></p><p class="c1"><span></span></p><h1 class="c3"><a name="h.f453h84m2u1a"></a><span>JSON</span></h1><p class="c3 c6"><span>As explained on </span><span class="c2"><a class="c15" href="http://www.json.org/">http://www.json.org/</a></span><span>, JSON is a lightweight data-interchange format designed for humans as well as for computers. It supports as values:</span></p><ol class="c10" start="1"><li class="c3 c6 c8 c14"><span>objects (string-to-value map)</span></li><li class="c3 c6 c8 c14"><span>arrays (ordered sequence of values)</span></li><li class="c3 c6 c8 c14"><span>strings</span></li><li class="c3 c6 c8 c14"><span>numbers</span></li><li class="c3 c6 c8 c14"><span>booleans (true, false)</span></li><li class="c3 c6 c8 c14"><span>null</span></li></ol><p class="c1"><span></span></p><p class="c3"><span>JSONiq provides declarative querying and updating capabilities on JSON data.</span></p><h1 class="c3"><a name="h.qtfakecy3fr7"></a><span>Elevator Pitch</span></h1><p class="c3 c6"><span>JSONiq is based on XQuery, which is a W3C standard (like XML and HTML). XQuery is a very powerful declarative language that manipulates XML data, but that is also a very good fit for JSON. Here is an appetizer before we start the tutorial from scratch.</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">let $stores :=</span></p><p class="c3"><span class="c0">[</span></p><p class="c3"><span class="c0">&nbsp; { &quot;store number&quot; : 1, &quot;state&quot; : &quot;MA&quot; },</span></p><p class="c3"><span class="c0">&nbsp; { &quot;store number&quot; : 2, &quot;state&quot; : &quot;MA&quot; },</span></p><p class="c3"><span class="c0">&nbsp; { &quot;store number&quot; : 3, &quot;state&quot; : &quot;CA&quot; },</span></p><p class="c3"><span class="c0">&nbsp; { &quot;store number&quot; : 4, &quot;state&quot; : &quot;CA&quot; }</span></p><p class="c3"><span class="c0">]</span></p><p class="c3"><span class="c0">let $sales := [</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;broiler&quot;, &quot;store number&quot; : 1, &quot;quantity&quot; : 20 &nbsp;},</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 100 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 50 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 50 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;blender&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 100 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;blender&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 150 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;socks&quot;, &quot;store number&quot; : 1, &quot;quantity&quot; : 500 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;socks&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 10 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;shirt&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 10 }</span></p><p class="c3"><span class="c0">]</span></p><p class="c3"><span class="c0">let $join :=</span></p><p class="c3"><span class="c0">&nbsp; for $store in jn:values($stores), $sale in jn:values($sales)</span></p><p class="c3"><span class="c0">&nbsp; where $store(&quot;store number&quot;) = $sale(&quot;store number&quot;)</span></p><p class="c3"><span class="c0">&nbsp; return {</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &quot;nb&quot; : $store(&quot;store number&quot;),</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &quot;state&quot; : $store(&quot;state&quot;),</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &quot;sold&quot; : $sale(&quot;product&quot;)</span></p><p class="c3"><span class="c0">&nbsp; }</span></p><p class="c3"><span class="c0">return [$join]</span></p><p class="c3 c4"><span class="c0 c7">[ </span></p><p class="c3 c4"><span class="c0 c7">&nbsp; { &quot;nb&quot; : 1, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;broiler&quot; },</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; { &quot;nb&quot; : 1, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;socks&quot; },</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; { &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; { &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; { &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;socks&quot; },</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; { &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; { &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;blender&quot; },</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; { &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;blender&quot; },</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; { &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;shirt&quot; }</span></p><p class="c3 c4"><span class="c0 c7">&nbsp;]</span></p><p class="c1"><span></span></p><h1 class="c3"><a name="h.yugk1mszt0re"></a><span>And here you go</span></h1><h2 class="c3"><a name="h.4uvhbej4btrt"></a><span>Like Monsieur Jourdain, you already knew some JSONiq</span></h2><p class="c3 c6"><span>The first thing you need to know is that every well-formed JSON document is a JSONiq query as well.</span></p><p class="c1"><span></span></p><p class="c3 c6"><span>This means that you can copy-and-paste a JSON document into a query. The following are JSONiq queries that are &quot;idempotent&quot; (they just output themselves):</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">{ &quot;pi&quot; : 3.14, &quot;sq2&quot; : 1.4 }</span></p><p class="c3 c5"><span class="c0 c7">{ &quot;pi&quot; : 3.14, &quot;sq2&quot; : 1.4 }</span></p><p class="c1"><span class="c0 c7"></span></p><p class="c3"><span class="c0">[ 2, 3, 5, 7, 11, 13 ]</span></p><p class="c3 c5"><span class="c0 c7">[ 2, 3, 5, 7, 11, 13 ]</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">{</span></p><p class="c3"><span class="c0">&nbsp; &quot;operations&quot; : [</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; { &quot;binary&quot; : [ &quot;and&quot;, &quot;or&quot;] },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; { &quot;unary&quot; : [&quot;not&quot;] }</span></p><p class="c3"><span class="c0">&nbsp; ],</span></p><p class="c3"><span class="c0">&nbsp; &quot;bits&quot; : [</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; 0, 1</span></p><p class="c3"><span class="c0">&nbsp; ]</span></p><p class="c3"><span class="c0">}</span></p><p class="c3 c4"><span class="c0 c7">{</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; &quot;operations&quot; : [</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; &nbsp; { &quot;binary&quot; : [ &quot;and&quot;, &quot;or&quot; ] },</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; &nbsp; { &quot;unary&quot; : [ &quot;not&quot; ] }</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; ],</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; &quot;bits&quot; : [</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; &nbsp; 0, 1</span></p><p class="c3 c4"><span class="c0 c7">&nbsp; ]</span></p><p class="c3 c4"><span class="c0 c7">}</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span>This works with objects, arrays (even nested), strings, numbers, booleans, null. </span><span class="c11">The exceptions to this rule (but we are working on it!) are that:</span></p><p class="c3 c6"><span class="c11">(i) if a pair has a true, false or null value, there must be a space on at least one side of the colon (this will be fixed).</span></p><p class="c3 c6"><span class="c11">(ii) empty objects are not recognized</span></p><p class="c3 c6"><span class="c11">(iii) characters escaped with the \ in JSON strings are not recognized</span></p><p class="c1"><span class="c9 c0"></span></p><p class="c3 c6"><span>It also works the other way round: if your query outputs an object or an array, you can readily use it as a JSON document.</span></p><p class="c1"><span></span></p><p class="c3 c6"><span>JSONiq is a declarative language. This means that you only need to say </span><span class="c11">what</span><span>&nbsp;you want - the compiler will take care of the </span><span class="c11">how</span><span>. In the above queries, you are basically saying: I want to output this JSON content, and here it is.</span></p><h1 class="c3"><a name="h.1gal1zhyffu4"></a><span>JSONiq basics</span></h1><h2 class="c3"><a name="h.ncbxtez2z3rn"></a><span>The real JSONiq Hello, World!</span></h2><p class="c3"><span>Wondering what a hello world program looks like in JSONiq? Here it is:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">&quot;Hello, World!&quot;</span></p><p class="c3 c5"><span class="c0 c7">Hello, World!</span></p><p class="c1"><span class="c0 c7"></span></p><p class="c3"><span>Not surprisingly, it outputs the string &quot;Hello, World!&quot;. Again, just say what you want and you will get it.</span></p><h2 class="c3"><a name="h.ifcjheuaxoqc"></a><span>Numbers and arithmetic operations</span></h2><p class="c3 c6"><span>Okay, so, now, you might be thinking: &quot;What is the use of this language if it just outputs what I put in?&quot; Of course, JSONiq can more than that. And still in a declarative way. Here is how it works with numbers:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">2 + 2</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span>will surprisingly output:</span></p><p class="c3 c5"><span class="c0 c7">4</span></p><p class="c1"><span></span></p><p class="c3"><span>whereas</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">(38 + 2) div 2 + 11 * 2</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span>will output</span></p><p class="c3 c5"><span class="c0 c7">42</span></p><p class="c1"><span class="c0 c7"></span></p><p class="c3 c6"><span>(mind the division operator which is the &quot;div&quot; keyword. The slash has other semantics).</span></p><p class="c1"><span></span></p><p class="c3"><span>Like JSON, JSONiq works with decimals, too:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">6.022e23 * 42</span></p><p class="c3 c5"><span class="c0 c7">2.52924E25</span></p><h2 class="c3"><a name="h.jmbc6c1fqqwx"></a><span>Logical operations</span></h2><p class="c3 c6"><span>JSONiq supports boolean operations.</span></p><p class="c1 c6"><span></span></p><p class="c3"><span class="c0">true and false</span></p><p class="c3 c5"><span class="c0 c7">false</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span class="c0">(true or false) and (false or true)</span></p><p class="c3 c5"><span class="c0 c7">true</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span>The unary not is a function (yes, JSONiq has functions, and they are in the same way as in many languages):</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">not(true)</span></p><p class="c3 c5"><span class="c0 c7">false</span></p><h2 class="c3"><a name="h.iq1ixg5ywx0r"></a><span>Strings</span></h2><p class="c3"><span>JSONiq is capable of manipulating strings as well, using functions:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">concat(&quot;Hello &quot;, &quot;Captain Kirk&quot;)</span></p><p class="c3 c5"><span class="c0 c7">Hello Captain Kirk</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span class="c0">substring(&quot;Mister Spock&quot;, 8, 5)</span></p><p class="c3 c5"><span class="c0 c7">Spock</span></p><h2 class="c3"><a name="h.rv6w8p4wenfa"></a><span>Sequences</span></h2><p class="c3"><span>Until now, we only handled single values (an object, an array, a number, a string, a boolean). JSONiq supports sequences of values. You can build a sequence using commas:</span></p><p class="c1"><span></span></p><p class="c3"><span>1, 2, 3, 4, 5, 6, 7, 8, 9, 10</span></p><p class="c3 c5"><span class="c7">1 2 3 4 5 6 7 8 9 10</span></p><p class="c1"><span class="c7"></span></p><p class="c3"><span class="c0">1, </span><span class="c0">true</span><span class="c0">, 4.2e1, &quot;Life&quot;</span></p><p class="c3 c5"><span class="c0 c7">1 true 42 Life</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">{ &quot;Question&quot; : &quot;Ultimate&quot; }, [&quot;Life&quot;, &quot;The universe&quot;, &quot;and everything&quot;]</span></p><p class="c1 c5"><span class="c0"></span></p><p class="c3 c5"><span class="c0 c7">{ &quot;Question&quot; : &quot;Ultimate&quot; }[ &quot;Life&quot;, &quot;The universe&quot;, &quot;and everything&quot; ]</span></p><p class="c1 c5"><span class="c0"></span></p><p class="c3"><span>The &quot;to&quot; operator is very convenient, too:</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">1 to 100</span></p><p class="c3 c5"><span class="c7">1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20</span></p><p class="c3 c5"><span class="c7">21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40</span></p><p class="c3 c5"><span class="c7">41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60</span></p><p class="c3 c5"><span class="c7">61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80</span></p><p class="c3 c5"><span class="c7">81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100</span></p><p class="c1"><span></span></p><p class="c3"><span>Some functions even work on sequences:</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">sum(1 to 100)</span></p><p class="c3 c5"><span class="c0 c7">5050</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span class="c0">string-join((&quot;These&quot;, &quot;are&quot;, &quot;some&quot;, &quot;words&quot;), &quot;-&quot;)</span></p><p class="c3 c5"><span class="c0 c7">These-are-some-words</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span class="c0">count(10 to 20)</span></p><p class="c3 c5"><span class="c0 c7">11</span></p><p class="c1"><span class="c0 c7"></span></p><p class="c3"><span class="c0">avg(1 to 100)</span></p><p class="c3 c5"><span class="c0 c7">50.5</span></p><h1 class="c3"><a name="h.7x2r8sj1zjwe"></a><span>A bit more in depth</span></h1><h2 class="c3"><a name="h.b6c9zq9um8cu"></a><span>Variables</span></h2><p class="c3"><span>You can bind a sequence of values to a (dollar-prefixed) variable, like so:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">let $x := &quot;Bearing 3 1 4 Mark 5. &quot;</span></p><p class="c3"><span class="c0">return concat($x, &quot;Engage!&quot;)</span></p><p class="c3 c5"><span class="c0 c7">Bearing 3 1 4 Mark 5. Engage!</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c1 c5"><span class="c0"></span></p><p class="c3"><span class="c0">let $x := (&quot;Kirk&quot;, &quot;Picard&quot;, &quot;Sisko&quot;)</span></p><p class="c3"><span class="c0">return string-join($x, &quot; and &quot;)</span></p><p class="c3 c5"><span class="c0 c7">Kirk and Picard and Sisko</span></p><p class="c1"><span class="c0 c7"></span></p><p class="c3"><span>You can bind as many variables as you want:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">let $x := 1</span></p><p class="c3"><span class="c0">let $y := $x * 2</span></p><p class="c3"><span class="c0">let $z := $y + $x</span></p><p class="c3"><span class="c0">return [$x, $y, $z]</span></p><p class="c3 c5"><span class="c0 c7">[ 1, 2, 3 ]</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span>and even reuse the same name:</span></p><p class="c3"><span class="c0">let $x := 1</span></p><p class="c3"><span class="c0">let $x := $x + 2</span></p><p class="c3"><span class="c0">let $x := $x + 3</span></p><p class="c3"><span class="c0">return $x</span></p><p class="c3 c5"><span class="c0 c7">6</span></p><h2 class="c3"><a name="h.92ak2udyfghp"></a><span>Iteration</span></h2><p class="c3 c6"><span>In a way very similar to let, you can iterate over a sequence of values with the &quot;for&quot; keyword. Instead of binding the entire sequence of the variable, it will bind each value of the sequence in turn to this variable.</span></p><p class="c1 c6"><span></span></p><p class="c3 c6"><span class="c0">for $i in 1 to 10</span></p><p class="c3 c6"><span class="c0">return $i * 2</span></p><p class="c3 c5"><span class="c0 c7">2 4 6 8 10 12 14 16 18 20</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span>More interestingly, you can combine fors and lets like so:</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">let $sequence := 1 to 10</span></p><p class="c3"><span class="c0">for $value in $sequence</span></p><p class="c3"><span class="c0">let $square := $value * 2</span></p><p class="c3"><span class="c0">return $square</span></p><p class="c3 c5"><span class="c0 c7">2 4 6 8 10 12 14 16 18 20</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span>and even filter out some values:</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">let $sequence := 1 to 10</span></p><p class="c3"><span class="c0">for $value in $sequence</span></p><p class="c3"><span class="c0">let $square := $value * 2</span></p><p class="c3"><span class="c0">where $square &lt; 10</span></p><p class="c3"><span class="c0">return $square</span></p><p class="c3 c5"><span class="c0 c7">2 4 6 8</span></p><h2 class="c3"><a name="h.zdhx60a5duyu"></a><span>Conditions</span></h2><p class="c3"><span>You can make the output depend on a condition with an if-then-else construct:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">for $x in 1 to 10</span></p><p class="c3"><span class="c0">return if ($x &lt; 5) then $x</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;else -$x</span></p><p class="c3 c5"><span class="c0 c7">1 2 3 4 -5 -6 -7 -8 -9 -10</span></p><h2 class="c3"><a name="h.ccs6lkxiixw4"></a><span>Composability of Expressions</span></h2><p class="c3"><span>Now that you know of a couple of elementary JSONiq expressions, you can combine then in more elaborate expressions. For example, you can put any sequence of values in an array:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">[ 1 to 10 ]</span></p><p class="c3 c5"><span class="c0 c7">[ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span>Or you can dynamically compute the value of object pairs:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">{</span></p><p class="c3"><span class="c0">&nbsp; &quot;Greeting&quot; : let $d := &quot;Mister Spock&quot;</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;return concat(&quot;Hello, &quot;, $d),</span></p><p class="c3"><span class="c0">&nbsp; &quot;Farewell&quot; : string-join((&quot;Live&quot;, &quot;long&quot;, &quot;and&quot;, &quot;prosper&quot;),</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot; &quot;)</span></p><p class="c3"><span class="c0">}</span></p><p class="c1"><span class="c0 c7"></span></p><p class="c3 c5"><span class="c0 c7">{ &quot;Greeting&quot; : &quot;Hello, Mister Spock&quot;, &quot;Farewell&quot; : &quot;Live long and prosper&quot; }</span></p><p class="c1"><span class="c7"></span></p><p class="c3"><span>You can also dynamically generate pairs:</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">concat(&quot;Integer &quot;, 2) : 2 * 2</span></p><p class="c3 c5"><span class="c0 c7">&quot;Integer 2&quot; : 4</span></p><p class="c1 c5"><span class="c0 c7"></span></p><p class="c3"><span>and then wrap lots of them in an object:</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">{</span></p><p class="c3"><span class="c0">&nbsp; for $i in 1 to 10</span></p><p class="c3"><span class="c0">&nbsp; return concat(&quot;Square of &quot;, $i) : $i * $i</span></p><p class="c3"><span class="c0">}</span></p><p class="c3 c4"><span class="c0 c7">{</span></p><p class="c3 c4"><span class="c0 c7">&quot;Square of 1&quot; : 1,</span></p><p class="c3 c4"><span class="c0 c7">&quot;Square of 2&quot; : 4,</span></p><p class="c3 c4"><span class="c0 c7">&quot;Square of 3&quot; : 9,</span></p><p class="c3 c4"><span class="c0 c7">&quot;Square of 4&quot; : 16,</span></p><p class="c3 c4"><span class="c0 c7">&quot;Square of 5&quot; : 25,</span></p><p class="c3 c4"><span class="c0 c7">&quot;Square of 6&quot; : 36,</span></p><p class="c3 c4"><span class="c0 c7">&quot;Square of 7&quot; : 49,</span></p><p class="c3 c4"><span class="c0 c7">&quot;Square of 8&quot; : 64,</span></p><p class="c3 c4"><span class="c0 c7">&quot;Square of 9&quot; : 81,</span></p><p class="c3 c4"><span class="c0 c7">&quot;Square of 10&quot; : 100</span></p><p class="c3 c4"><span class="c0 c7">}</span></p><h1 class="c3"><a name="h.mjv7kyjurri2"></a><span>JSON Navigation</span></h1><p class="c3 c6"><span>Up to now, you learnt how to compose expressions so as to do some computations and to build pairs, objects and arrays. It also works the other way round: if you have some JSON data, you can access it and navigate.</span></p><p class="c1 c6"><span></span></p><p class="c3 c6"><span>All you need to know is: JSONiq views</span></p><ol class="c10" start="1"><li class="c3 c6 c8 c14"><span>an array as a sequence of values,</span></li><li class="c3 c6 c8 c14"><span>an object as a set of name/value pairs (we call them just: pairs)</span></li><li class="c3 c6 c8 c14"><span>a pair as a (name, value) tuple.</span></li></ol><h2 class="c3 c6"><a name="h.xosiyb17dh24"></a><span>Objects</span></h2><p class="c3 c6"><span>If you use an object as a functor and provide it with a string, it will return the pair named after its parameter:</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">let $person := {</span></p><p class="c3"><span class="c0">&nbsp; &quot;first name&quot; : &quot;Sarah&quot;,</span></p><p class="c3"><span class="c0">&nbsp; &quot;age&quot; : 13,</span></p><p class="c3"><span class="c0">&nbsp; &quot;gender&quot; : &quot;female&quot;,</span></p><p class="c3"><span class="c0">&nbsp; &quot;friends&quot; : [ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot;]</span></p><p class="c3"><span class="c0">}</span></p><p class="c3"><span class="c0">return $person(&quot;first name&quot;)</span></p><p class="c3 c5"><span class="c0 c7">&quot;first name&quot; : &quot;Sarah&quot;</span></p><p class="c1 c5"><span class="c0 c7"></span></p><h2 class="c3"><a name="h.mrf42gizl3y6"></a><span>Arrays</span></h2><p class="c3 c6"><span>If you use an array as a functor and provide it with an integer, it will return the corresponding entry:</span></p><p class="c1"><span class="c0"></span></p><p class="c3"><span class="c0">let $friends := [ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot;]</span></p><p class="c3"><span class="c0">return $friends(2)</span></p><p class="c3 c5"><span class="c0 c7">Mary</span></p><h2 class="c3"><a name="h.hdc3dgohtdut"></a><span>Pairs</span></h2><p class="c3"><span>Given a pair, you can get its name and value using the functions jn:name and jn:value:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">let $pair := &quot;name of the pair&quot; : &quot;value of the pair&quot;</span></p><p class="c3"><span class="c0">return { &nbsp;&quot;name&quot; : jn:name($pair), &quot;value&quot; : jn:value($pair) }</span></p><p class="c1"><span class="c0"></span></p><p class="c3 c5"><span class="c0 c7">{ &quot;name&quot; : &quot;name of the pair&quot;, &quot;value&quot; : &quot;value of the pair&quot; }</span></p><p class="c1"><span class="c7"></span></p><p class="c3"><span>This functions also exist in plural form for objects:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">let $person := {</span></p><p class="c3"><span class="c0">&nbsp; &quot;name&quot; : &quot;Sarah&quot;,</span></p><p class="c3"><span class="c0">&nbsp; &quot;age&quot; : 13,</span></p><p class="c3"><span class="c0">&nbsp; &quot;gender&quot; : &quot;female&quot;,</span></p><p class="c3"><span class="c0">&nbsp; &quot;friends&quot; : [ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot;]</span></p><p class="c3"><span class="c0">}</span></p><p class="c3"><span class="c0">return { &quot;names&quot; : [ jn:names($person)],</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&quot;values&quot; : [ jn:values($person)]</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &nbsp; &nbsp;}</span></p><p class="c3 c13"><span class="c0 c7">{</span></p><p class="c13 c3"><span class="c0 c7">&quot;names&quot; : [ &quot;name&quot;, &quot;age&quot;, &quot;gender&quot;, &quot;friends&quot; ],</span></p><p class="c13 c3"><span class="c0 c7">&quot;values&quot; : [ &quot;Sarah&quot;, 13, &quot;female&quot;, [ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot; ] ]</span></p><p class="c13 c3"><span class="c0 c7">}</span></p><p class="c3"><span>jn:values can also be used for an array:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">let $person := {</span></p><p class="c3"><span class="c0">&nbsp; &quot;name&quot; : &quot;Sarah&quot;,</span></p><p class="c3"><span class="c0">&nbsp; &quot;age&quot; : 13,</span></p><p class="c3"><span class="c0">&nbsp; &quot;gender&quot; : &quot;female&quot;,</span></p><p class="c3"><span class="c0">&nbsp; &quot;friends&quot; : [ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot;]</span></p><p class="c3"><span class="c0">}</span></p><p class="c3"><span class="c0">return jn:values($person(&quot;friends&quot;))</span></p><p class="c3 c5"><span class="c7">[ &quot;Jim&quot;, &quot;Mary&quot;, &quot;Jennifer&quot; ]</span></p><p class="c1 c5"><span class="c7"></span></p><h1 class="c3"><a name="h.eb0bxle2oykl"></a><span>Relational Algebra</span></h1><p class="c3 c6"><span>Remember last century&#39;s SELECT FROM WHERE statements? Well, JSONiq didn&#39;t throw out the baby with the bathwater. It has selection, projection and join capability.</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">let $stores :=</span></p><p class="c3"><span class="c0">[</span></p><p class="c3"><span class="c0">&nbsp; { &quot;store number&quot; : 1, &quot;state&quot; : &quot;MA&quot; },</span></p><p class="c3"><span class="c0">&nbsp; { &quot;store number&quot; : 2, &quot;state&quot; : &quot;MA&quot; },</span></p><p class="c3"><span class="c0">&nbsp; { &quot;store number&quot; : 3, &quot;state&quot; : &quot;CA&quot; },</span></p><p class="c3"><span class="c0">&nbsp; { &quot;store number&quot; : 4, &quot;state&quot; : &quot;CA&quot; }</span></p><p class="c3"><span class="c0">]</span></p><p class="c3"><span class="c0">let $sales := [</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;broiler&quot;, &quot;store number&quot; : 1, &quot;quantity&quot; : 20 &nbsp;},</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 100 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 50 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;toaster&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 50 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;blender&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 100 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;blender&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 150 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;socks&quot;, &quot;store number&quot; : 1, &quot;quantity&quot; : 500 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;socks&quot;, &quot;store number&quot; : 2, &quot;quantity&quot; : 10 },</span></p><p class="c3"><span class="c0">&nbsp; &nbsp;{ &quot;product&quot; : &quot;shirt&quot;, &quot;store number&quot; : 3, &quot;quantity&quot; : 10 }</span></p><p class="c3"><span class="c0">]</span></p><p class="c3"><span class="c0">let $join :=</span></p><p class="c3"><span class="c0">&nbsp; for $store in jn:values($stores), $sale in jn:values($sales)</span></p><p class="c3"><span class="c0">&nbsp; where $store(&quot;store number&quot;) = $sale(&quot;store number&quot;)</span></p><p class="c3"><span class="c0">&nbsp; return {</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &quot;nb&quot; : $store(&quot;store number&quot;),</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &quot;state&quot; : $store(&quot;state&quot;),</span></p><p class="c3"><span class="c0">&nbsp; &nbsp; &quot;sold&quot; : $sale(&quot;product&quot;)</span></p><p class="c3"><span class="c0">&nbsp; }</span></p><p class="c3"><span class="c0">return [$join]</span></p><p class="c3 c4"><span class="c0 c7">[ </span></p><p class="c3 c4"><span class="c0 c7">{ &quot;nb&quot; : 1, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;broiler&quot; },</span></p><p class="c3 c4"><span class="c0 c7">{ &quot;nb&quot; : 1, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;socks&quot; },</span></p><p class="c3 c4"><span class="c0 c7">{ &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c3 c4"><span class="c0 c7">{ &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c3 c4"><span class="c0 c7">{ &quot;nb&quot; : 2, &quot;state&quot; : &quot;MA&quot;, &quot;sold&quot; : &quot;socks&quot; },</span></p><p class="c3 c4"><span class="c0 c7">{ &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;toaster&quot; },</span></p><p class="c3 c4"><span class="c0 c7">{ &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;blender&quot; },</span></p><p class="c3 c4"><span class="c0 c7">{ &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;blender&quot; },</span></p><p class="c3 c4"><span class="c0 c7">{ &quot;nb&quot; : 3, &quot;state&quot; : &quot;CA&quot;, &quot;sold&quot; : &quot;shirt&quot; }</span></p><p class="c3 c4"><span class="c0 c7">&nbsp;]</span></p><h1 class="c3"><a name="h.oii6pvliilhi"></a><span>Access external data</span></h1><p class="c3"><span>You can access a JSON file on your local disk with</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">jn:json(&quot;file.json&quot;)</span></p><p class="c3 c5"><span class="c0 c7">[ &quot;The&quot;, &quot;contents&quot;, &quot;of&quot;, &quot;your&quot;, &quot;file&quot; ]</span></p><p class="c1"><span></span></p><p class="c3"><span>Our implementation even supports collections of JSON objects or arrays:</span></p><p class="c1"><span></span></p><p class="c3"><span class="c0">dml:collection(&quot;my:data&quot;)</span></p><p class="c3 c5"><span class="c0 c7">{ &quot;foo&quot; : &quot;Your&quot; }</span></p><p class="c3 c5"><span class="c0 c7">{ &quot;foo&quot; : &quot;Collection&quot; }</span></p><p class="c3 c5"><span class="c0 c7">{ &quot;foo&quot; : &quot;of&quot; }</span></p><p class="c3 c5"><span class="c0 c7">{ &quot;foo&quot; : &quot;JSON&quot; }</span></p><p class="c3 c5"><span class="c0 c7">{ &quot;foo&quot; : &quot;objects&quot; }</span></p><h1 class="c3"><a name="h.bm3buqmzhtko"></a><span>I want more</span></h1><p class="c3 c6"><span>JSONiq supports JSON updates. You can declaratively update your JSON data. JSONiq provides functions that produce a list of updates. The list of updates that is eventually output by your program is then applied to your JSON data.</span></p><p class="c1"><span></span></p><p class="c3"><span>let $my-data := jn:json(&quot;persons.json&quot;)</span></p><p class="c3"><span>let $john := jn:value($my-data(&quot;John&quot;))</span></p><p class="c3"><span>let $mary := jn:value($my-data(&quot;Mary&quot;))</span></p><p class="c3"><span>return (jn:replace-value($john, &quot;status&quot;, &quot;married&quot;), j:replace-value($mary, &quot;status&quot;, &quot;married&quot;))</span></p><h2 class="c3"><a name="h.5itcphr8262b"></a><span>Even more</span></h2><p class="c3"><span>JSONiq can do way more that what is presented here. Here are a couple of highlights:</span></p><p class="c3 c6"><span>- JSONiq is a strongly typed language, but is smart enough to not bother you with types when unnecessary. It potentially supports static typing as well to detect errors before you even execute your program.</span></p><p class="c3"><span>- You can define your own functions and modules.</span></p><p class="c3"><span>- JSONiq provides you with loads of available modules.</span></p><p class="c3 c6"><span>- JSONiq has tons of further features such as switch, typeswitch and try-catch expressions, universal/existential quantifiers, path expressions, filtering expressions, functors, mappings, grouping, windowing.</span></p><h2 class="c3"><a name="h.j7oh3cyhem38"></a><span>More is not enough</span></h2><p class="c3 c6"><span>- JSONiq supports XML. Yes: you can manipulate JSON and XML with the same language! JSONiq is actually a superset of XQuery, a W3C standard, and extends its data model to support JSON.</span></p><p class="c3 c6"><span>- JSONiq supports scripting. If you need to write a full-fledged, side-effecting Web application, scripting is for you.</span></p></body></html>
\ No newline at end of file

=== modified file 'doc/zorba/indexpage.dox.in'
--- doc/zorba/indexpage.dox.in	2011-10-07 08:28:43 +0000
+++ doc/zorba/indexpage.dox.in	2012-02-08 21:22:19 +0000
@@ -124,7 +124,15 @@
 
     \ref options_and_annotations
 
-    <!--li>\ref extensions_update</li-->
+</td></tr>
+<tr><td class="tdDocIndexTable">
+
+    <h2>JSONiq</h2>
+
+
+    <a href="XQueryforJSON.html">JSONiq for JSON users</a>
+
+    <a href="JSONforXQuery.html">JSONiq for XQuery users</a>
 
 
 </td></tr>

=== modified file 'include/zorba/config.h.cmake'
--- include/zorba/config.h.cmake	2012-02-05 12:31:20 +0000
+++ include/zorba/config.h.cmake	2012-02-08 21:22:19 +0000
@@ -155,6 +155,7 @@
 #cmakedefine ZORBA_WITH_BIG_INTEGER
 #cmakedefine ZORBA_WITH_DEBUGGER
 #cmakedefine ZORBA_WITH_FILE_ACCESS
+#cmakedefine ZORBA_WITH_JSON
 #cmakedefine ZORBA_WITH_LIBXML2_SAX
 
 // Zorba parser configuration

=== modified file 'include/zorba/diagnostic.h'
--- include/zorba/diagnostic.h	2011-07-01 16:07:54 +0000
+++ include/zorba/diagnostic.h	2012-02-08 21:22:19 +0000
@@ -239,7 +239,15 @@
   ZORBA_DEBUGGER,                       // Zorba Debugger
   ZORBA_OS,                             // Operating System
   ZORBA_SERIALIZATION,
-  ZORBA_STORE
+  ZORBA_STORE,
+
+  JSON_PARSER,
+  JSON_SERIALIZATION,
+
+# ifdef ZORBA_WITH_JSON
+  JSONIQ_CORE,
+  JSONIQ_UPDATE
+# endif
 };
 
 /**

=== modified file 'include/zorba/error.h'
--- include/zorba/error.h	2011-07-04 21:23:55 +0000
+++ include/zorba/error.h	2012-02-08 21:22:19 +0000
@@ -42,6 +42,13 @@
  */
 typedef internal::SystemDiagnostic<internal::ZorbaErrQName> ZorbaErrorCode;
 
+#ifdef ZORBA_WITH_JSON
+/**
+ * An %JSONiqErrorCode is a diagnostic for all JSONiq-specific errors.
+ */
+typedef internal::SystemDiagnostic<internal::JSONiqErrQName> JSONiqErrorCode;
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////
 
 /**

=== modified file 'include/zorba/identtypes.h'
--- include/zorba/identtypes.h	2011-09-21 14:49:55 +0000
+++ include/zorba/identtypes.h	2012-02-08 21:22:19 +0000
@@ -18,10 +18,14 @@
 
 #include <zorba/config.h>
 
-namespace zorba {
-class ZORBA_DLL_PUBLIC IdentTypes {
+namespace zorba 
+{
+
+class ZORBA_DLL_PUBLIC IdentTypes 
+{
 public:
-  typedef enum {
+  typedef enum 
+  {
     NAMED_TYPE,     // builtin atomic type
     ELEMENT_TYPE,
     ATTRIBUTE_TYPE,
@@ -30,12 +34,20 @@
     TEXT_TYPE,
     COMMENT_TYPE,
     ANY_NODE_TYPE, // node()
+#ifdef ZORBA_WITH_JSON
+    STRUCTURED_ITEM_TYPE,
+    JSON_ITEM_TYPE,
+    JSON_OBJECT_TYPE,
+    JSON_ARRAY_TYPE,
+    JSON_PAIR_TYPE,
+#endif
     ITEM_TYPE,     // item()
     EMPTY_TYPE,    // empty-sequence()
     INVALID_TYPE,
   } kind_t;
 
-  typedef enum {
+  typedef enum 
+  {
     QUANT_ONE,
     QUANT_QUESTION,
     QUANT_PLUS,

=== modified file 'include/zorba/internal/qname.h'
--- include/zorba/internal/qname.h	2011-06-30 16:42:30 +0000
+++ include/zorba/internal/qname.h	2012-02-08 21:22:19 +0000
@@ -182,6 +182,46 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifdef ZORBA_WITH_JSON
+
+/**
+ * An %JSONiqErrQName is-a FixedQName for standard JSONiq errors.
+ */
+class ZORBA_DLL_PUBLIC JSONiqErrQName :
+  public FixedQName<JSONiqErrQName,char const*>
+{
+  typedef FixedQName<JSONiqErrQName,char const*> base_type;
+public:
+  static char const NAMESPACE[];
+  static char const PREFIX[];
+
+  /**
+   * Constructs an %JSONiqErrQName.
+   *
+   * @param localname The local-name of the error.
+   */
+  JSONiqErrQName( char const *localname ) : base_type( localname ) { }
+
+  /**
+   * Gets the category of error this QName represents.
+   *
+   * @return Returns UNKNOWN_CATEGORY as there currently
+   *         are no categories for JSONiq errors
+   */
+  zorba::diagnostic::category category() const;
+
+  /**
+   * Gets the kind of error this QName represents.
+   *
+   * @return Returns said kind.
+   */
+  zorba::diagnostic::kind kind() const;
+};
+
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
+
 /**
  * An %ZorbaWarningQName is-a FixedQName for Zorba warnings.
  */

=== modified file 'include/zorba/item.h'
--- include/zorba/item.h	2012-01-11 17:30:25 +0000
+++ include/zorba/item.h	2012-02-08 21:22:19 +0000
@@ -142,6 +142,21 @@
   Item
   getType() const;
 
+#ifdef ZORBA_WITH_JSON
+
+  /**
+   * \brief Check if the Item is a JSON Item, that is, part of the JSONiq
+   * data model.
+   *
+   * Note that this function is available for all types of Items.
+   *
+   * @return true if the Item is a JSON Item, false otherwise.
+   */
+  bool
+  isJSONItem() const;
+
+#endif /* ZORBA_WITH_JSON */
+
   /** \brief Get the atomization value of the Item.
    *
    * The atomization value is the value that is returned by atomization 
@@ -346,6 +361,83 @@
   int
   getNodeKind() const;
 
+#ifdef ZORBA_WITH_JSON
+
+  /** \brief Get the kind of this (JSON) Item.
+   *
+   * Note that this function is only available for JSON Items, that is, Items
+   * which return true from isJSONItem().
+   *
+   * @return the kind of this JSON item
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON).
+   */
+  store::StoreConsts::JSONItemKind
+  getJSONItemKind() const;
+
+  /** \brief Get the pairs from a JSON Object.
+   *
+   * Note that this function is only available for JSON Objects.
+   *
+   * @return Iterator over the pairs in this object.
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Object).
+   */
+  Iterator_t
+  getObjectPairs() const;
+
+  /** \brief Get the members of a JSON Array.
+   *
+   * Note that this function is only available for JSON Arrays.
+   *
+   * @return Iterator over the members of this array.
+   * @throw ZorbaException if an error occure (e.g. the Item is not of type JSON Array).
+   */
+  Iterator_t
+  getArrayMembers() const;
+
+  /** \brief Returns the value of a JSON Pair with the given name from a JSON Object.
+   *
+   * Note that this function is only available for JSON Objects.
+   *
+   * @param aName the name of the pair to return.
+   * @return Item the named Pair.
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Object).
+   */
+  Item
+  getObjectValue(String aName) const;
+
+  /** \brief Returns the item in the JSON array at the specified index.
+   *
+   * Note that this function is only available for JSON Arrays.
+   *
+   * @param aIndex the index in the array.
+   * @return Item the indexed Item.
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Array).
+   */
+  Item
+  getArrayMember(uint32_t aIndex) const;
+
+  /** \brief Returns the name of a JSON Pair.
+   *
+   * Note that this function is only available for JSON Pairs.
+   *
+   * @return Item the name of the Pair.
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Pair).
+   */
+  Item
+  getPairName() const;
+
+  /** \brief Returns the value of a JSON Pair.
+   *
+   * Note that this function is only available for JSON Pairs.
+   *
+   * @return Item the value of the Pair.
+   * @throw ZorbaException if an error occured (e.g. the Item is not of type JSON Pair).
+   */
+  Item
+  getPairValue() const;
+
+#endif /* ZORBA_WITH_JSON */
+
   /**
    * Checks whether the item's content is streamable.
    *

=== modified file 'include/zorba/item_factory.h'
--- include/zorba/item_factory.h	2012-01-11 17:30:25 +0000
+++ include/zorba/item_factory.h	2012-02-08 21:22:19 +0000
@@ -123,7 +123,7 @@
       /** \brief Creates a Base64Binary Item
        *         see [http://www.w3.org/TR/xmlschema-2/#base64Binary]
        *
-       * @param aBinData a pointer to the base64 binary data.
+       * @param aBinData a pointer to the base6c4 binary data.
        * @param aLength the length of the base64 binary data.
        * @return The Base64Binary Item.
        */
@@ -679,6 +679,51 @@
       virtual Item createTextNode(
         Item   parent,
         String content) = 0;
+
+#ifdef ZORBA_WITH_JSON
+
+      /**
+       * Create a JSON null item.
+       */
+      virtual Item createJSONNull() = 0;
+
+      /**
+       * Create a JSON Number item from a string. This will actually be
+       * an xs:integer, xs:double, or xs:decimal, depending on the content
+       * of the string.
+       *
+       * @param aString The input string.
+       */
+      virtual Item createJSONNumber(String aString) = 0;
+
+      /**
+       * Create a JSON Object containing the specified JSON Pairs.
+       *
+       * @param aPairs A std::vector<Item> containing JSON Pair items.
+       */
+      virtual Item createJSONObject(std::vector<Item>& aPairs) = 0;
+
+      /**
+       * Create a JSON Array containing the specified items.
+       *
+       * @param aItems A std::vector<Item> containing Items which may
+       * be stored in a JSON Array (namely JSON Arrays, JSON Objects,
+       * JSON nulls, valid JSON numeric types, or xs:strings).
+       */
+      virtual Item createJSONArray(std::vector<Item>& aItems) = 0;
+
+      /**
+       * Create a JSON Pair, suitable for putting into a JSON Object.
+       *
+       * @param aName The name for the pair.
+       * @param aValue The value for the pair. This must be of a type
+       * which may be the value of a JSON pair (namely JSON Arrays, JSON Objects,
+       * JSON nulls, valid JSON numeric types, or xs:strings).
+       */
+      virtual Item createJSONPair(String aName, Item aValue) = 0;
+
+#endif /* ZORBA_WITH_JSON */
+
 }; // class ItemFactory
 
 } // namespace zorba

=== modified file 'include/zorba/options.h'
--- include/zorba/options.h	2012-01-11 17:30:25 +0000
+++ include/zorba/options.h	2012-02-08 21:22:19 +0000
@@ -83,7 +83,11 @@
   ZORBA_SERIALIZATION_METHOD_HTML,
   ZORBA_SERIALIZATION_METHOD_XHTML,
   ZORBA_SERIALIZATION_METHOD_TEXT,
-  ZORBA_SERIALIZATION_METHOD_BINARY
+  ZORBA_SERIALIZATION_METHOD_BINARY,
+#ifdef ZORBA_WITH_JSON
+  ZORBA_SERIALIZATION_METHOD_JSON,
+  ZORBA_SERIALIZATION_METHOD_JSONIQ
+#endif
 } Zorba_serialization_method_t;
 
 

=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h	2011-12-21 14:40:33 +0000
+++ include/zorba/pregenerated/diagnostic_list.h	2012-02-08 21:22:19 +0000
@@ -504,6 +504,12 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0042_ITERATOR_CLOSED;
 
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0043_CANNOT_SERIALIZE_JSON_ITEM;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0044_CANNOT_SERIALIZE_XML_ITEM;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0045_CANNOT_SERIALIZE_MIXED_XDM_JDM;
+
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0070_INVALID_SERIALIZATION_METHOD_FOR_SAX;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0080_CANNOT_RETRIEVE_NODE_REFERENCE;
@@ -704,6 +710,8 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0012_COLLECTION_ITEM_MUST_BE_A_NODE;
 
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0013_COLLECTION_ITEM_MUST_BE_STRUCTURED;
+
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0015_IC_ALREADY_EXISTS;
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZSTR0016_IC_DOES_NOT_EXIST;
@@ -746,8 +754,70 @@
 
 extern ZORBA_DLL_PUBLIC ZorbaErrorCode XSST0010;
 
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0001_ILLEGAL_CHARACTER;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0002_ILLEGAL_CODEPOINT;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0003_ILLEGAL_ESCAPE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0004_ILLEGAL_LITERAL;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0005_ILLEGAL_NUMBER;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0006_UNEXPECTED_TOKEN;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJPE0007_UNTERMINATED_STRING;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0001_NOT_DOCUMENT_OR_ELEMENT_NODE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0002_ELEMENT_MISSING_ATTRIBUTE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0003_BAD_ATTRIBUTE_VALUE;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0004_BAD_ELEMENT;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0005_BAD_CHILD_ELEMENT;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0006_NO_ELEMENT_CHILD;
+
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZJSE0007_NO_TEXT_CHILD;
+
 } // namespace zerr
 
+namespace jerr {
+
+#if defined(ZORBA_WITH_JSON)
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0001;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0002;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0003;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0020;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0040;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSDY0041;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0060;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0061;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSTY0001;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JSTY0002;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0062;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0063;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0064;
+
+extern ZORBA_DLL_PUBLIC JSONiqErrorCode JUDY0065;
+#endif
+
+} // namespace jerr
+
 namespace zwarn {
 
 extern ZORBA_DLL_PUBLIC ZorbaWarningCode ZWST0002_UNKNOWN_ANNOTATION;

=== modified file 'include/zorba/store_consts.h'
--- include/zorba/store_consts.h	2011-06-14 17:26:33 +0000
+++ include/zorba/store_consts.h	2012-02-08 21:22:19 +0000
@@ -25,6 +25,13 @@
 {
  public:
 
+  enum NsScoping 
+  {
+    ALL_NAMESPACES,
+    ONLY_LOCAL_NAMESPACES,
+    ONLY_PARENT_NAMESPACES
+  };
+
   enum NodeKind
   {
     anyNode        = 0,
@@ -36,16 +43,10 @@
     commentNode    = 6
   };
 
-  enum NsScoping 
-  {
-    ALL_NAMESPACES,
-    ONLY_LOCAL_NAMESPACES,
-    ONLY_PARENT_NAMESPACES
-  };
-
   static std::string toString(NodeKind k)
   {
-    switch(k) {
+    switch(k) 
+    {
       case anyNode:
         return "anyNode";
 
@@ -71,6 +72,39 @@
         return "<unknown NodeKind>";
     }
   }
+
+
+  /* ATTENTION: the ordering of the enum values is important. Do NOT change it! */
+  enum JSONItemKind
+  {
+    jsonItem       = 0,
+    jsonObject     = 1,
+    jsonArray      = 2,
+    jsonPair       = 3
+  };
+
+
+  static std::string toString(JSONItemKind k)
+  {
+    switch(k) 
+    {
+      case jsonItem:
+        return "json-item";
+
+      case jsonObject:
+        return "object";
+
+      case jsonArray:
+        return "array";
+
+      case jsonPair:
+        return "pair";
+
+      default:
+        return "<unknown JSONItemKind>";
+    }
+  }
+ 
 };
 
 } // namespace store

=== modified file 'include/zorba/typeident.h'
--- include/zorba/typeident.h	2011-06-14 17:26:33 +0000
+++ include/zorba/typeident.h	2012-02-08 21:22:19 +0000
@@ -64,45 +64,55 @@
         const String& localNameName,
         bool localNameWildcard,
         TypeIdentifier_t contentType,
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
+        IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
 
     static
     TypeIdentifier_t
     createDocumentType(
         TypeIdentifier_t contentType,
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
-
-    static
-    TypeIdentifier_t
-    createPIType(
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
-
-    static
-    TypeIdentifier_t
-    createTextType(
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
-
-    static
-    TypeIdentifier_t
-    createCommentType(
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
-
-    static
-    TypeIdentifier_t
-    createAnyNodeType(
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
-
-    static
-    TypeIdentifier_t
-    createItemType(
-        IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE
-        );
+        IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createPIType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createTextType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createCommentType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createAnyNodeType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+#ifdef ZORBA_WITH_JSON
+    static
+    TypeIdentifier_t
+    createStructuredItemType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createJSONItemType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createJSONObjectType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createJSONArrayType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+
+    static
+    TypeIdentifier_t
+    createJSONPairType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
+#endif
+
+    static
+    TypeIdentifier_t
+    createItemType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
 
     static
     TypeIdentifier_t

=== modified file 'modules/ExternalModules.conf'
--- modules/ExternalModules.conf	2012-02-08 05:52:51 +0000
+++ modules/ExternalModules.conf	2012-02-08 21:22:19 +0000
@@ -27,7 +27,7 @@
 #       currently only works for bzr, since svn tags are just different URLS)
 
 data-cleaning   bzr  lp:zorba/data-cleaning-module       zorba-2.1
-data-converters bzr  lp:zorba/data-converters-module     zorba-2.1
+data-converters bzr  lp:zorba/data-converters-module
 data-formatting bzr  lp:zorba/data-formatting-module     zorba-2.1
 email           bzr  lp:zorba/email-module               zorba-2.1
 excel           bzr  lp:zorba/excel-module               zorba-2.1

=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-02-05 12:31:20 +0000
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-02-08 21:22:19 +0000
@@ -103,6 +103,11 @@
 DECLARE_ZORBA_MODULE(FILE store/static/integrity_constraints/dml.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/store/static/integrity_constraints/dml")
 
+DECLARE_ZORBA_MODULE(FILE store/jsoniq/dynamic/collections/ddl.xq VERSION 1.0
+  URI "http://www.zorba-xquery.com/modules/store/jsoniq/dynamic/collections/ddl")
+DECLARE_ZORBA_MODULE(FILE store/jsoniq/dynamic/collections/dml.xq VERSION 1.0
+  URI "http://www.zorba-xquery.com/modules/store/jsoniq/dynamic/collections/dml")
+
 # debugger client DBGP message handler module
 IF (ZORBA_WITH_DEBUGGER)
   DECLARE_ZORBA_MODULE (FILE debugger/dbgp-message-handler.xq VERSION 1.0

=== added file 'modules/com/zorba-xquery/www/modules/converters/json-options.xsd'
--- modules/com/zorba-xquery/www/modules/converters/json-options.xsd	1970-01-01 00:00:00 +0000
+++ modules/com/zorba-xquery/www/modules/converters/json-options.xsd	2012-02-08 21:22:19 +0000
@@ -0,0 +1,47 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:json="http://www.zorba-xquery.com/modules/converters/json-options"
+  targetNamespace="http://www.zorba-xquery.com/modules/converters/json-options"
+  elementFormDefault="qualified" attributeFormDefault="unqualified">
+<!--
+:: Copyright 2006-2008 The FLWOR Foundation.
+::
+:: Licensed under the Apache License, Version 2.0 (the "License");
+:: you may not use this file except in compliance with the License.
+:: You may obtain a copy of the License at
+::
+:: http://www.apache.org/licenses/LICENSE-2.0
+::
+:: Unless required by applicable law or agreed to in writing, software
+:: distributed under the License is distributed on an "AS IS" BASIS,
+:: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+:: See the License for the specific language governing permissions and
+:: limitations under the License.
+::
+-->
+
+
+  <xs:element name="options">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="json-param" minOccurs="1" maxOccurs="1">
+          <xs:complexType>
+            <xs:simpleContent>
+              <xs:extension base="xs:string">
+                <xs:attribute name="name" type="xs:string" use="required"/>
+                <xs:attribute name="value" use="required">
+                  <xs:simpleType>
+                    <xs:restriction base="xs:string">
+                      <xs:enumeration value="simple-json"/>
+                      <xs:enumeration value="json-ml"/>
+                    </xs:restriction>
+                  </xs:simpleType>
+                </xs:attribute>
+              <xs:attribute name="type" type="xs:string" use="optional"/>
+              </xs:extension>
+            </xs:simpleContent>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

=== added file 'modules/com/zorba-xquery/www/modules/converters/json.xq'
--- modules/com/zorba-xquery/www/modules/converters/json.xq	1970-01-01 00:00:00 +0000
+++ modules/com/zorba-xquery/www/modules/converters/json.xq	2012-02-08 21:22:19 +0000
@@ -0,0 +1,231 @@
+xquery version "3.0";
+
+ (:
+  : Copyright 2006-2009 The FLWOR Foundation.
+  :
+  : Licensed under the Apache License, Version 2.0 (the "License");
+  : you may not use this file except in compliance with the License.
+  : You may obtain a copy of the License at
+  :
+  : http://www.apache.org/licenses/LICENSE-2.0
+  :
+  : Unless required by applicable law or agreed to in writing, software
+  : distributed under the License is distributed on an "AS IS" BASIS,
+  : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  : See the License for the specific language governing permissions and
+  : limitations under the License.
+  :)
+
+ (:~
+  :
+  : <p>In order to enable JSON processing with XQuery, Zorba implements a set
+  : of functions that open XQuery developers the door to process JSON
+  : data. Specifically, this module provides two types of functions. Functions
+  : to:
+  : <ul>
+  :   <li>parse JSON and convert it to XDM and</li>
+  :   <li>serialize XDM in order to output JSON.</li>
+  : </ul>
+  : </p>
+  :
+  : <p>Both types of functions are available to parse and serialize two
+  : types of XDM-JSON mappings:<ul><li>the first mapping called in this document 
+  : <strong>simple XDM-JSON</strong> has been
+  : <a href="http://john.snelson.org.uk/parsing-json-into-xquery">
+  : proposed by John Snelson</a></li><li>the second mapping is called 
+  : <a href="http://jsonml.org/">JsonML</a></li></ul>In the following, we
+  : briefly describe both mappings.</p>
+  : 
+  : <h2>Simple XDM-JSON Mapping</h2>
+  : <ul><li>In order to process JSON with XQuery, Zorba implements a mapping between
+  : JSON and XML that was initially proposed by John Snelson in his article
+  : <a href="http://snelson.org.uk/archives/2008/02/parsing_json_in.php#more"
+  : target="_blank">Parsing JSON into XQuery</a></li></ul>
+  :
+  : <h2>JsonML Mapping</h2>
+  : <ul>
+  : <li><a href="http://jsonml.org" target="_blank">JSonML</a> (JSON Markup Language)
+  : is an application of the JSON format.</li>
+  : <li>The purpose of JSonML is to provide a compact format for transporting
+  : XML-based markup as JSon. In contrast to the <strong>simple XDM-JSON</strong> mapping described above
+  : <strong>JsonML</strong> allows a lossless conversion back and forth.</li></ul>
+  :
+  : @author Sorin Nasoi
+  :
+  : @see <a href="http://john.snelson.org.uk/parsing-json-into-xquery">Mapping proposed by John Snelson</a>
+  : @see <a href="http://jsonml.org" target="_blank">JSonML</a>
+  : @project data processing/data converters
+  :
+  :)
+module namespace json = "http://www.zorba-xquery.com/modules/converters/json";
+
+import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
+
+import schema namespace json-options = "http://www.zorba-xquery.com/modules/converters/json-options";
+
+declare namespace err = "http://www.w3.org/2005/xqt-errors";
+
+declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+declare option ver:module-version "2.0";
+
+(:~
+ : This function parses a JSON string and returns an XDM instance according
+ : to either one of the mappings described above.
+ :
+ : @param $arg a sequence of valid JSON strings.
+ : @param $options a set of name and value pairs that provide options
+ :        to configure the JSON mapping process that have to be validated against the 
+ :        "http://www.zorba-xquery.com/modules/converters/json-options" schema.
+ : @return  a sequence of nodes according to either one of the mappings described above.
+ : @error err:XQDY0027 if $options can not be validated against the json-options schema
+ : @error json:ParseError if the JSON string passed as parameter is not
+ :    valid JSON.
+ : @example test_json/Queries/converters/jansson/parse_json_02.xq
+ : @example test_json/Queries/converters/jansson/parse_json_ml_01.xq
+ :)
+declare function json:parse(
+  $arg as xs:string?,
+  $options as element(json-options:options)
+) as element(*, xs:untyped)*
+{
+  let $validated-options := if(schema:is-validated($options)) then
+                                $options
+                              else
+                                validate{$options} 
+  return
+    json:parse-internal($arg, $validated-options)
+};
+
+(:~
+ : This function parses a JSON string and returns an XDM instance according
+ : to simple XDM-JSON mapping described above.
+ :
+ : @param $arg a sequence of valid JSON strings.
+ : @return a sequence of nodes according to Simple XDM-JSON mapping described above.
+ : @error json:ParseError if the JSON string passed as parameter is not
+ :    valid JSON.
+ : @example test_json/Queries/converters/jansson/parse_json_11.xq
+ :)
+declare function json:parse(
+  $arg as xs:string?
+) as element(*, xs:untyped)*
+{
+  json:parse-internal($arg,
+    validate {
+      <options xmlns="http://www.zorba-xquery.com/modules/converters/json-options" >
+        <json-param name="mapping" value="simple-json" />
+      </options>
+    }
+  )
+};
+
+(:~
+ : This function parses a JSON string and returns an XDM instance according
+ : to JsonML mapping described above.
+ :
+ : @param $arg a sequence of valid JSON strings.
+ : @return  a sequence of nodes according the JSON-ML mapping described above.
+ : @error json:ParseError if the JSON string passed as parameter is not
+ :    valid JSON.
+ : @example test_json/Queries/converters/jansson/parse_json_ml_05.xq
+ :)
+declare function json:parse-ml(
+  $arg as xs:string?
+) as element(*, xs:untyped)*
+{
+  json:parse-internal($arg,
+    validate {
+      <options xmlns="http://www.zorba-xquery.com/modules/converters/json-options" >
+        <json-param name="mapping" value="json-ml" type="array"/>
+      </options>
+    }
+  )
+};
+
+declare %private function json:parse-internal(
+  $html as xs:string,
+  $options as item()?
+) as element()* external;
+
+
+(:~
+ : The serialize function takes a sequence of nodes as parameter and
+ : transforms each element into a valid JSON string according to one of the
+ : mappings described above.
+ :
+ : @param $xml a sequence of nodes.
+ : @param $options a set of name and value pairs that provide options
+ :        to configure the JSON mapping process that have to be validated against the 
+ :        "http://www.zorba-xquery.com/modules/converters/json-options" schema.
+ : @return a JSON string.
+ : @error err:XQDY0027 if $options can not be validated against the json-options schema
+ : @error json:InvalidXDM if the input $xml is not a valid XDM
+ :  representation of JSON or JSON ML.
+ : @example test_json/Queries/converters/jansson/serialize_json_01.xq
+ : @example test_json/Queries/converters/jansson/serialize_json_ml_01.xq
+ :)
+declare function json:serialize(
+  $xml as item()*, 
+  $options as element(json-options:options) 
+) as xs:string
+{
+  let $validated-options := if(schema:is-validated($options)) then
+                              $options
+                            else
+                              validate{$options} 
+  return
+    json:serialize-internal($xml, $validated-options)
+};
+
+(:~
+ : The serialize function takes a sequence of nodes as parameter and
+ : transforms each element into a valid JSON string according to the
+ : Simple XDM-JSON mapping described above
+ :
+ : @param $xml a sequence of nodes.
+ : @return a JSON string.
+ : @error json:InvalidXDM if the input $xml is not a valid XDM
+ :  representation of JSON or JSON ML.
+ : @example test_json/Queries/converters/jansson/serialize_json_18.xq
+ :)
+declare function json:serialize(
+  $xml as item()* 
+) as xs:string
+{
+  json:serialize-internal($xml,
+    validate {
+      <options xmlns="http://www.zorba-xquery.com/modules/converters/json-options" >
+        <json-param name="mapping" value="simple-json" />
+      </options>
+   }
+ )
+};
+
+(:~
+ : The serialize function takes a sequence of nodes as parameter and
+ : transforms each element into a valid JSON string according to the
+ : JsonML mapping described above.
+ :
+ : @param $xml a sequence of nodes.
+ : @return a JSON string.
+ : @error json:InvalidXDM if the input $xml is not a valid XDM
+ :  representation of JSON or JSON ML.
+ : @example test_json/Queries/converters/jansson/serialize_json_ml_04.xq
+ :)
+declare function json:serialize-ml(
+  $xml as item()* 
+) as xs:string
+{
+  json:serialize-internal($xml,
+    validate {
+      <options xmlns="http://www.zorba-xquery.com/modules/converters/json-options" >
+       <json-param name="mapping" value="json-ml" type="array"/>
+      </options>
+   }
+ )
+};
+
+declare %private function json:serialize-internal(
+  $xml as item()*,
+  $options as item()?
+  ) as xs:string external;

=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2011-12-21 14:40:33 +0000
+++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq	2012-02-08 21:22:19 +0000
@@ -309,6 +309,18 @@
 
 (:~
 :)
+declare variable $zerr:ZAPI0043 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0043");
+
+(:~
+:)
+declare variable $zerr:ZAPI0044 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0044");
+
+(:~
+:)
+declare variable $zerr:ZAPI0045 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0045");
+
+(:~
+:)
 declare variable $zerr:ZAPI0070 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0070");
 
 (:~
@@ -704,6 +716,10 @@
 
 (:~
 :)
+declare variable $zerr:ZSTR0013 as xs:QName := fn:QName($zerr:NS, "zerr:ZSTR0013");
+
+(:~
+:)
 declare variable $zerr:ZSTR0015 as xs:QName := fn:QName($zerr:NS, "zerr:ZSTR0015");
 
 (:~
@@ -784,4 +800,60 @@
 
 (:~
 :)
-declare variable $zerr:XSST0010 as xs:QName := fn:QName($zerr:NS, "zerr:XSST0010");
\ No newline at end of file
+declare variable $zerr:XSST0010 as xs:QName := fn:QName($zerr:NS, "zerr:XSST0010");
+
+(:~
+:)
+declare variable $zerr:ZJPE0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0001");
+
+(:~
+:)
+declare variable $zerr:ZJPE0002 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0002");
+
+(:~
+:)
+declare variable $zerr:ZJPE0003 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0003");
+
+(:~
+:)
+declare variable $zerr:ZJPE0004 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0004");
+
+(:~
+:)
+declare variable $zerr:ZJPE0005 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0005");
+
+(:~
+:)
+declare variable $zerr:ZJPE0006 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0006");
+
+(:~
+:)
+declare variable $zerr:ZJPE0007 as xs:QName := fn:QName($zerr:NS, "zerr:ZJPE0007");
+
+(:~
+:)
+declare variable $zerr:ZJSE0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0001");
+
+(:~
+:)
+declare variable $zerr:ZJSE0002 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0002");
+
+(:~
+:)
+declare variable $zerr:ZJSE0003 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0003");
+
+(:~
+:)
+declare variable $zerr:ZJSE0004 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0004");
+
+(:~
+:)
+declare variable $zerr:ZJSE0005 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0005");
+
+(:~
+:)
+declare variable $zerr:ZJSE0006 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0006");
+
+(:~
+:)
+declare variable $zerr:ZJSE0007 as xs:QName := fn:QName($zerr:NS, "zerr:ZJSE0007");
\ No newline at end of file

=== added directory 'modules/com/zorba-xquery/www/modules/store/jsoniq'
=== added directory 'modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic'
=== added directory 'modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections'
=== added file 'modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/ddl.xq'
--- modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/ddl.xq	1970-01-01 00:00:00 +0000
+++ modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/ddl.xq	2012-02-08 21:22:19 +0000
@@ -0,0 +1,122 @@
+xquery version "3.0";
+
+(:
+ : Copyright 2006-2009 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the "License");
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an "AS IS" BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+:)
+
+(:~
+ : This modules defines a set of functions for managing persistent, ordered, and
+ : updatable collections that can contain both XML nodes and JSON objects and arrays.
+ :
+ : <p>Please refer to our documentation for <a href="../../html/data_lifecycle.html">
+ : more information</a> about the lifecycle management and the manipulation of such
+ : collections.</p>
+ :
+ : @see <a href="../../html/data_lifecycle.html">Data Lifecycle</a>
+ : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/dml
+ : @see <a href="www.zorba-xquery.com_errors.html">http://www.zorba-xquery.com/errors</a>
+ :
+ : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
+ :
+ : @project store/jsoniq/collections/dynamic
+ :
+ :)
+module namespace ddl = "http://www.zorba-xquery.com/modules/store/jsoniq/dynamic/collections/ddl";
+
+declare namespace zerr = "http://www.zorba-xquery.com/errors";
+declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+
+declare option ver:module-version "1.0";
+declare option ver:zorba-version "2.1";
+
+(:~
+ : The function returns true if a collection with the given QName is available.
+ :
+ : @param $name The QName of the collection that is being checked.
+ :
+ : @return true if the collection is available and false otherwise.
+ :
+ :)
+declare function ddl:is-available-collection($name as xs:QName) as xs:boolean external;
+
+
+(:~
+ : The function returns a sequence of QNames of the collections that are
+ : available. The sequence will be empty if there are no collections.
+ :
+ : @return A sequence of QNames, one for each available collection, or an emtpy sequence.
+ :
+ :)
+declare function ddl:available-collections() as xs:QName* external;
+
+
+(:~
+ : The create function is an updating function which creates
+ : the collection with the given expanded QName.
+ :
+ : @param $name The QName of the collection to create.
+ :
+ : @return The result of the function is an empty XDM instance and a 
+ :         pending update list which, once applied, creates a collection
+ :         with the given name.
+ :
+ : @error zerr:ZDDY0002 if a collection with the given expanded QName already
+ :        exists.
+ :
+ :)
+declare updating function ddl:create($name as xs:QName) external;
+
+
+(:~
+ : The create function is an updating function which creates
+ : the collection with the given expanded QName. Moreover, it adds copies
+ : of the sequence $content to the new collection.
+ :
+ : @param $name The QName of the collection to create.
+ : @param $content The sequence of items that should be added to the new collection.
+ :                 The sequence may contain any mix of XML nodes, JSON objects, or
+ :                 JSON arrays.
+ : @return The result of the function is an empty XDM instance and a 
+ :         pending update list which, once applied, creates a collection
+ :         with the given name and inserts the given nodes into it.
+ :
+ : @error zerr:ZDDY0002 if a collection with the given expanded QName already
+ :        exists.
+ :
+ : @see ddl:create
+ : @see ddl:insert-nodes-last
+ :
+ :)
+declare updating function ddl:create(
+    $name as xs:QName,
+    $content as structured-item()*) external;
+
+
+(:~
+ : The delete function is an updating function that removes
+ : the collection with the given expanded QName.
+ :
+ : @param $name The QName of the collection to delete.
+ :
+ : @return The result of the function is an empty XDM instance and a pending
+ :         update list which, once applied, deletes the collection with the given
+ :         name.
+ :
+ : @error zerr:ZDDY0003 if the collection with the given name does not exist.
+ : @error zerr:ZDDY0015 if any of the in-scope variables references a node that
+ :        belongs to the collection with QName $name.
+ :
+ :)
+declare updating function ddl:delete($coll as xs:QName) external;

=== added file 'modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/dml.xq'
--- modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/dml.xq	1970-01-01 00:00:00 +0000
+++ modules/com/zorba-xquery/www/modules/store/jsoniq/dynamic/collections/dml.xq	2012-02-08 21:22:19 +0000
@@ -0,0 +1,354 @@
+xquery version "3.0";
+
+(:
+ : Copyright 2006-2009 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the "License");
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an "AS IS" BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+:)
+
+(:~
+ : This modules provides a set of functions to modify a collection and retrieve the
+ : items contained in a particular collection. Collections that are accessed by the
+ : functions of this module may contain any mix of XML nodes, JSON objects, or
+ : JSON arrays. The term "structured item" is used in this module to refer to an
+ : XML node, JSON object, or JSON array.
+ :
+ : <p>Please refer to our documentation for <a href="../../html/data_lifecycle.html">
+ : more information</a> about the lifecycle management and the manipulation of such
+ : collections.</p>
+ : 
+ : @see <a href="../../html/data_lifecycle.html">Data Lifecycle</a>
+ : @see http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl
+ : @see <a href="www.zorba-xquery.com_errors.html">http://www.zorba-xquery.com/errors</a>
+ :
+ : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
+ :
+ : @project store/jsoniq/collections/dynamic
+ :)
+module namespace dml = "http://www.zorba-xquery.com/modules/store/jsoniq/dynamic/collections/dml";
+
+declare namespace zerr = "http://www.zorba-xquery.com/errors";
+declare namespace ann = "http://www.zorba-xquery.com/annotations";
+
+declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+
+declare option ver:module-version "1.0";
+declare option ver:zorba-version "2.1";
+
+(:~
+ : The insert-nodes-first function is an updating function that inserts copies of the
+ : given structured items at the beginning of the collection.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is an empty XDM instance and a pending update
+ :         list which, once applied, inserts the items into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ :)
+declare updating function dml:insert-nodes-first(
+  $name as xs:QName,
+  $content as structured-item()*) external;
+
+(:~
+ : The insert-nodes-last function is an updating function that inserts copies of the
+ : given structured items at the end of the collection.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is an empty XDM instance and a pending update list
+ :         which, once applied, inserts the items into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ :)
+declare updating function dml:insert-nodes-last(
+  $name as xs:QName,
+  $content as structured-item()*) external;
+
+
+(:~
+ : The insert-nodes-before function is an updating function that inserts copies
+ : of the given structured items into a collection at the position directly 
+ : preceding the given target item.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $target The item in the collection before which the $content
+ :        sequence should be inserted.
+ : @param $content The sequences of structured items whose copies should be 
+ :        added to the collection.
+ :
+ : @return The result of the function is an empty XDM instance and a pending update list
+ :         which, once applied, inserts the items into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ : @error zerr:ZDDY0011 if the target item is not contained in the collection.
+ :
+ :)
+declare updating function dml:insert-nodes-before(
+  $name as xs:QName,
+  $target as structured-item(),
+  $content as structured-item()*) external;
+
+
+(:~
+ : The insert-nodes-after function is an updating function that inserts copies
+ : of the given structured items into a collection at the position directly 
+ : following the given target item.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $target The structured item in the collection after which the $content
+ :        sequence should be inserted.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is an empty XDM instance and a pending update list
+ :         which, once applied, inserts the items into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ : @error zerr:ZDDY0011 if the target item is not contained in the collection.
+ :
+ :)
+declare updating function dml:insert-nodes-after(
+  $name as xs:QName,
+  $pos as structured-item(),
+  $content as structured-item()*) external;
+
+
+(:~
+ : This function does the same as the insert-nodes function except
+ : it immediately applies the resulting pending updates and returns the
+ : structured items that have been inserted.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is the sequence of items that have been
+ :         inserted into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ : @see dml:insert-nodes-first
+ :
+ :)
+declare %ann:sequential function dml:apply-insert-nodes-first(
+  $name as xs:QName,
+  $content as structured-item()*) as structured-item()* external;
+
+
+(:~
+ : This function does the same as the insert-nodes-last function except
+ : it immediately applies the resulting pending updates and returns the
+ : structured items that have been inserted.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is the sequence of items that have been
+ :         inserted into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ : @see dml:insert-nodes-last
+ :
+ :)
+declare %ann:sequential function dml:apply-insert-nodes-last(
+  $name as xs:QName,
+  $content as structured-item()*) as structured-item()* external;
+
+
+(:~
+ : This function does the same as the insert-nodes-before function except
+ : it immediately applies the resulting pending updates and returns the
+ : structured items that have been inserted.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $target The structured item in the collection before which the $content
+ :        sequence should be inserted.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is the sequence of items that have been
+ :         inserted into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ : @see dml:insert-nodes-before
+ :
+ :)
+declare %ann:sequential function dml:apply-insert-nodes-before(
+  $name as xs:QName,
+  $target as structured-item(),
+  $content as structured-item()*) as structured-item()* external;
+
+
+(:~
+ : This function does the same as the insert-nodes-after function except
+ : it immediately applies the resulting pending updates and returns the
+ : structured items that have been inserted.
+ :
+ : @param $name The name of the collection to which the items should be added.
+ : @param $target The structured item in the collection after which the $content
+ :        sequence should be inserted.
+ : @param $content The sequences of structured items whose copies should be added
+ :        to the collection.
+ :
+ : @return The result of the function is the sequence of items that have been
+ :         inserted into the collection.
+ :
+ : @error zerr:ZDDY0003 if the collection identified by $name is not available.
+ :
+ : @see dml:insert-nodes-after
+ :
+ :)
+declare %ann:sequential function dml:apply-insert-nodes-after(
+  $name as xs:QName,
+  $pos as structured-item(),
+  $content as structured-item()*) as structured-item()* external;
+
+
+(:~
+ : The delete-nodes function is an updating function that deletes zero of more
+ : structured items from a collection. 
+ :
+ : @param $target the structured items in the collection that should be deleted.
+ :
+ : @return The result of this function is an empty XDM instance and a pending update
+ :         list which, once applied, deletes the items from their collections.
+ :
+ : @error zerr:ZDDY0011 if any items in the $target sequence is not a member of
+ :        a collection or not all items of the $target sequence belong to the 
+ :        same collection.
+ :)
+declare updating function dml:delete-nodes($target as structured-item()*) external;
+
+
+(:~
+ : The delete-node-first function is an updating function that deletes the
+ : first item from a collection.
+ :
+ : @param $name The name of the collection from which the first item should be deleted.
+ :
+ : @return The result of this function is an empty XDM instance and a pending update
+ :         list which, once applied, deletes the first item from the collection.
+ :
+ : @error zerr:ZDDY0011 if the collection doesn't contain any item.
+ :
+ :)
+declare updating function dml:delete-node-first($name as xs:QName) external;
+
+
+(:~
+ : The delete-nodes-first function is an updating function that deletes the
+ : first n items from a collection.
+ :
+ : @param $name The name of the collection from which the first items should be deleted.
+ : @param $number The number of items that should be removed from the beginning of
+ :        the collection.
+ :
+ : @return The result of this function is an empty XDM instance and a pending update
+ :         list which, once applied, deletes the items from the collection.
+ :
+ : @error zerr:ZDDY0011 if the collection doesn't contain the given number of items.
+ :
+ :)
+declare updating function dml:delete-nodes-first(
+  $name as xs:QName,
+  $number as xs:integer) external;
+
+
+(:~
+ : The delete-node-last function is an updating function that deletes the
+ : last item from a collection.
+ :
+ : @param $name The name of the collection from which the last item should be deleted.
+ :
+ : @return The result of this function is an empty XDM instance and a pending update
+ :         list which, once applied, deletes the last item from the collection.
+ :
+ : @error zerr:ZDDY0009 If available collections does not provide a mapping
+ :        for the expanded QName $name.
+ : @error zerr:ZDDY0011 if the collection doesn't contain any item.
+ :
+ :)
+declare updating function dml:delete-node-last($name as xs:QName) external;
+
+
+(:~
+ : The delete-nodes-last function is an updating function that deletes the
+ : last n items from an ordered collection.
+ :
+ : @param $name The name of the collection from which the last items should be deleted.
+ : @param $number The number of items to delete.
+ :
+ : @return The result of this function is an empty XDM instance and a pending update
+ :         list which, once applied, deletes the last n items.
+ :
+ : @error zerr:ZDDY0009 If available collections does not provide a mapping
+ :        for the expanded QName $name.
+ : @error zerr:ZDDY0011 if the collection doesn't contain the given number of items.
+ :
+ :)
+declare updating function dml:delete-nodes-last(
+  $name as xs:QName,
+  $number as xs:integer) external;
+
+
+(:~
+ : The index-of function returns the index of the given structured item in 
+ : the collection.
+ :
+ : @param $item The structured item to retrieve the index of.
+ :
+ : @return Returns the position as xs:integer of the given item in the collection.
+ :
+ : @error zerr:ZDDY0011 if item is not contained in any collection.
+ :
+ :)
+declare function dml:index-of($item as structured-item()) as xs:integer external;
+
+
+(:~
+ : The collection function returns the sequence of structured items of the 
+ : collection identified by the given name.
+ :
+ : @param $name The name of the collection.
+ :
+ : @return The sequence contained in the given collection.
+ :
+ : @error zerr:ZDDY0009 If available collections does not provide a mapping
+ :        for the expanded QName $name.
+ :
+ :)
+declare function dml:collection($name as xs:QName) as structured-item()* external;
+
+
+(:~
+ : This function returns the name of the collection the given structured item
+ : belongs to.
+ :
+ : @param $item The item for which to get the name of the collection
+ : @return The result of this function is a QName which identifies the collection
+ :         to which the given item belongs to.
+ :
+ : @error zerr:ZDDY0011 if the given item does not belong to a collection.
+ :
+ :)
+declare function dml:collection-name($item as structured-item()) as xs:QName external;

=== added directory 'modules/com/zorba-xquery/www/modules/store/jsoniq/static'
=== modified file 'modules/org/CMakeLists.txt'
--- modules/org/CMakeLists.txt	2011-01-19 14:45:10 +0000
+++ modules/org/CMakeLists.txt	2012-02-08 21:22:19 +0000
@@ -12,3 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ADD_SUBDIRECTORY(expath)
+ADD_SUBDIRECTORY(jsoniq)
+

=== added directory 'modules/org/jsoniq'
=== added file 'modules/org/jsoniq/CMakeLists.txt'
--- modules/org/jsoniq/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/org/jsoniq/CMakeLists.txt	2012-02-08 21:22:19 +0000
@@ -0,0 +1,15 @@
+# Copyright 2011 The FLWOR Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ADD_SUBDIRECTORY(www)

=== added directory 'modules/org/jsoniq/www'
=== added file 'modules/org/jsoniq/www/CMakeLists.txt'
--- modules/org/jsoniq/www/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ modules/org/jsoniq/www/CMakeLists.txt	2012-02-08 21:22:19 +0000
@@ -0,0 +1,21 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+# http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+IF(ZORBA_WITH_JSON)
+  DECLARE_ZORBA_MODULE(FILE functions.xq VERSION 1.0
+    URI "http://www.jsoniq.org/functions")
+  DECLARE_ZORBA_MODULE (FILE pregenerated/errors.xq
+    URI "http://www.jsoniq.org/errors")
+ENDIF(ZORBA_WITH_JSON)
+

=== added file 'modules/org/jsoniq/www/functions.xq'
--- modules/org/jsoniq/www/functions.xq	1970-01-01 00:00:00 +0000
+++ modules/org/jsoniq/www/functions.xq	2012-02-08 21:22:19 +0000
@@ -0,0 +1,389 @@
+(:~
+ : This module provides the functions defined by the JSONiq specification,
+ : sections 1.7 (Functions) and 1.10 (Update Primitives). JSONiq extends
+ : the XQuery specification to also deal with JSON data natively. See
+ :
+ :     http://www.jsoniq.org/
+ :
+ : for details.
+ :
+ : This module depends on having the JSONiq feature enabled in Zorba,
+ : ie, Zorba must be compiled with ZORBA_WITH_JSON.
+ :)
+module namespace j = "http://www.jsoniq.org/functions";
+
+import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
+
+declare namespace jdm = "http://www.jsoniq.org/";
+
+declare namespace err = "http://www.w3.org/2005/xqt-errors";
+
+declare namespace ver = "http://www.zorba-xquery.com/options/versioning";
+declare option ver:module-version "1.0";
+
+(:~
+ : Recursively "flatten" a JSON Array, by replacing any arrays with their
+ : members. Equivalent to
+ :
+ :   define function j:flatten($arg as array()) {
+ :     for $value in j:values($arg)
+ :     return
+ :       if ($value instance of array())
+ :       then j:flatten($value)
+ :       else $value
+ :   };
+ :
+ : @param $a A JSON Array.
+ : @return The flattened version of $a.
+ :)
+declare function j:flatten($a as array()) as item()* external;
+
+(:~
+ : This function has the same semantics as fn:parse-xml(), except that
+ : it parses the string as JSON (not XML), and returns an Object or
+ : Array rather than an XML document.
+ :
+ : @param $j A string containing a valid JSON text.
+ : @return a JSON Object or Array item.
+ :)
+declare function j:parse-json($j as xs:string) as json-item()? external;
+
+(:~
+ : Returns the names used in the Pairs of the object. This function is
+ : equivalent to
+ :
+ :    for $p in j:pairs($arg) return j:name($p)
+ :
+ : The names will be returned in an implementation-defined order
+ :
+ : @param $o A JSON Object.
+ : @return The names of pairs in the object.
+ :)
+declare function j:names($o as object()) as xs:string* external;
+
+(:~
+ : Returns the name of the Pair.
+ :
+ : @param $p A JSON Pair.
+ : @return The name of the Pair.
+ :)
+declare function j:name($p as pair()) as xs:string external;
+
+(:~
+ : Returns the Pairs of the Object. The pairs will be returned in an
+ : implementation-defined order.
+ :
+ : @param $o A JSON Object.
+ : @return A sequence of JSON Pair items.
+ :)
+declare function j:pairs($o as object()) as pair()* external;
+
+(:~
+ : Returns the Pair of an Object with the specified name. If no such
+ : Pair exists in the Object, returns the empty sequence.
+ :
+ : @param $o A JSON Object.
+ : @param $n A name.
+ : @return The Pair with the given name, or empty sequence.
+ :)
+declare function j:pair($o as object(), $n as xs:string) as pair()? external;
+
+(:~
+ : Returns the member of an Array at the specified position (starting from 1).
+ : If the position is out of bounds of the array, returns the empty sequence.
+ :
+ : @param $a A JSON Array.
+ : @param $p The position in the array.
+ : @return The member at the specified position, or empty sequence.
+ :)
+declare function j:member($o as array(), $p as xs:integer) as item()? external;
+
+(:~
+ : Returns the size of a JSON Object or JSON Array. The size of an Object
+ : is the number of Pairs contained within it; the size of an Array is
+ : the number of members contained within it.
+ :
+ : @param $j A JSON Object or JSON Array.
+ : @return The number of items in $j.
+ : @error j:JUDY0060 if $j is a JSON Pair.
+ :)
+declare function j:size($j as json-item()) as xs:integer external;
+
+(:~
+ : Returns all Pairs in an Object, or all members of an Array. When
+ : passed an Object, the Pairs will be returned in an implementation-
+ : defined order.
+ :
+ : @param $j A JSON Object or JSON Array.
+ : @return All Pairs/members of $j.
+ : @error j:JUDY0060 if $j is a JSON Pair.
+ :)
+declare function j:values($j as json-item()) as item()* external;
+
+(:~
+ : Returns the value of a JSON Pair.
+ :
+ : @param $p A JSON Pair.
+ : @return the value of $p.
+ :)
+declare function j:value($p as pair()) as item() external;
+
+(:~
+ : Returns the jdm:null value null.
+ :
+ : @return the said value
+ :)
+declare function j:null() as jdm:null external;
+
+(:~
+ : Insert one or more pairs into an object. Recall that a JSON Object
+ : may not contain two pairs with the same name. This function will not
+ : replace a pair in an object.
+ :
+ : @param $o A JSON Object.
+ : @param $p A sequence of Pairs to insert.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, inserts the pairs into the object.
+ : @error j:JUDY0060 if pair with the given name already exists.
+ :)
+declare updating function j:insert-into(
+  $o as object(),
+  $p as pair()*) external;
+
+(:~
+ : Insert one or more items into a JSON Array. The items will be inserted
+ : at the beginning of the array.
+ :
+ : @param $a A JSON Array.
+ : @param $i A sequence of items to insert.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, inserts the items into the array.
+ :)
+declare updating function j:insert-as-first(
+  $a as array(),
+  $i as item()*) external;
+
+(:~
+ : Insert one or more items into a JSON Array. The items will be inserted
+ : after the specified position in the array.
+ :
+ : The position must exist in the array. You cannot specify an position of 0
+ : to insert at the beginning of the array (use j:insert-as-first($a, ...) or
+ : j:insert-before($a, 1, ...)).
+ :
+ : @param $a A JSON Array.
+ : @param $pos The position.
+ : @param $i A sequence of items to insert.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, inserts the items into the array.
+ : @error j:JUDY0061 if the position doesn't select an existing array member
+ :)
+declare updating function j:insert-after(
+  $a as array(),
+  $pos as xs:integer,
+  $i as item()*) external;
+
+(:~
+ : Insert one or more items into a JSON Array. The items will be inserted
+ : before the specified position in the array.
+ :
+ : The position must exist in the array.
+ :
+ : @param $a A JSON Array.
+ : @param $pos The position.
+ : @param $i A sequence of items to insert.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, inserts the items into the array.
+ : @error j:JUDY0061 if the position doesn't select an existing array member
+ :)
+declare updating function j:insert-before(
+  $a as array(),
+  $pos as xs:integer,
+  $i as item()*) external;
+
+(:~
+ : Insert one or more items into a JSON Array. The items will be inserted
+ : at the end of the array.
+ :
+ : @param $a A JSON Array.
+ : @param $i A sequence of items to insert.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, inserts the items into the array.
+ :)
+declare updating function j:insert-as-last(
+  $a as array(),
+  $i as item()*) external;
+
+(:~
+ : Delete an item from a JSON Array or a Pair from a JSON Object.
+ : 
+ : If $j is an Object and $selector is an xs:string, deletes the Pair
+ : $i($selector) if it exists, raising an error if it does not exist.
+ :
+ : If $j is an Array and $selector is an xs:integer, deletes the member
+ : $i($selector) if it exists, raising an error if it does not exist.
+ :
+ : In any other case, a type error is raised.
+ : @param $j A JSON Array or JSON Object.
+ : @param $select An xs:string (if $j is an Object) or xs:integer
+ :   (if $j is an array).
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, deletes the item from the array or object.
+ : @error j:JUDY0061 if the selector doesn't select an existing pair or
+ :   array member
+ : @error j:JUDY0062 if the first argument is a pair
+ : @error j:JUDY0063 invalid type for second argument (must be xs:integer
+ :   if first argument is an array or xs:string if first argument is an object)
+ :)
+declare updating function j:delete(
+  $j as json-item(),
+  $selector as xs:anyAtomicType)
+{
+  try {
+    typeswitch ($j)
+    case $o as object()
+      return j:delete-pair($o, $selector treat as xs:string)
+    case $a as array()
+      return j:delete-member($a, $selector treat as xs:integer)
+    default return
+      fn:error(
+        fn:QName("http://www.jsoniq.org/errors", "JUDY0062"),
+        "first argument to delete function is pair() but must be array() or object()",
+        $j)
+   } catch err:XPDY0050 {
+     fn:error(
+       fn:QName("http://www.jsoniq.org/errors", "JUDY0063"),
+       concat(
+         schema:schema-type($selector),
+         ": invalid type for second argument; should be ",
+         typeswitch ($j)
+         case object() return "xs:string"
+         default return "xs:integer"
+       ),
+       $selector
+     )
+   }
+};
+
+(:~
+ : Delete a pair from a JSON Object by name.
+ :
+ : @param $o A JSON Object.
+ : @param $n The name of the Pair to delete.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, deletes the pair from the object.
+ : @error j:JUDY0061 if the key doesn't select an existing pair.
+ :)
+declare updating function j:delete-pair(
+  $o as object(),
+  $key as xs:string) external;
+
+(:~
+ : Delete an item from a JSON Array.
+ :
+ : @param $a A JSON Array.
+ : @param $pos The position in the array to delete.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, deletes the item from the array.
+ : @error j:JUDY0061 if the position doesn't select an existing member 
+ :)
+declare updating function j:delete-member(
+  $a as array(),
+  $pos as xs:integer) external;
+
+(:~
+ : Assigns a new name to a JSON Pair in an Object.
+ :
+ : @param $o A JSON Object.
+ : @param $old-name The current name of a Pair in the Object.
+ : @param $new-name The new name for the Pair.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, renames the pair.
+ : @error j:JUDY0061 if $old-name doesn't select an existing pair.
+ :)
+declare updating function j:rename(
+  $o as object(),
+  $old-name as xs:string,
+  $new-name as xs:string) external;
+
+(:~
+ : Replace an item in an Array, or the value of a Pair in an Object.
+ :
+ : If $j is an Object and $selector is an xs:string, replaces the value
+ : of the Pair $i($selector) if it exists, raising an error if it does
+ : not exist.
+ :
+ : If $j is an Array and $selector is an xs:integer, replaces the member
+ : $i($selector) if it exists, raising an error if it does not exist.
+ :
+ : In any other case, a type error is raised.
+ :
+ : @param $j A JSON Object or Array.
+ : @param $select An xs:string (if $j is an Object) or xs:integer
+ :   (if $j is an array).
+ : @param $new-val The new item to insert into the Object or Array in
+ :   place of the old value.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, replaces the selected item in the object or array.
+ : @error j:JUDY0061 if $selector is wrong. (QQQ needs testing)
+ :)
+declare updating function j:replace-value(
+  $j as json-item(),
+  $selector as xs:anyAtomicType,
+  $new-val as item()) 
+{
+  try {
+    typeswitch ($j)
+    case $o as object()
+      return j:replace-value-in-object($o, $selector treat as xs:string, $new-val)
+    case $a as array()
+      return j:replace-value-in-array($a, $selector treat as xs:integer, $new-val)
+    default return
+      fn:error(
+        fn:QName("http://www.jsoniq.org/errors", "JUDY0062"),
+        "first argument to replace-value function is pair() but must be array() or object()",
+        $j)
+   } catch err:XPDY0050 {
+     fn:error(
+       fn:QName("http://www.jsoniq.org/errors", "JUDY0063"),
+       concat(
+         schema:schema-type($selector),
+         ": invalid type for second argument; should be ",
+         typeswitch ($j)
+         case object() return "xs:string"
+         default return "xs:integer"
+       ),
+       $selector
+     )
+   }
+};
+
+(:~
+ : Replace the value of a Pair in an Object.
+ :
+ : @param $o A JSON Object.
+ : @param $n The name of a Pair in $o.
+ : @param $new-val The new value for the Pair.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, replaces the value of the selected pair in the object.
+ : @error j:JUDY0061 if the position doesn't select an existing member 
+ :)
+declare updating function j:replace-value-in-object(
+  $o as object(),
+  $n as xs:string,
+  $new-val as item()) external;
+
+(:~
+ : Replace an item in a JSON Array.
+ : @param $a A JSON Array.
+ : @param $pos The position in the array to replace.
+ : @param $new-valu The new item to put in the array in place of the
+ : existing item.
+ : @return An empty XDM instance and a pending update list which, once
+ :   applied, replaces the selected item in the array.
+ : @error j:JUDY0061 if the position doesn't select an existing member 
+ :)
+declare updating function j:replace-value-in-array(
+  $a as array(),
+  $pos as xs:integer,
+  $new-val as item()) external;

=== added directory 'modules/org/jsoniq/www/pregenerated'
=== added file 'modules/org/jsoniq/www/pregenerated/errors.xq'
--- modules/org/jsoniq/www/pregenerated/errors.xq	1970-01-01 00:00:00 +0000
+++ modules/org/jsoniq/www/pregenerated/errors.xq	2012-02-08 21:22:19 +0000
@@ -0,0 +1,109 @@
+(:
+ : Copyright 2006-2011 The FLWOR Foundation.
+ :
+ : Licensed under the Apache License, Version 2.0 (the "License");
+ : you may not use this file except in compliance with the License.
+ : You may obtain a copy of the License at
+ :
+ : http://www.apache.org/licenses/LICENSE-2.0
+ :
+ : Unless required by applicable law or agreed to in writing, software
+ : distributed under the License is distributed on an "AS IS" BASIS,
+ : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ : See the License for the specific language governing permissions and
+ : limitations under the License.
+ :)
+ 
+ (:
+  : THIS FILE IS GENERATED.
+  : PLEASE DO NOT EDIT.
+  :)
+ (:~
+ : This module contains one declaration of a variable for each
+ : error of the http://www.jsoniq.org/errors namespace.
+ : The variables serves as documentation for the errors but can also
+ : be used in the code. For example, one useful scenario is to compare
+ : an error caught in the catch clause of a try-catch expression with one of
+ : the variables.
+ :
+ : @author Carlos Lopez
+ :
+ : @project error
+ :)
+
+xquery version '1.0';
+
+module namespace jerr = 'http://www.jsoniq.org/errors';
+
+declare variable $jerr:NS := 'http://www.jsoniq.org/errors';
+
+(:~
+:)
+declare variable $jerr:JSDY0001 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0001");
+
+(:~
+:)
+declare variable $jerr:JSDY0002 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0002");
+
+(:~
+ :error raised by object constructor
+:)
+declare variable $jerr:JSDY0003 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0003");
+
+
+declare variable $jerr:JSDY0020 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0020");
+
+(:~
+ :parser errors raised by the JSONIQLoader
+:)
+declare variable $jerr:JSDY0040 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0040");
+
+(:~
+ :error raised by block expression
+:)
+declare variable $jerr:JSDY0041 as xs:QName := fn:QName($jerr:NS, "jerr:JSDY0041");
+
+(:~
+ :error raised by insert-into
+:)
+declare variable $jerr:JUDY0060 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0060");
+
+(:~
+ :error raised by upd:delete, upd:insert-before/after
+:)
+declare variable $jerr:JUDY0061 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0061");
+
+(:~
+ :objects or arrays don't have a typed value
+:)
+declare variable $jerr:JSTY0001 as xs:QName := fn:QName($jerr:NS, "jerr:JSTY0001");
+
+(:~
+ :objects or arrays don't have a string value
+:)
+declare variable $jerr:JSTY0002 as xs:QName := fn:QName($jerr:NS, "jerr:JSTY0002");
+
+(:~
+ :error raised by upd:delete if the argument is not an object or array
+:)
+declare variable $jerr:JUDY0062 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0062");
+
+(:~
+ :error raised by upd:delete if the first argument is an
+ : object/array but second argument is not of type xs:string/xs:integer,
+ : respectively
+ : 
+:)
+declare variable $jerr:JUDY0063 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0063");
+
+(:~
+ :error raised by mergeUpdates. An insert-before or insert-last
+ : UP must not have the same target as any other insert-before, -last, -as-first, or -as-last UP
+ : 
+:)
+declare variable $jerr:JUDY0064 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0064");
+
+(:~
+ :error raised by upd:rename
+:)
+declare variable $jerr:JUDY0065 as xs:QName := fn:QName($jerr:NS, "jerr:JUDY0065");
\ No newline at end of file

=== modified file 'src/annotations/annotations.h'
--- src/annotations/annotations.h	2012-01-11 17:30:25 +0000
+++ src/annotations/annotations.h	2012-02-08 21:22:19 +0000
@@ -22,7 +22,7 @@
 
 #include "common/shared_types.h"
 
-#include "compiler/parsetree/parsenodes.h"
+//#include "compiler/parsetree/parsenodes.h"
 
 #include "zorbautils/hashmap_itemh.h"
 

=== modified file 'src/api/collectionimpl.cpp'
--- src/api/collectionimpl.cpp	2011-11-02 06:14:25 +0000
+++ src/api/collectionimpl.cpp	2012-02-08 21:22:19 +0000
@@ -429,12 +429,17 @@
 
     store::Store* lStore = & GENV_STORE;
 
-    store::Collection_t lColl = lStore->getCollection(lQName);
-
-    if (!lColl)
-    {
-      lColl = lStore->getCollection(lQName, true);
-    }
+    store::Collection_t lColl = lStore->getCollection(lQName, false, false);
+
+    if (!lColl)
+      lColl = lStore->getCollection(lQName, true, false);
+
+    if (!lColl)
+      lColl = lStore->getCollection(lQName, false, true);
+
+    if (!lColl)
+      lColl = lStore->getCollection(lQName, true, true);
+
     // must exist because otherwise we wouldn't have an instance of this class
     ZORBA_ASSERT(lColl);
 

=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp	2012-01-11 17:30:25 +0000
+++ src/api/dynamiccontextimpl.cpp	2012-02-08 21:22:19 +0000
@@ -429,7 +429,8 @@
     TypeManager* tm = theStaticContext->get_typemanager();
 
     xqtref_t lItemType = tm->create_named_type(lItem->getType(),
-                                               TypeConstants::QUANT_ONE);
+                                               TypeConstants::QUANT_ONE,
+                                               QueryLoc::null);
 
     if (!TypeOps::is_subtype(tm,
                              *lItemType,

=== modified file 'src/api/item.cpp'
--- src/api/item.cpp	2012-02-02 09:56:52 +0000
+++ src/api/item.cpp	2012-02-08 21:22:19 +0000
@@ -170,6 +170,18 @@
   return Item();
 }
 
+#ifdef ZORBA_WITH_JSON
+
+bool
+Item::isJSONItem() const
+{
+  ITEM_TRY
+    return m_item->isJSONItem();
+  ITEM_CATCH
+  return false;
+}
+
+#endif /* ZORBA_WITH_JSON */
 
 Iterator_t Item::getAtomizationValue() const
 {
@@ -448,6 +460,102 @@
   return -1;
 }
 
+#ifdef ZORBA_WITH_JSON
+
+store::StoreConsts::JSONItemKind
+Item::getJSONItemKind() const
+{
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+
+    return m_item->getJSONItemKind();
+  ITEM_CATCH
+  return store::StoreConsts::jsonItem;
+}
+
+Iterator_t
+Item::getObjectPairs() const
+{
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+
+    // TODO, we should have an error handler here
+    return new StoreIteratorImpl(m_item->getPairs(), nullptr);
+
+  ITEM_CATCH
+  return NULL;
+}
+
+Iterator_t
+Item::getArrayMembers() const
+{
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+
+    // TODO, we should have an error handler here
+    return new StoreIteratorImpl(m_item->getMembers(), nullptr);
+
+  ITEM_CATCH
+  return NULL;
+}
+
+Item
+Item::getObjectValue(String aName) const
+{
+  zstring& lName = Unmarshaller::getInternalString(aName);
+  store::Item_t lIndex;
+  if (!GENV_ITEMFACTORY->createString(lIndex, lName)) {
+    // QQQ probably should throw exception here
+    return Item();
+  }
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ););
+  store::Item_t lPair = m_item->getPair(lIndex);
+  if (lPair.isNull()) {
+    return Item();
+  }
+  return &*lPair->getValue();
+  ITEM_CATCH
+  return Item();
+}
+
+Item
+Item::getArrayMember(uint32_t aIndex) const
+{
+  store::Item_t lIndex;
+  if (!GENV_ITEMFACTORY->createInteger(lIndex, Integer(aIndex))) {
+    // QQQ probably should throw exception here
+    return Item();
+  }
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+      return &*m_item->getMember(lIndex);
+  ITEM_CATCH
+  return Item();
+}
+
+Item
+Item::getPairName() const
+{
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+    return &*m_item->getName();
+  ITEM_CATCH
+  return Item();
+}
+
+Item
+Item::getPairValue() const
+{
+  ITEM_TRY
+    SYNC_CODE(AutoLock lock(GENV_STORE.getGlobalLock(), Lock::READ);)
+    return &*m_item->getValue();
+  ITEM_CATCH
+  return Item();
+}
+
+#endif /* ZORBA_WITH_JSON */
+
 bool
 Item::isStreamable() const
 {

=== modified file 'src/api/itemfactoryimpl.cpp'
--- src/api/itemfactoryimpl.cpp	2012-01-11 17:30:25 +0000
+++ src/api/itemfactoryimpl.cpp	2012-02-08 21:22:19 +0000
@@ -24,6 +24,7 @@
 #include "zorbatypes/duration.h"
 #include "system/globalenv.h"
 #include "store/api/item_factory.h"
+#include "store/api/copymode.h"
 #include "api/unmarshaller.h"
 #include "types/casting.h"
 
@@ -805,6 +806,66 @@
   return &*lItem;
 }
 
+#ifdef ZORBA_WITH_JSON
+
+zorba::Item ItemFactoryImpl::createJSONNull()
+{
+  store::Item_t lItem;
+  theItemFactory->createJSONNull(lItem);
+  return &*lItem;
+}
+
+zorba::Item ItemFactoryImpl::createJSONNumber(String aString)
+{
+  store::Item_t lItem;
+  zstring &lString = Unmarshaller::getInternalString(aString);
+  theItemFactory->createJSONNumber(lItem, lString);
+  return &*lItem;
+}
+
+static void addItems(store::Item* parent, std::vector<Item> &items)
+{
+  // "Copy" the items into the parent
+  store::CopyMode noCopy;
+  noCopy.theDoCopy = false;
+  std::vector<Item>::iterator i = items.begin();
+  std::vector<Item>::iterator end = items.end();
+  for (; i != end; i++) {
+    Unmarshaller::getInternalItem(*i)->copy(parent, noCopy);
+  }
+}
+
+zorba::Item ItemFactoryImpl::createJSONObject(std::vector<Item> &aPairs)
+{
+  store::Item_t lItem;
+  theItemFactory->createJSONObject(lItem);
+  addItems(lItem.getp(), aPairs);
+  return &*lItem;
+}
+
+zorba::Item ItemFactoryImpl::createJSONArray(std::vector<Item> &aItems)
+{
+  store::Item_t lItem;
+  theItemFactory->createJSONArray(lItem);
+  addItems(lItem.getp(), aItems);
+  return &*lItem;
+}
+
+zorba::Item ItemFactoryImpl::createJSONPair(String aName, Item aValue)
+{
+  store::Item_t lNameItem;
+  theItemFactory->createString(lNameItem, Unmarshaller::getInternalString(aName));
+
+  store::Item_t lValueItem = Unmarshaller::getInternalItem(aValue);
+  store::Item_t lItem;
+  theItemFactory->createJSONObjectPair(lItem, lNameItem, lValueItem);
+  return &*lItem;
+}
+
+
+
+#endif /* ZORBA_WITH_JSON */
+
 
 } // namespace zorba
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/api/itemfactoryimpl.h'
--- src/api/itemfactoryimpl.h	2012-01-11 17:30:25 +0000
+++ src/api/itemfactoryimpl.h	2012-02-08 21:22:19 +0000
@@ -244,6 +244,24 @@
         Item   parent,
         String content);
 
+#ifdef ZORBA_WITH_JSON
+      virtual Item
+      createJSONNull();
+
+      virtual Item
+      createJSONNumber(String aString);
+
+      virtual Item
+      createJSONObject(std::vector<Item>& aPairs);
+
+      virtual Item
+      createJSONArray(std::vector<Item>& aItems);
+
+      virtual Item
+      createJSONPair(String aName, Item aValue);
+
+#endif /* ZORBA_WITH_JSON */
+
     protected:
       store::ItemFactory* theItemFactory;
 

=== modified file 'src/api/options.cpp'
--- src/api/options.cpp	2012-01-11 17:30:25 +0000
+++ src/api/options.cpp	2012-02-08 21:22:19 +0000
@@ -17,6 +17,7 @@
 
 #include <string.h>
 #include <zorba/options.h>
+#include "diagnostics/xquery_diagnostics.h"
 
 Zorba_CompilerHints::Zorba_CompilerHints()
   :
@@ -36,7 +37,11 @@
 
 Zorba_SerializerOptions::Zorba_SerializerOptions()
   :
+#ifdef ZORBA_WITH_JSON
+  ser_method(ZORBA_SERIALIZATION_METHOD_JSONIQ),
+#else
   ser_method(ZORBA_SERIALIZATION_METHOD_XML),
+#endif
   byte_order_mark(ZORBA_BYTE_ORDER_MARK_NO),
   escape_uri_attributes(ZORBA_ESCAPE_URI_ATTRIBUTES_NO),
   include_content_type(ZORBA_INCLUDE_CONTENT_TYPE_NO),
@@ -63,9 +68,15 @@
     else if (strcmp(value, "html") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_HTML;
     else if (strcmp(value, "xhtml") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_XHTML;
     else if (strcmp(value, "text") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_TEXT;
+    else if (strcmp(value, "binary") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_BINARY;
+#ifdef ZORBA_WITH_JSON
+    else if (strcmp(value, "json") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_JSON;
+    else if (strcmp(value, "jsoniq") == 0) ser_method = ZORBA_SERIALIZATION_METHOD_JSONIQ;
+#endif
     else
     {
-      ; // TODO signal errors for incorrect values?
+      throw XQUERY_EXCEPTION
+          (err::SEPM0016, ERROR_PARAMS( value, "method", ZED( GoodValuesAreXMLEtc ) ));
     }
   }
   else if (strcmp(parameter, "byte-order-mark") == 0)

=== modified file 'src/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp	2012-01-11 17:30:25 +0000
+++ src/api/serialization/serializer.cpp	2012-02-08 21:22:19 +0000
@@ -16,9 +16,10 @@
 #include "stdafx.h"
 
 #include <sstream>
+#include <iomanip>
 
 #include <zorba/zorba_string.h>
-
+#include <zorbamisc/ns_consts.h>
 #include "zorbatypes/numconversions.h"
 #include "diagnostics/xquery_diagnostics.h"
 #include "diagnostics/assert.h"
@@ -39,7 +40,8 @@
 #include "store/api/iterator.h"
 #include "store/api/iterator_factory.h"
 #include "store/api/item.h"
-
+#include <store/api/item_factory.h>
+#include <store/api/copymode.h>
 
 namespace zorba {
 
@@ -194,9 +196,15 @@
       const unsigned char* temp = chars;
       unicode::code_point cp = utf8::next_char(temp);
 
-      // raise an error iff (1) the serialization format is XML 1.0 and (2) the given character is an invalid XML 1.0 character
-      if (ser && ser->method == PARAMETER_VALUE_XML && ser->version == "1.0" && !xml::is_valid(cp))
+      // raise an error iff (1) the serialization format is XML 1.0 and 
+      // (2) the given character is an invalid XML 1.0 character
+      if (ser &&
+          ser->method == PARAMETER_VALUE_XML &&
+          ser->version == "1.0" &&
+          !xml::is_valid(cp))
+      {
         throw XQUERY_EXCEPTION( err::FOCH0001, ERROR_PARAMS( cp ) );
+      }
 
       if (cp >= 0x10000 && cp <= 0x10FFFF)
       {
@@ -347,7 +355,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void serializer::emitter::emit_declaration_end()
+void serializer::emitter::emit_end()
 {
   // Do nothing in the default emitter
 }
@@ -393,6 +401,12 @@
 ********************************************************************************/
 void serializer::emitter::emit_item(store::Item* item)
 {
+#ifdef ZORBA_WITH_JSON
+  if (item->isJSONItem())
+  {
+    throw XQUERY_EXCEPTION(zerr::ZAPI0043_CANNOT_SERIALIZE_JSON_ITEM);
+  }
+#endif
   if (item->isAtomic())
   {
     if (previous_item == PREVIOUS_ITEM_WAS_TEXT)
@@ -764,7 +778,6 @@
   return false;
 }
 
-
 /*******************************************************************************
 
 ********************************************************************************/
@@ -809,7 +822,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
-//  XML Emitter                                                               //
+//  XML emitter                                                               //
 //                                                                            //
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -889,6 +902,335 @@
 }
 
 
+#ifdef ZORBA_WITH_JSON
+
+////////////////////////////////////////////////////////////////////////////////
+//                                                                            //
+//  JSON emitter                                                              //
+//                                                                            //
+////////////////////////////////////////////////////////////////////////////////
+
+serializer::json_emitter::json_emitter(
+  serializer* the_serializer,
+  transcoder& the_transcoder)
+  : emitter(the_serializer, the_transcoder),
+    theXMLStringStream(nullptr)
+{
+}
+
+serializer::json_emitter::~json_emitter()
+{
+  delete theXMLStringStream;
+}
+
+void serializer::json_emitter::emit_item(store::Item *item)
+{
+  if (!item->isJSONItem())
+  {
+    throw XQUERY_EXCEPTION(zerr::ZAPI0044_CANNOT_SERIALIZE_XML_ITEM);
+  }
+  emit_json_item(item, 0);
+}
+
+void serializer::json_emitter::emit_declaration()
+{
+}
+
+void serializer::json_emitter::emit_end()
+{
+}
+
+void serializer::json_emitter::emit_json_item(store::Item* item, int depth)
+{
+  // This is called for any item within a JSON array or object, or for a
+  // top-level JSON array or object. So JSON rules for simple types may
+  // apply here.
+  if (item->isJSONObject()) {
+    emit_json_object(item, depth);
+  }
+  else if (item->isJSONArray()) {
+    emit_json_array(item, depth);
+  }
+  else if (item->isJSONPair()) {
+    emit_json_pair(item, depth);
+  }
+  else if (item->isAtomic()) {
+    store::SchemaTypeCode type = item->getTypeCode();
+    switch (type) {
+    case store::XS_STRING:
+      emit_json_string(item->getStringValue());
+      break;
+
+    case store::XS_DOUBLE:
+    case store::XS_FLOAT:
+      if (item->isNaN()) {
+        emit_jsoniq_value("number", "NaN", depth);
+        break;
+      }
+      else if (item->isPosOrNegInf()) {
+        emit_jsoniq_value("number", "Infinity", depth);
+        break;
+      }
+      // else fall through
+    case store::XS_INTEGER:
+    case store::XS_DECIMAL:
+    case store::XS_NON_POSITIVE_INTEGER:
+    case store::XS_NEGATIVE_INTEGER:
+    case store::XS_LONG:
+    case store::XS_INT:
+    case store::XS_SHORT:
+    case store::XS_BYTE:
+    case store::XS_NON_NEGATIVE_INTEGER:
+    case store::XS_UNSIGNED_LONG:
+    case store::XS_UNSIGNED_INT:
+    case store::XS_UNSIGNED_SHORT:
+    case store::XS_UNSIGNED_BYTE:
+    case store::XS_POSITIVE_INTEGER:
+      // All numerics get serialized the same way
+      tr << item->getStringValue();
+      break;
+
+    case store::XS_BOOLEAN:
+      tr << (item->getBooleanValue() ? "true" : "false");
+      break;
+
+    case store::JDM_NULL:
+      tr << "null";
+      break;
+
+    default: {
+      emit_jsoniq_value(item->getType()->getStringValue(),
+                        item->getStringValue(), depth);
+      break;
+    }
+    }
+  }
+  else {
+    // OK, we've got a non-atomic non-JDM Item here, so serialize it as XML
+    // and output it as a "JSONiq value".
+    if (!theXMLEmitter) {
+      theXMLStringStream = new std::stringstream();
+      theXMLTranscoder = ser->create_transcoder(*theXMLStringStream);
+      theXMLEmitter = new serializer::xml_emitter(ser, *theXMLTranscoder);
+    }
+    theXMLEmitter->emit_item(item);
+    std::string xml = theXMLStringStream->str();
+    emit_jsoniq_value("XML", xml, depth);
+    theXMLStringStream->str("");
+  }
+}
+
+/*******************************************************************************
+
+********************************************************************************/
+void serializer::json_emitter::emit_json_object(store::Item* obj, int depth)
+{
+  store::Item_t pair;
+  store::Iterator_t it = obj->getPairs();
+  it->open();
+  bool first = true;
+  if (ser->indent) {
+    tr << "{" <<ser->END_OF_LINE;
+  }
+  else {
+    tr << "{ ";
+  }
+  depth++;
+  while (it->next(pair)) {
+    if (first) {
+      first = false;
+    }
+    else {
+      tr << ", ";
+      if (ser->indent) {
+        tr << ser->END_OF_LINE;
+      }
+    }
+    if (ser->indent) {
+      emit_indentation(depth);
+    }
+    emit_json_pair(pair, depth);
+  }
+  if (ser->indent) {
+    tr << ser->END_OF_LINE;
+    emit_indentation(depth-1);
+    tr << "}";
+  }
+  else {
+    tr << " }";
+  }
+}
+
+/*******************************************************************************
+
+********************************************************************************/
+void serializer::json_emitter::emit_json_array(store::Item* array, int depth)
+{
+  store::Item_t member;
+  store::Iterator_t it = array->getMembers();
+  it->open();
+  bool first = true;
+  tr << "[ ";
+  while (it->next(member)) {
+    if (first) {
+      first = false;
+    }
+    else {
+      tr << ", ";
+    }
+    emit_json_item(member, depth);
+  }
+  tr << " ]";
+}
+
+/*******************************************************************************
+
+********************************************************************************/
+void serializer::json_emitter::emit_json_pair(store::Item* pair, int depth)
+{
+  emit_json_item(pair->getName(), depth);
+  tr << " : ";
+  emit_json_item(pair->getValue(), depth);
+}
+
+/*******************************************************************************
+
+********************************************************************************/
+void serializer::json_emitter::emit_jsoniq_value
+    (zstring type, zstring value, int depth)
+{
+  // Create items for constant strings, if not already done
+  if (!theJsoniqValueName) {
+    zstring jsoniqvaluestring("JSONiq value");
+    zstring typestring("type");
+    zstring valuestring("value");
+    GENV_ITEMFACTORY->createString(theJsoniqValueName, jsoniqvaluestring);
+    GENV_ITEMFACTORY->createString(theTypeName, typestring);
+    GENV_ITEMFACTORY->createString(theValueName, valuestring);
+  }
+
+  // Create the inner JSON object
+  store::Item_t inner;
+  GENV_ITEMFACTORY->createJSONObject(inner);
+  // Inner object contains two pairs
+  store::Item_t typeitem, valueitem;
+  store::Item_t typepair, valuepair;
+  GENV_ITEMFACTORY->createString(typeitem, type);
+  GENV_ITEMFACTORY->createString(valueitem, value);
+  GENV_ITEMFACTORY->createJSONObjectPair(typepair, theTypeName, typeitem);
+  GENV_ITEMFACTORY->createJSONObjectPair(valuepair, theValueName, valueitem);
+
+  // "Copy" pairs into object
+  store::CopyMode noCopy;
+  noCopy.theDoCopy = false;
+  typepair->copy(inner.getp(), noCopy);
+  valuepair->copy(inner.getp(), noCopy);
+
+  // Create the outer JSON object with one pair
+  store::Item_t outer;
+  GENV_ITEMFACTORY->createJSONObject(outer);
+  store::Item_t outerpair;
+  GENV_ITEMFACTORY->createJSONObjectPair(outerpair, theJsoniqValueName, inner);
+  outerpair->copy(outer, noCopy);
+
+  emit_json_object(outer, depth);
+}
+
+void serializer::json_emitter::emit_json_string(zstring string)
+{
+  tr << '"';
+  zstring::const_iterator i = string.begin();
+  zstring::const_iterator end = string.end();
+  for (; i < end; i++) {
+    if (*i < 0x20) {
+      // Escape control sequences
+      std::stringstream hex;
+      hex << "\\u" << std::setw(4) << std::setfill('0')
+          << std::hex << static_cast<int>(*i);
+      tr << hex.str();
+      continue;
+    }
+    if (*i == '\\' || *i == '"') {
+      // Output escape char for \ or "
+      tr << '\\';
+      // Fall through to output original character
+    }
+    tr << *i;
+  }
+  tr << '"';
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+//                                                                            //
+//  JSONiq emitter (auto-detects JSON or XML)                                 //
+//                                                                            //
+////////////////////////////////////////////////////////////////////////////////
+
+serializer::jsoniq_emitter::jsoniq_emitter(
+  serializer* the_serializer,
+  transcoder& the_transcoder)
+  :
+    emitter(the_serializer, the_transcoder),
+    theEmitterState(JESTATE_UNDETERMINED),
+    theEmitter(nullptr)
+{
+}
+
+serializer::jsoniq_emitter::~jsoniq_emitter()
+{
+  delete theEmitter;
+}
+
+void serializer::jsoniq_emitter::emit_declaration()
+{
+  // Probably I should set a flag here to note whether emit_declaration() has
+  // been called or not. However, I know that all serializer::serialize()
+  // methods DO call emit_declaration() and call it first, so there's no need.
+}
+
+void serializer::jsoniq_emitter::emit_item(store::Item *item)
+{
+  bool isJson = item->isJSONItem();
+
+  if (theEmitterState == JESTATE_UNDETERMINED) {
+    // Initialize theEmitter based on item type, passing through our serializer
+    // and transcoder.
+    if (isJson) {
+      theEmitterState = JESTATE_JDM;
+      theEmitter = new json_emitter(ser, tr);
+    }
+    else {
+      theEmitterState = JESTATE_XDM;
+      theEmitter = new xml_emitter(ser, tr);
+    }
+    // Since this was the first item, call emit_declaration().
+    theEmitter->emit_declaration();
+  }
+  else {
+    // Error checking
+    if ( (isJson && theEmitterState == JESTATE_XDM) ||
+         (!isJson && theEmitterState == JESTATE_JDM) ) {
+      throw XQUERY_EXCEPTION(zerr::ZAPI0045_CANNOT_SERIALIZE_MIXED_XDM_JDM);
+    }
+  }
+
+  // Pass through
+  theEmitter->emit_item(item);
+}
+
+void serializer::jsoniq_emitter::emit_end()
+{
+  // Not really clear what to do if we serialized no items and hence have
+  // no emitter yet, but doing nothing at all seems reasonable.
+  if (theEmitter) {
+    theEmitter->emit_end();
+  }
+}
+
+
+#endif /* ZORBA_WITH_JSON */
+
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
 //  HTML Emitter                                                              //
@@ -1043,7 +1385,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void serializer::html_emitter::emit_declaration_end()
+void serializer::html_emitter::emit_end()
 {
 }
 
@@ -1439,7 +1781,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void serializer::sax2_emitter::emit_declaration_end()
+void serializer::sax2_emitter::emit_end()
 {
   theSAX2ContentHandler->endDocument();
 }
@@ -1893,7 +2235,6 @@
   }
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 //                                                                            //
 //  Serializer                                                                //
@@ -1940,7 +2281,12 @@
 
   media_type.clear();
 
+  // This default should match the default for ser_method in Zorba_SerializerOptions
+#ifdef ZORBA_WITH_JSON
+  method = PARAMETER_VALUE_JSONIQ;
+#else
   method = PARAMETER_VALUE_XML;
+#endif
 
   normalization_form.clear();
 
@@ -2032,6 +2378,12 @@
       method = PARAMETER_VALUE_TEXT;
     else if (!strcmp(aValue, "binary"))
       method = PARAMETER_VALUE_BINARY;
+#ifdef ZORBA_WITH_JSON
+    else if (!strcmp(aValue, "json"))
+      method = PARAMETER_VALUE_JSON;
+    else if (!strcmp(aValue, "jsoniq"))
+      method = PARAMETER_VALUE_JSONIQ;
+#endif
     else
       throw XQUERY_EXCEPTION(
         err::SEPM0016, ERROR_PARAMS( aValue, aName, ZED( GoodValuesAreXMLEtc ) )
@@ -2160,22 +2512,10 @@
 ********************************************************************************/
 bool serializer::setup(std::ostream& os)
 {
-  if (encoding == PARAMETER_VALUE_UTF_8)
-  {
-    tr = new transcoder(os, false);
-  }
-#ifndef ZORBA_NO_UNICODE
-  else if (encoding == PARAMETER_VALUE_UTF_16)
-  {
-    tr = new transcoder(os, true);
-  }
-#endif
-  else
-  {
-    ZORBA_ASSERT(0);
+  tr = create_transcoder(os);
+  if (!tr) {
     return false;
   }
-
   if (method == PARAMETER_VALUE_XML)
     e = new xml_emitter(this, *tr);
   else if (method == PARAMETER_VALUE_HTML)
@@ -2186,6 +2526,12 @@
     e = new text_emitter(this, *tr);
   else if (method == PARAMETER_VALUE_BINARY)
     e = new binary_emitter(this, *tr);
+#ifdef ZORBA_WITH_JSON
+  else if (method == PARAMETER_VALUE_JSON)
+    e = new json_emitter(this, *tr);
+  else if (method == PARAMETER_VALUE_JSONIQ)
+    e = new jsoniq_emitter(this, *tr);
+#endif
   else
   {
     ZORBA_ASSERT(0);
@@ -2204,6 +2550,24 @@
   return true;
 }
 
+transcoder* serializer::create_transcoder(std::ostream &os)
+{
+  if (encoding == PARAMETER_VALUE_UTF_8)
+  {
+    return new transcoder(os, false);
+  }
+#ifndef ZORBA_NO_UNICODE
+  else if (encoding == PARAMETER_VALUE_UTF_16)
+  {
+    return new transcoder(os, true);
+  }
+#endif
+  else
+  {
+    ZORBA_ASSERT(0);
+    return nullptr;
+  }
+}
 
 /*******************************************************************************
 
@@ -2265,7 +2629,7 @@
     e->emit_item(&*lItem);
   }
 //+  aObject->close();
-  e->emit_declaration_end();
+  e->emit_end();
 }
 
 
@@ -2311,7 +2675,7 @@
   }
  
   //object->close();
-  e->emit_declaration_end();
+  e->emit_end();
 }
 
 } // namespace zorba

=== modified file 'src/api/serialization/serializer.h'
--- src/api/serialization/serializer.h	2011-11-11 07:44:01 +0000
+++ src/api/serialization/serializer.h	2012-02-08 21:22:19 +0000
@@ -69,6 +69,10 @@
     PARAMETER_VALUE_XHTML,
     PARAMETER_VALUE_TEXT,
     PARAMETER_VALUE_BINARY,
+#ifdef ZORBA_WITH_JSON
+    PARAMETER_VALUE_JSON,
+    PARAMETER_VALUE_JSONIQ,
+#endif
 
     PARAMETER_VALUE_UTF_8
 #ifndef ZORBA_NO_UNICODE
@@ -168,6 +172,7 @@
 
   bool setup(std::ostream& os);
 
+  transcoder* create_transcoder(std::ostream& os);
 
   ///////////////////////////////////////////////////////////
   //                                                       //
@@ -198,8 +203,20 @@
     /**
      * Outputs the end of the serialized document.
      */
-    virtual void emit_declaration_end();
-
+    virtual void emit_end();
+
+    /**
+     * Serializes the given item, depending on its type, and its children. This
+     * will be called by serializer for each top-level item in the sequence.
+     *
+     * @param item the item to serialize
+     */
+    virtual void emit_item(store::Item* item);
+
+    // End of the "public" emitter API. All remaining methods are implementation
+    // details and will not be called from outside.