Merge lp:~zorba-coders/zorba/type-api into lp:zorba

[Markos Zaharioudakis]

Renamed class TypeIdentifier to SequenceType and changed its api and implementation (fix for bug #1056787)

Renamed class TypeIdentifier to SequenceType and changed its api and implementation (fix for bug #1056787)

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

Stage "BuildZorbaUbuntu" failed.

Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/342/parsed_console to view the results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

Stage "BuildZorbaUbuntu" failed.

Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/343/parsed_console to view the results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

Stage "BuildZorbaUbuntu" failed.

Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/344/parsed_console to view the results.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

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

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

Stage "TestZorbaUbuntu" failed.
23 tests failed (8536 total tests run).

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/type-api/+merge/169278

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue succeeded - proposal merged!

=== modified file 'doc/java/examples/Test_Zorba.java'
--- doc/java/examples/Test_Zorba.java	2013-02-07 17:24:36 +0000
+++ doc/java/examples/Test_Zorba.java	2013-09-24 21:48:10 +0000
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-import org.zorbaxquery.api.Zorba;
-import org.zorbaxquery.api.XQuery;
-import org.zorbaxquery.api.Iterator;
-import org.zorbaxquery.api.Item;
-import org.zorbaxquery.api.XmlDataManager;
-import org.zorbaxquery.api.DocumentManager;
-import org.zorbaxquery.api.InMemoryStore;
+import io.zorba.api.Zorba;
+import io.zorba.api.XQuery;
+import io.zorba.api.Iterator;
+import io.zorba.api.Item;
+import io.zorba.api.XmlDataManager;
+import io.zorba.api.DocumentManager;
+import io.zorba.api.InMemoryStore;
 
 
 public class Test_Zorba 
@@ -28,7 +28,7 @@
 
   static 
   {
-    System.loadLibrary ( "zorba_api" );
+    System.loadLibrary ( "zorba_api_java" );
   }
 
   static boolean example_1(Zorba aZorba)
@@ -147,7 +147,7 @@
       System.exit ( 1 ); 
 
     System.out.println ( "executing example 5" );
-    res = example_5 ( zorba );
+    //res = example_5 ( zorba );
     if (!res) 
       System.exit ( 1 ); 
 

=== modified file 'include/zorba/api_shared_types.h'
--- include/zorba/api_shared_types.h	2013-08-06 08:41:26 +0000
+++ include/zorba/api_shared_types.h	2013-09-24 21:48:10 +0000
@@ -37,6 +37,7 @@
 class Iterator;
 class ModuleInfo;
 class QueryLocation;
+class SequenceType;
 class SerializationCallback;
 class Serializer;
 class StatelessExternalFunction;
@@ -46,7 +47,6 @@
 class StemmerProvider;
 class TokenizerProvider;
 #endif /* ZORBA_NO_FULL_TEXT */
-class TypeIdentifier;
 class XmlDataManager;
 class XQuery;
 class Zorba;
@@ -62,7 +62,6 @@
 typedef SmartPtr<Serializer>      Serializer_t;
 typedef SmartPtr<StaticContext>   StaticContext_t;
 typedef SmartPtr<XmlDataManager>  XmlDataManager_t;
-typedef SmartPtr<TypeIdentifier>  TypeIdentifier_t;
 typedef SmartPtr<XQuery>          XQuery_t;
 
 // data handlers

=== modified file 'include/zorba/collection.h'
--- include/zorba/collection.h	2013-02-07 17:24:36 +0000
+++ include/zorba/collection.h	2013-09-24 21:48:10 +0000
@@ -210,7 +210,7 @@
    *
    * @see isStatic()
    */
-  virtual TypeIdentifier_t
+  virtual SequenceType
   getType() const = 0;
 
   /** \brief Register a DiagnosticHandler to which errors

=== removed file 'include/zorba/identtypes.h'
--- include/zorba/identtypes.h	2013-06-15 02:57:08 +0000
+++ include/zorba/identtypes.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * 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.
- */
-#ifndef ZORBA_TYPEIDENT_TYPES_API_H
-#define ZORBA_TYPEIDENT_TYPES_API_H
-
-#include <zorba/config.h>
-#include <iostream>
-
-namespace zorba 
-{
-
-class ZORBA_DLL_PUBLIC IdentTypes 
-{
-public:
-  typedef enum 
-  {
-    NAMED_TYPE,             // AtomicOrUnionType
-    ELEMENT_TYPE,
-    ATTRIBUTE_TYPE,
-    DOCUMENT_TYPE,
-    PI_TYPE,
-    TEXT_TYPE,
-    COMMENT_TYPE,
-    NAMESPACE_TYPE,
-    ANY_NODE_TYPE,          // node()
-    STRUCTURED_ITEM_TYPE,   // structured-item
-    JSON_ITEM_TYPE,
-    JSON_OBJECT_TYPE,
-    JSON_ARRAY_TYPE,
-    ITEM_TYPE,              // item()
-    EMPTY_TYPE,             // empty-sequence()
-    SCHEMA_ELEMENT_TYPE,
-    SCHEMA_ATTRIBUTE_TYPE,
-    INVALID_TYPE
-  } kind_t;
-  
-  static char const *const kind_string_of[];
-
-  typedef enum 
-  {
-    QUANT_ONE,
-    QUANT_QUESTION,
-    QUANT_PLUS,
-    QUANT_STAR
-  } quantifier_t;
-  
-  static char const *const quantifier_string_of[];
-};
-}
-
-namespace std {
-
-ZORBA_DLL_PUBLIC ostream& operator<<(ostream& o, const zorba::IdentTypes::kind_t ik);
-ZORBA_DLL_PUBLIC ostream& operator<<(ostream& o, const zorba::IdentTypes::quantifier_t iq);
-
-}
-
-#endif
-/* vim:set et sw=2 ts=2: */

=== modified file 'include/zorba/static_context.h'
--- include/zorba/static_context.h	2013-08-09 08:27:30 +0000
+++ include/zorba/static_context.h	2013-09-24 21:48:10 +0000
@@ -36,21 +36,22 @@
 
 namespace zorba {
 
-  /** \brief Instances of the class StaticContext contain the information that is available
-   *         at the time the query is compiled.
-   *
-   * This class contains the information that is defined in the %XQuery specification
-   * (see http://www.w3.org/TR/xquery/#static_context).
-   *
-   * A StaticContext can be created by calling Zorba::createStaticContext and then be passed
-   * to the Zorba::compileQuery or XQuery::compile functions.
-   * If no static context has been passed to any of these functions, a default static context
-   * is used. It can be accessed by calling XQuery::getStaticContext on a compiled XQuery object.
-   *
-   * Note: This class is reference counted. When writing multi-threaded clients,
-   * it is the responibility of the client code to synchronize assignments to the
-   * SmartPtr holding this object.
-   */
+/** \brief Instances of the class StaticContext contain the information that is
+ *         available at the time the query is compiled and run.
+ *
+ * This class contains the information that is defined in the %XQuery specification
+ * (see http://www.w3.org/TR/xquery/#static_context).
+ *
+ * A StaticContext can be created by calling Zorba::createStaticContext and then
+ * be passed to the Zorba::compileQuery or XQuery::compile functions. If no
+ * static context has been passed to any of these functions, a default static
+ * context is used. It can be accessed by calling XQuery::getStaticContext on
+ * a compiled XQuery object.
+ *
+ * Note: This class is reference counted. When writing multi-threaded clients,
+ * it is the responibility of the client code to synchronize assignments to the
+ * SmartPtr holding this object.
+ */
 class ZORBA_DLL_PUBLIC StaticContext : public SmartObject
 {
  public:
@@ -399,21 +400,21 @@
   /** \brief Set the type of a statically known document
    */
   virtual void
-  setDocumentType(const String& aDocUri, TypeIdentifier_t type) = 0;
+  setDocumentType(const String& aDocUri, const SequenceType& type) = 0;
   
   /** \brief Get the type of a statically known document
    */
-  virtual TypeIdentifier_t
+  virtual SequenceType
   getDocumentType(const String& aDocUri) const = 0;
   
   /** \brief Set the type of a statically known collection
    */
   virtual void
-  setCollectionType(const String& aCollectionUri, TypeIdentifier_t type) = 0;
+  setCollectionType(const String& aCollectionUri, const SequenceType& type) = 0;
 
   /** \brief Get the type of a statically known collection
    */
-  virtual TypeIdentifier_t
+  virtual SequenceType
   getCollectionType(const String& aCollectionUri) const = 0;
 
   /** \brief Check if a function with the given name and arity are registered in the context.
@@ -456,11 +457,11 @@
   /** \brief Set the type of the context item.
    */
   virtual void
-  setContextItemStaticType(TypeIdentifier_t type) = 0;
+  setContextItemStaticType(const SequenceType& type) = 0;
 
   /** \brief Fetch the type of the context item.
    */
-  virtual TypeIdentifier_t
+  virtual SequenceType
   getContextItemStaticType() const = 0;
 
   /** \brief Set the output stream that is used by the fn:trace function

=== modified file 'include/zorba/typeident.h'
--- include/zorba/typeident.h	2013-06-15 02:57:08 +0000
+++ include/zorba/typeident.h	2013-09-24 21:48:10 +0000
@@ -18,154 +18,212 @@
 
 #include <zorba/config.h>
 #include <zorba/api_shared_types.h>
-#include <zorba/identtypes.h>
 #include <zorba/zorba_string.h>
 #include <iostream>
 
 namespace zorba {
 
-/** \brief Type identifiers
+
+class XQType;
+
+
+/**
+ * \brief Representation and factory for xquery sequence types.
  *
- * The type identifiers are not used, yet.
+ * Class SequenceType represents xquery sequence types, as defined in
+ * http://www.w3.org/TR/xquery-30/#id-sequencetype-syntax. Instances of
+ * SequenceType may be returned by methods of Zorba's C++ API. The class also
+ * provides static methods to create instances of SequenceType, which can then
+ * be passed as arguments to other methods of Zorba's C++ API.
  *
  * Note: This class is reference counted. When writing multi-threaded clients,
  * it is the responibility of the client code to synchronize assignments to the
  * SmartPtr holding this object.
  */
-class ZORBA_DLL_PUBLIC TypeIdentifier : public SmartObject
+class ZORBA_DLL_PUBLIC SequenceType
 {
- public:
-  /** \brief Destructor
-   */
-  ~TypeIdentifier();
-
-  static TypeIdentifier_t
-  createNamedType(
-      const String& uri,
-      const String& localName,
-      IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE);
-
-  static TypeIdentifier_t
-  createElementType(
-      const String& uri,
-      bool uriWildcard,
-      const String& localName,
-      bool localNameWildcard,
-      TypeIdentifier_t contentType,
-      IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE);
-
-  static TypeIdentifier_t
-  createAttributeType(
-      const String& uri,
-      bool uriWildcard,
-      const String& localName,
-      bool localNameWildcard,
-      TypeIdentifier_t contentType,
-      IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
-
-  static TypeIdentifier_t
-  createDocumentType(
-      TypeIdentifier_t contentType,
-      IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
-
-  static TypeIdentifier_t
-  createPIType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
-
-  static TypeIdentifier_t
-  createNamespaceType(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);
-
-  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
-  createItemType(IdentTypes::quantifier_t q = IdentTypes::QUANT_ONE);
-
-  static TypeIdentifier_t
-  createEmptyType();
-
-  static TypeIdentifier_t
-  createSchemaElementType(
-      const String& uri,
-      const String& localName,
-      IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE);
-  
-  static TypeIdentifier_t
-  createSchemaAttributeType(
-      const String& uri,
-      const String& localName,
-      IdentTypes::quantifier_t quantifier = IdentTypes::QUANT_ONE);
-  
-  IdentTypes::kind_t
-  getKind() const;
-
-  IdentTypes::quantifier_t
-  getQuantifier() const;
-
-  const String&
-  getUri() const;
-
-  bool
-  isUriWildcard() const;
-
-  const String&
-  getLocalName() const;
-
-  bool
-  isLocalNameWildcard() const;
-
-  TypeIdentifier_t
-  getContentType() const;
-
-  std::ostream&
-  emit(std::ostream&) const;
-
- private:
-  TypeIdentifier();
-
-  std::ostream&
-  emitItemType(std::ostream&) const;
-
-  std::ostream&
-  emitName(std::ostream&) const;
-
-  IdentTypes::kind_t m_kind;
-  IdentTypes::quantifier_t m_quantifier;
-  String m_uri;
-  bool m_uriWildcard;
-  String m_localName;
-  bool m_localNameWildcard;
-  TypeIdentifier_t m_contentType;
+public:
+  typedef enum 
+  {
+    EMPTY_TYPE,               // empty-sequence()
+    ITEM_TYPE,                // item()
+    ATOMIC_OR_UNION_TYPE,     // AtomicOrUnionType
+    FUNCTION_TYPE,            // function(*) and subtypes
+    STRUCTURED_ITEM_TYPE,     // structured-item()
+    NODE_TYPE,                // node()
+    DOCUMENT_TYPE,
+    ELEMENT_TYPE,
+    SCHEMA_ELEMENT_TYPE,
+    ATTRIBUTE_TYPE,
+    SCHEMA_ATTRIBUTE_TYPE,
+    PI_TYPE,
+    TEXT_TYPE,
+    COMMENT_TYPE,
+    NAMESPACE_TYPE,
+    JSON_ITEM_TYPE,
+    JSON_OBJECT_TYPE,
+    JSON_ARRAY_TYPE,
+    INVALID_TYPE
+  } Kind;
+  
+
+  typedef enum 
+  {
+    QUANT_ONE,
+    QUANT_QUESTION,
+    QUANT_STAR,
+    QUANT_PLUS,
+    QUANT_INVALID
+  } Quantifier;
+
+
+ public:
+  /**
+   * \brief Create an empty-sequence() type
+   */
+  static SequenceType createEmptyType();
+
+  /**
+   * \brief Create an item() type with quantifier
+   */
+  static SequenceType createItemType(Quantifier q = QUANT_ONE);
+
+  /**
+   * \brief Create an AtomicOrUnion type with quantifier
+   *
+   * An AtomicOrUnion type is specified simply as a QName, which may identify
+   * an XMLSchema builtin atomic type or a user-defined atomic or union type.
+   * In the case of user-defined types, the QName must be among the in-scope
+   * type names of a given static context. Otherwise, for builtin types, the
+   * given sctx may be NULL.
+   */
+  static SequenceType createAtomicOrUnionType(
+      const StaticContext_t& sctx,
+      const String& uri,
+      const String& localName,
+      Quantifier q = QUANT_ONE);
+
+  /**
+   * \brief Create an structured-item() type with quantifier
+   */
+  static SequenceType createStructuredItemType(Quantifier q = QUANT_ONE);
+
+  /**
+   * \brief Create an node() type with quantifier
+   */
+  static SequenceType createAnyNodeType(Quantifier q = QUANT_ONE);
+
+  /**
+   * \brief Create a document-node() type or subtype with quantifier
+   */
+  static SequenceType createDocumentType(
+      const SequenceType& contentType,
+      Quantifier q = QUANT_ONE);
+
+  /**
+   * \brief Create an element() type or subtype with quantifier
+   */
+  static SequenceType createElementType(
+      const StaticContext_t& sctx,
+      const String& nodeUri,
+      const String& nodeLocalName,
+      const String& contentTypeUri,
+      const String& contentTypeLocalName,
+      bool nillable,
+      Quantifier quant = QUANT_ONE);
+
+  static SequenceType createSchemaElementType(
+      const StaticContext_t& sctx,
+      const String& uri,
+      const String& localName,
+      Quantifier quant = QUANT_ONE);
+  
+  static SequenceType createAttributeType(
+      const StaticContext_t& sctx,
+      const String& nodeUri,
+      const String& nodeLocalName,
+      const String& contentTypeUri,
+      const String& contentTypeLocalName,
+      Quantifier quant = QUANT_ONE);
+
+  static SequenceType createSchemaAttributeType(
+      const StaticContext_t& sctx,
+      const String& uri,
+      const String& localName,
+      Quantifier quant = QUANT_ONE);
+  
+  static SequenceType createPIType(Quantifier q = QUANT_ONE);
+
+  static SequenceType createTextType(Quantifier q = QUANT_ONE);
+
+  static SequenceType createCommentType(Quantifier q = QUANT_ONE);
+
+  static SequenceType createNamespaceType(Quantifier q = QUANT_ONE);
+
+  static SequenceType createJSONItemType(Quantifier q = QUANT_ONE);
+
+  static SequenceType createJSONObjectType(Quantifier q = QUANT_ONE);
+
+  static SequenceType createJSONArrayType(Quantifier q = QUANT_ONE);
+
+ public:
+  SequenceType();
+
+  SequenceType(const SequenceType& other);
+
+  /**
+   * \brief Destructor
+   */
+  ~SequenceType();
+
+  bool isValid() const;
+
+  Kind getKind() const;
+
+  Quantifier getQuantifier() const;
+
+  String getTypeUri() const;
+
+  String getTypeLocalName() const;
+
+  String getNodeUri() const;
+
+  String getNodeLocalName() const;
+
+  bool isWildcard() const;
+
+  String getContentTypeUri() const;
+
+  String getContentTypeLocalName() const;
+
+  bool isSchemaTest() const;
+
+  std::ostream& emit(std::ostream&) const;
+
+ private:
+  SequenceType(const XQType* t);
+
+ public:
+  static char const *const kind_string_of[];
+
+  static char const *const quantifier_string_of[];
+
+ private:
+  friend class Unmarshaller;
+
+  const XQType  * theType;
 };
   
-#ifdef WIN32
-  template class ZORBA_DLL_PUBLIC  zorba::SmartPtr<TypeIdentifier>;
-#endif
-
 
 } /* namespace zorba */
 
-namespace std {
-
-ZORBA_DLL_PUBLIC ostream& operator<<(ostream& o, const zorba::TypeIdentifier& ti);
-ZORBA_DLL_PUBLIC ostream& operator<<(ostream& o, const zorba::TypeIdentifier_t ti);
+namespace std 
+{
+
+ZORBA_DLL_PUBLIC ostream& operator<<(ostream& o, const zorba::SequenceType& ti);
+
+ZORBA_DLL_PUBLIC ostream& operator<<(ostream& o, const zorba::SequenceType::Kind k);
+ZORBA_DLL_PUBLIC ostream& operator<<(ostream& o, const zorba::SequenceType::Quantifier q);
 
 }
 

=== modified file 'modules/http-client/json/http-client.xq.src/http_response_parser.cpp'
--- modules/http-client/json/http-client.xq.src/http_response_parser.cpp	2013-09-19 16:22:03 +0000
+++ modules/http-client/json/http-client.xq.src/http_response_parser.cpp	2013-09-24 21:48:10 +0000
@@ -21,6 +21,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <string>
+#include <algorithm>
 
 #include <zorba/util/base64_util.h>
 #include <zorba/config.h>

=== modified file 'src/api/CMakeLists.txt'
--- src/api/CMakeLists.txt	2013-08-02 14:55:29 +0000
+++ src/api/CMakeLists.txt	2013-09-24 21:48:10 +0000
@@ -29,8 +29,7 @@
     hexbinary_streambuf.cpp
     itemfactoryimpl.cpp
     item.cpp
-    identtypesimpl.cpp
-    typeidentimpl.cpp
+    sequencetype.cpp
     unmarshaller.cpp
     xmldatamanagerimpl.cpp
     documentmanagerimpl.cpp

=== modified file 'src/api/collectionimpl.cpp'
--- src/api/collectionimpl.cpp	2013-02-07 17:24:36 +0000
+++ src/api/collectionimpl.cpp	2013-09-24 21:48:10 +0000
@@ -372,7 +372,7 @@
 /*******************************************************************************
 
 ********************************************************************************/
-TypeIdentifier_t
+SequenceType
 CollectionImpl::getType() const
 {
   ZORBA_DM_TRY
@@ -384,16 +384,16 @@
     const StaticallyKnownCollection* lColl = lCtx->lookup_collection(lQName);
     if (!lColl)
     {
-      return 0;
+      return SequenceType();
     }
 
-    const XQType* lType = lColl->getCollectionType();
+    const XQType* type = lColl->getCollectionType();
 
-    return TypeOps::get_type_identifier(lCtx->get_typemanager(), *lType);
+    return Unmarshaller::createSequenceType(type);
 
   }
   ZORBA_DM_CATCH
-  return 0;
+  return Unmarshaller::createSequenceType(NULL);
 }
 
 

=== modified file 'src/api/collectionimpl.h'
--- src/api/collectionimpl.h	2013-02-07 17:24:36 +0000
+++ src/api/collectionimpl.h	2013-09-24 21:48:10 +0000
@@ -135,7 +135,7 @@
   virtual bool
   isStatic() const;
 
-  virtual TypeIdentifier_t
+  virtual SequenceType
   getType() const;
   
 }; /* class CollectionImpl */

=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp	2013-08-01 17:23:58 +0000
+++ src/api/dynamiccontextimpl.cpp	2013-09-24 21:48:10 +0000
@@ -643,21 +643,14 @@
 
     checkItem(lItem);
 
-    TypeManager* tm = theStaticContext->get_typemanager();
-
-    xqtref_t lItemType = tm->create_named_type(lItem->getType(),
-                                               TypeConstants::QUANT_ONE,
-                                               QueryLoc::null);
-
-    if (!TypeOps::is_subtype(tm,
-                             *lItemType,
-                             *GENV_TYPESYSTEM.DATETIME_TYPE_ONE,
-                             QueryLoc::null))
+    if (!TypeOps::is_subtype(lItem->getTypeCode(), store::XS_DATETIME))
     {
+      TypeManager* tm = theStaticContext->get_typemanager();
+      xqtref_t type = tm->create_value_type(lItem);
       RAISE_ERROR_NO_LOC(zerr::ZAPI0014_INVALID_ARGUMENT,
-      ERROR_PARAMS(lItemType->toString(),
+      ERROR_PARAMS(type->toSchemaString(),
                    ZED(TypeIsNotSubtype),
-                   GENV_TYPESYSTEM.DATETIME_TYPE_ONE->toString()));
+                   GENV_TYPESYSTEM.DATETIME_TYPE_ONE->toSchemaString()));
     }
 
     theCtx->set_current_date_time(lItem);

=== removed file 'src/api/identtypesimpl.cpp'
--- src/api/identtypesimpl.cpp	2013-03-05 12:34:19 +0000
+++ src/api/identtypesimpl.cpp	1970-01-01 00:00:00 +0000
@@ -1,67 +0,0 @@
-/*
- * 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 "stdafx.h"
-#include <zorba/identtypes.h>
-
-namespace zorba {
-  
-char const *const IdentTypes::kind_string_of[] = 
-{
-  "NAMED",
-  "element",
-  "attribute",
-  "document-node",
-  "processing-instruction",
-  "text",
-  "comment",
-  "namespace-node",
-  "node",
-  "item",
-  "empty-sequence",
-  "schema-element",
-  "schema-attribute",
-  "INVALID",
-  0
-};
-
-
-char const *const IdentTypes::quantifier_string_of[] = 
-{
-  "",
-  "?",
-  "+",
-  "*",
-  0
-};
-  
-}
-
-namespace std {
-
-ostream& operator<<(ostream& o, const zorba::IdentTypes::kind_t ik) 
-{
-  return o << zorba::IdentTypes::kind_string_of[ik];
-}
-
-ostream& operator<<(ostream& o, const zorba::IdentTypes::quantifier_t iq) 
-{
-  return o << zorba::IdentTypes::quantifier_string_of[iq];
-}
-
-}
-
-/* vim:set et sw=2 ts=2: */

=== added file 'src/api/sequencetype.cpp'
--- src/api/sequencetype.cpp	1970-01-01 00:00:00 +0000
+++ src/api/sequencetype.cpp	2013-09-24 21:48:10 +0000
@@ -0,0 +1,799 @@
+/*
+ * 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 "stdafx.h"
+
+#ifndef ZORBA_API_SEQUENCE_TYPE
+#define ZORBA_API_SEQUENCE_TYPE
+
+#include <zorba/typeident.h>
+
+#include "types/typeimpl.h"
+#include "types/root_typemanager.h"
+
+#include "diagnostics/assert.h"
+
+#include "api/unmarshaller.h"
+
+#include "context/static_context.h"
+
+#include "store/api/item_factory.h"
+
+
+namespace std 
+{
+
+ostream& operator<<(ostream& o, const zorba::SequenceType::Kind k) 
+{
+  return o << zorba::SequenceType::kind_string_of[k];
+}
+
+ostream& operator<<(ostream& o, const zorba::SequenceType::Quantifier q) 
+{
+  return o << zorba::SequenceType::quantifier_string_of[q];
+}
+
+
+ostream& operator<<(ostream& o, const zorba::SequenceType& ti) 
+{
+  return ti.emit(o);
+}
+
+}
+
+
+namespace zorba 
+{
+
+
+char const *const SequenceType::kind_string_of[] = 
+{
+  "empty-sequence",
+  "item",
+  "AtomicOrUnion",
+  "function",
+  "structured-item",
+  "node",
+  "document-node",
+  "element",
+  "schema-element",
+  "attribute",
+  "schema-attribute",
+  "processing-instruction",
+  "text",
+  "comment",
+  "namespace-node",
+  "json-item",
+  "object",
+  "array",
+  "INVALID",
+  0
+};
+
+
+char const *const SequenceType::quantifier_string_of[] = 
+{
+  "",
+  "?",
+  "*",
+  "+",
+  "INVALID",
+  0
+};
+
+
+
+/*******************************************************************************
+
+********************************************************************************/
+SequenceType SequenceType::createEmptyType()
+{
+  return Unmarshaller::createSequenceType(GENV_TYPESYSTEM.EMPTY_TYPE.getp());
+}
+
+
+SequenceType SequenceType::createItemType(Quantifier quant)
+{
+  RootTypeManager& rtm = GENV_TYPESYSTEM;
+
+  switch (quant)
+  {
+  case QUANT_ONE:
+    return Unmarshaller::createSequenceType(rtm.ITEM_TYPE_ONE.getp());
+  case QUANT_QUESTION:
+    return Unmarshaller::createSequenceType(rtm.ITEM_TYPE_QUESTION.getp());
+  case QUANT_PLUS:
+    return Unmarshaller::createSequenceType(rtm.ITEM_TYPE_PLUS.getp());
+  case QUANT_STAR:
+    return Unmarshaller::createSequenceType(rtm.ITEM_TYPE_STAR.getp());
+  default:
+    ZORBA_ASSERT(false);
+  }
+}
+
+
+SequenceType SequenceType::createAtomicOrUnionType(
+    const StaticContext_t& sctx,
+    const String& uri,
+    const String& localName,
+    Quantifier quant)
+{
+  TypeManager* tm;
+
+  if (sctx == NULL)
+  {
+    tm = &GENV_TYPESYSTEM;
+  }
+  else
+  {
+    static_context* sctx2 = Unmarshaller::getInternalStaticContext(sctx);
+    tm = sctx2->get_typemanager();
+  }
+
+  zstring& ns = Unmarshaller::getInternalString(uri);
+  zstring& local = Unmarshaller::getInternalString(localName);
+
+  store::Item_t qname;
+  GENV_ITEMFACTORY->createQName(qname, ns, "", local);
+
+  xqtref_t type = tm->create_named_type(qname, quant, QueryLoc::null, false);
+
+  return Unmarshaller::createSequenceType(type.getp());
+}
+
+
+SequenceType SequenceType::createStructuredItemType(Quantifier quant)
+{
+  RootTypeManager& rtm = GENV_TYPESYSTEM;
+
+  switch (quant)
+  {
+  case QUANT_ONE:
+    return Unmarshaller::createSequenceType(rtm.STRUCTURED_ITEM_TYPE_ONE.getp());
+  case QUANT_QUESTION:
+    return Unmarshaller::createSequenceType(rtm.STRUCTURED_ITEM_TYPE_QUESTION.getp());
+  case QUANT_PLUS:
+    return Unmarshaller::createSequenceType(rtm.STRUCTURED_ITEM_TYPE_PLUS.getp());
+  case QUANT_STAR:
+    return Unmarshaller::createSequenceType(rtm.STRUCTURED_ITEM_TYPE_STAR.getp());
+  default:
+    ZORBA_ASSERT(false);
+  }
+}
+
+
+SequenceType SequenceType::createAnyNodeType(Quantifier quant)
+{
+  RootTypeManager& rtm = GENV_TYPESYSTEM;
+
+  switch (quant)
+  {
+  case QUANT_ONE:
+    return Unmarshaller::createSequenceType(rtm.ANY_NODE_TYPE_ONE.getp());
+  case QUANT_QUESTION:
+    return Unmarshaller::createSequenceType(rtm.ANY_NODE_TYPE_QUESTION.getp());
+  case QUANT_PLUS:
+    return Unmarshaller::createSequenceType(rtm.ANY_NODE_TYPE_PLUS.getp());
+  case QUANT_STAR:
+    return Unmarshaller::createSequenceType(rtm.ANY_NODE_TYPE_STAR.getp());
+  default:
+    ZORBA_ASSERT(false);
+  }
+}
+
+
+SequenceType SequenceType::createDocumentType(
+    const SequenceType& contentType,
+    Quantifier quant)
+{
+  const XQType* contentType2 = Unmarshaller::getInternalType(contentType);
+
+  TypeManager* tm = (contentType2 == NULL ?
+                     &GENV_TYPESYSTEM :
+                     contentType2->get_manager());
+
+  store::Item_t qname;
+
+  xqtref_t res = tm->create_node_type(store::StoreConsts::documentNode,
+                                      qname,
+                                      contentType2,
+                                      quant,
+                                      false,
+                                      false);
+
+  return Unmarshaller::createSequenceType(res.getp());
+}
+
+
+SequenceType SequenceType::createElementType(
+    const StaticContext_t& sctx,
+    const String& nodeUri,
+    const String& nodeLocalName,
+    const String& typeUri,
+    const String& typeLocalName,
+    bool nillable,
+    Quantifier quant)
+{
+  TypeManager* tm;
+
+  if (sctx == NULL)
+  {
+    tm = &GENV_TYPESYSTEM;
+  }
+  else
+  {
+    static_context* sctx2 = Unmarshaller::getInternalStaticContext(sctx);
+    tm = sctx2->get_typemanager();
+  }
+
+  zstring& nodeNS = Unmarshaller::getInternalString(nodeUri);
+  zstring& nodeLocal = Unmarshaller::getInternalString(nodeLocalName);
+  store::Item_t nodeQName;
+
+  if (!nodeLocal.empty())
+    GENV_ITEMFACTORY->createQName(nodeQName, nodeNS, "", nodeLocal);
+
+  zstring& typeNS = Unmarshaller::getInternalString(typeUri);
+  zstring& typeLocal = Unmarshaller::getInternalString(typeLocalName);
+  store::Item_t typeQName;
+  xqtref_t contentType;
+
+  if (!typeLocal.empty())
+  {
+    GENV_ITEMFACTORY->createQName(typeQName, typeNS, "", typeLocal);
+
+    contentType = tm->create_named_type(typeQName, QUANT_ONE, QueryLoc::null, false);
+
+    if (contentType == NULL)
+      return Unmarshaller::createSequenceType(NULL);
+  }
+
+  xqtref_t res = tm->create_node_type(store::StoreConsts::elementNode,
+                                      nodeQName,
+                                      contentType,
+                                      quant,
+                                      nillable,
+                                      false);
+
+  return Unmarshaller::createSequenceType(res.getp());
+}
+
+
+SequenceType SequenceType::createSchemaElementType(
+    const StaticContext_t& sctx,
+    const String& uri,
+    const String& localName,
+    Quantifier quant)
+{
+  ZORBA_ASSERT(sctx != NULL);
+
+  static_context* sctx2 = Unmarshaller::getInternalStaticContext(sctx);
+
+  TypeManager* tm = sctx2->get_typemanager();
+
+  zstring& ns = Unmarshaller::getInternalString(uri);
+  zstring& local = Unmarshaller::getInternalString(localName);
+  store::Item_t qname;
+
+  ZORBA_ASSERT(!local.empty());
+
+  GENV_ITEMFACTORY->createQName(qname, ns, "", local);
+
+  try
+  {
+    xqtref_t res = tm->create_schema_element_type(qname, quant, QueryLoc::null);
+
+    return Unmarshaller::createSequenceType(res.getp());
+  }
+  catch (...)
+  {
+    return Unmarshaller::createSequenceType(NULL);
+  }
+}
+
+
+SequenceType SequenceType::createAttributeType(
+    const StaticContext_t& sctx,
+    const String& nodeUri,
+    const String& nodeLocalName,
+    const String& typeUri,
+    const String& typeLocalName,
+    Quantifier quant)
+{
+  TypeManager* tm;
+
+  if (sctx == NULL)
+  {
+    tm = &GENV_TYPESYSTEM;
+  }
+  else
+  {
+    static_context* sctx2 = Unmarshaller::getInternalStaticContext(sctx);
+    tm = sctx2->get_typemanager();
+  }
+
+  zstring& nodeNS = Unmarshaller::getInternalString(nodeUri);
+  zstring& nodeLocal = Unmarshaller::getInternalString(nodeLocalName);
+  store::Item_t nodeQName;
+
+  if (!nodeLocal.empty())
+    GENV_ITEMFACTORY->createQName(nodeQName, nodeNS, "", nodeLocal);
+
+  zstring& typeNS = Unmarshaller::getInternalString(typeUri);
+  zstring& typeLocal = Unmarshaller::getInternalString(typeLocalName);
+  store::Item_t typeQName;
+  xqtref_t contentType;
+
+  if (!typeLocal.empty())
+  {
+    GENV_ITEMFACTORY->createQName(typeQName, typeNS, "", typeLocal);
+
+    contentType = tm->create_named_type(typeQName, QUANT_ONE, QueryLoc::null, false);
+
+    if (contentType == NULL)
+      return Unmarshaller::createSequenceType(NULL);
+  }
+
+  xqtref_t res = tm->create_node_type(store::StoreConsts::attributeNode,
+                                      nodeQName,
+                                      contentType,
+                                      quant,
+                                      false,
+                                      false);
+
+  return Unmarshaller::createSequenceType(res.getp());
+}
+
+
+SequenceType SequenceType::createSchemaAttributeType(
+    const StaticContext_t& sctx,
+    const String& uri,
+    const String& localName,
+    Quantifier quant)
+{
+  ZORBA_ASSERT(sctx != NULL);
+
+  static_context* sctx2 = Unmarshaller::getInternalStaticContext(sctx);
+
+  TypeManager* tm = sctx2->get_typemanager();
+
+  zstring& ns = Unmarshaller::getInternalString(uri);
+  zstring& local = Unmarshaller::getInternalString(localName);
+  store::Item_t qname;
+
+  ZORBA_ASSERT(!local.empty());
+
+  GENV_ITEMFACTORY->createQName(qname, ns, "", local);
+
+  try
+  {
+    xqtref_t res = tm->create_schema_attribute_type(qname, quant, QueryLoc::null);
+
+    return Unmarshaller::createSequenceType(res.getp());
+  }
+  catch (...)
+  {
+    return Unmarshaller::createSequenceType(NULL);
+  }
+}
+
+
+SequenceType SequenceType::createPIType(Quantifier quant)
+{
+  TypeManager* tm = &GENV_TYPESYSTEM;
+
+  xqtref_t res = tm->create_node_type(store::StoreConsts::piNode,
+                                      NULL,
+                                      NULL,
+                                      quant,
+                                      false,
+                                      false);
+
+  return Unmarshaller::createSequenceType(res.getp());
+}
+
+
+SequenceType SequenceType::createTextType(Quantifier quant)
+{
+  TypeManager* tm = &GENV_TYPESYSTEM;
+
+  xqtref_t res = tm->create_node_type(store::StoreConsts::textNode,
+                                      NULL,
+                                      NULL,
+                                      quant,
+                                      false,
+                                      false);
+
+  return Unmarshaller::createSequenceType(res.getp());
+}
+
+
+SequenceType SequenceType::createCommentType(Quantifier quant)
+{
+  TypeManager* tm = &GENV_TYPESYSTEM;
+
+  xqtref_t res = tm->create_node_type(store::StoreConsts::commentNode,
+                                      NULL,
+                                      NULL,
+                                      quant,
+                                      false,
+                                      false);
+
+  return Unmarshaller::createSequenceType(res.getp());
+}
+
+
+SequenceType SequenceType::createNamespaceType(Quantifier quant)
+{
+  TypeManager* tm = &GENV_TYPESYSTEM;
+
+  xqtref_t res = tm->create_node_type(store::StoreConsts::namespaceNode,
+                                      NULL,
+                                      NULL,
+                                      quant,
+                                      false,
+                                      false);
+
+  return Unmarshaller::createSequenceType(res.getp());
+}
+
+
+SequenceType SequenceType::createJSONItemType(Quantifier q)
+{
+  TypeManager* tm = &GENV_TYPESYSTEM;
+
+  xqtref_t res = tm->create_json_type(store::StoreConsts::jsonItem, q);
+
+  return Unmarshaller::createSequenceType(res.getp());
+}
+
+
+SequenceType SequenceType::createJSONObjectType(Quantifier q)
+{
+  TypeManager* tm = &GENV_TYPESYSTEM;
+
+  xqtref_t res = tm->create_json_type(store::StoreConsts::jsonObject, q);
+
+  return Unmarshaller::createSequenceType(res.getp());
+}
+
+
+SequenceType SequenceType::createJSONArrayType(Quantifier q)
+{
+  TypeManager* tm = &GENV_TYPESYSTEM;
+
+  xqtref_t res = tm->create_json_type(store::StoreConsts::jsonArray, q);
+
+  return Unmarshaller::createSequenceType(res.getp());
+}
+
+
+
+/*******************************************************************************
+
+********************************************************************************/
+SequenceType::SequenceType()
+  :
+  theType(NULL)
+{
+}
+
+
+SequenceType::SequenceType(const XQType* type)
+  :
+  theType(type)
+{
+  if (theType)
+    RCHelper::addReference(theType);
+}
+
+
+SequenceType::SequenceType(const SequenceType& other)
+  :
+  theType(other.theType)
+{
+  if (theType)
+    RCHelper::addReference(theType);
+}
+
+
+SequenceType::~SequenceType()
+{
+  if (theType)
+  {
+    RCHelper::removeReference(const_cast<XQType*>(theType));
+    theType = NULL;
+  }
+}
+
+
+bool SequenceType::isValid() const
+{
+  return theType != NULL;
+}
+
+
+SequenceType::Quantifier SequenceType::getQuantifier() const
+{
+  return (theType->get_quantifier());
+}
+
+
+SequenceType::Kind SequenceType::getKind() const
+{
+  switch(theType->type_kind()) 
+  {
+  case XQType::EMPTY_KIND:
+  {
+    return EMPTY_TYPE;
+  }
+  case XQType::ITEM_KIND:
+  {
+    return ITEM_TYPE;
+  }
+  case XQType::ATOMIC_TYPE_KIND:
+  {
+    return ATOMIC_OR_UNION_TYPE;
+  }
+  case XQType::USER_DEFINED_KIND:
+  {
+    if (theType->isGenAtomicAny())
+      return ATOMIC_OR_UNION_TYPE;
+    else
+      return INVALID_TYPE;
+  }
+  case XQType::STRUCTURED_ITEM_KIND:
+  {
+    return STRUCTURED_ITEM_TYPE;
+  }
+  case XQType::NODE_TYPE_KIND:
+  {
+    const NodeXQType* nt = static_cast<const NodeXQType*>(theType);
+
+    switch (nt->get_node_kind()) 
+    {
+    case store::StoreConsts::anyNode:
+    {
+      return NODE_TYPE;
+    }
+    case store::StoreConsts::documentNode:
+    {
+      return DOCUMENT_TYPE;
+    }
+    case store::StoreConsts::elementNode:
+    {
+      if (nt->is_schema_test())
+        return SCHEMA_ELEMENT_TYPE;
+      else
+        return ELEMENT_TYPE;
+    }
+    case store::StoreConsts::attributeNode:
+    {
+      if (nt->is_schema_test())
+        return SCHEMA_ATTRIBUTE_TYPE;
+      else
+        return ATTRIBUTE_TYPE;
+    }
+    case store::StoreConsts::textNode:
+    {
+      return TEXT_TYPE;
+    }
+    case store::StoreConsts::commentNode:
+    {
+      return COMMENT_TYPE;
+    }
+    case store::StoreConsts::piNode:
+    {
+      return PI_TYPE;
+    }
+    case store::StoreConsts::namespaceNode:
+    {
+      return NAMESPACE_TYPE;
+    }
+    default:
+    {
+      ZORBA_ASSERT(false);
+      return INVALID_TYPE;
+    }
+    }
+  }
+  case XQType::JSON_TYPE_KIND:
+  {
+    const JSONXQType* t = static_cast<const JSONXQType*>(theType);
+
+    switch (t->get_json_kind())
+    {
+    case store::StoreConsts::jsonItem:
+      return JSON_ITEM_TYPE;
+
+    case store::StoreConsts::jsonObject:
+      return JSON_OBJECT_TYPE;
+
+    case store::StoreConsts::jsonArray:
+      return JSON_ARRAY_TYPE;
+
+    default:
+      ZORBA_ASSERT(false);
+    }
+  }
+  case XQType::UNTYPED_KIND:
+  case XQType::ANY_TYPE_KIND:
+  case XQType::ANY_SIMPLE_TYPE_KIND:
+  default:
+  {
+    return INVALID_TYPE;
+  }
+  }
+}
+
+
+String SequenceType::getTypeUri() const
+{
+  switch (theType->type_kind())
+  {
+  case XQType::ATOMIC_TYPE_KIND:
+  case XQType::USER_DEFINED_KIND:
+  {
+    store::Item_t qname = theType->getQName();
+
+    return Unmarshaller::newString(qname->getNamespace());
+  }
+  default:
+  {
+    return String("");
+  }
+  }
+}
+
+
+String SequenceType::getTypeLocalName() const
+{
+  switch (theType->type_kind())
+  {
+  case XQType::ATOMIC_TYPE_KIND:
+  case XQType::USER_DEFINED_KIND:
+  {
+    store::Item_t qname = theType->getQName();
+
+    return Unmarshaller::newString(qname->getLocalName());
+  }
+  default:
+  {
+    return String("");
+  }
+  }
+}
+
+
+String SequenceType::getNodeUri() const
+{
+  if (theType->type_kind() == XQType::NODE_TYPE_KIND)
+  {
+    const NodeXQType* nt = static_cast<const NodeXQType*>(theType);
+
+    if (nt->get_node_name() != NULL)
+      return Unmarshaller::newString(nt->get_node_name()->getNamespace());
+  }
+
+  return String("");
+}
+
+
+String SequenceType::getNodeLocalName() const
+{
+  if (theType->type_kind() == XQType::NODE_TYPE_KIND)
+  {
+    const NodeXQType* nt = static_cast<const NodeXQType*>(theType);
+
+    if (nt->get_node_name() != NULL)
+      return Unmarshaller::newString(nt->get_node_name()->getLocalName());
+  }
+
+  return String("");
+}
+
+
+String SequenceType::getContentTypeUri() const
+{
+  switch (theType->type_kind())
+  {
+  case XQType::NODE_TYPE_KIND:
+  {
+    const NodeXQType* nt = static_cast<const NodeXQType*>(theType);
+
+    store::StoreConsts::NodeKind nodeKind = nt->get_node_kind();
+
+    if (nodeKind == store::StoreConsts::elementNode ||
+        nodeKind == store::StoreConsts::attributeNode)
+    {
+      const XQType* contentType = nt->get_content_type();
+
+      if (contentType != NULL)
+        return Unmarshaller::newString(contentType->getQName()->getNamespace());
+    }
+  }
+  default:
+  {
+    return String("");
+  }
+  }
+}
+
+
+String SequenceType::getContentTypeLocalName() const
+{
+  switch (theType->type_kind())
+  {
+  case XQType::NODE_TYPE_KIND:
+  {
+    const NodeXQType* nt = static_cast<const NodeXQType*>(theType);
+
+    store::StoreConsts::NodeKind nodeKind = nt->get_node_kind();
+
+    if (nodeKind == store::StoreConsts::elementNode ||
+        nodeKind == store::StoreConsts::attributeNode)
+    {
+      const XQType* contentType = nt->get_content_type();
+
+      if (contentType != NULL)
+        return Unmarshaller::newString(contentType->getQName()->getLocalName());
+    }
+  }
+  default:
+  {
+    return String("");
+  }
+  }
+}
+
+
+bool SequenceType::isWildcard() const
+{
+  if (theType->type_kind() == XQType::NODE_TYPE_KIND)
+  {
+    const NodeXQType* nt = static_cast<const NodeXQType*>(theType);
+
+    if (nt->get_node_name() == NULL)
+      return true;
+  }
+
+  return false;
+}
+
+
+bool SequenceType::isSchemaTest() const
+{
+  if (theType->type_kind() == XQType::NODE_TYPE_KIND)
+  {
+    const NodeXQType* nt = static_cast<const NodeXQType*>(theType);
+
+    return nt->is_schema_test();
+  }
+
+  return false;
+}
+
+
+std::ostream& SequenceType::emit(std::ostream& os) const 
+{
+  return os << theType->toSchemaString();
+}
+
+
+}
+
+
+#endif
+/* vim:set et sw=2 ts=2: */

=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp	2013-08-16 13:00:06 +0000
+++ src/api/staticcontextimpl.cpp	2013-09-24 21:48:10 +0000
@@ -800,18 +800,17 @@
 /*******************************************************************************
  URI Mapper
 *******************************************************************************/
-void
-StaticContextImpl::registerURIMapper(URIMapper* aMapper)
+void StaticContextImpl::registerURIMapper(URIMapper* aMapper)
 {
   // QQQ memory management?
   theCtx->add_uri_mapper(new URIMapperWrapper(*aMapper));
 }
 
+
 /*******************************************************************************
  URL Resolver
 *******************************************************************************/
-void
-StaticContextImpl::registerURLResolver(URLResolver* aResolver)
+void StaticContextImpl::registerURLResolver(URLResolver* aResolver)
 {
   // QQQ memory management?
   theCtx->add_url_resolver(new URLResolverWrapper(*aResolver));
@@ -822,15 +821,13 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void
-StaticContextImpl::setDocumentType(const String& aDocUri, TypeIdentifier_t type)
+void StaticContextImpl::setDocumentType(const String& aDocUri, const SequenceType& type)
 {
-  xqtref_t xqType = NULL;
-  if (type != NULL) {
-    xqType = theCtx->get_typemanager()->create_type(*type);
-  }
-
+  xqtref_t xqType = Unmarshaller::getInternalType(type);
   const zstring& uri = Unmarshaller::getInternalString(aDocUri);
+
+  ZORBA_ASSERT(xqType != NULL);
+
   theCtx->bind_document(uri, xqType);
 }
 
@@ -838,33 +835,27 @@
 /*******************************************************************************
 
 ********************************************************************************/
-TypeIdentifier_t
-StaticContextImpl::getDocumentType(const String& aDocUri) const
+SequenceType StaticContextImpl::getDocumentType(const String& aDocUri) const
 {
   const zstring& uri = Unmarshaller::getInternalString(aDocUri);
   xqtref_t xqType = theCtx->lookup_document(uri);
-  TypeIdentifier_t type = NULL;
-  if (xqType == NULL)
-  {
-    return NULL;
-  }
 
-  return TypeOps::get_type_identifier(theCtx->get_typemanager(), *xqType);
+  return Unmarshaller::createSequenceType(xqType.getp());
 }
 
 
 /*******************************************************************************
 
 ********************************************************************************/
-void
-StaticContextImpl::setCollectionType(const String& aCollectionUri, TypeIdentifier_t type)
+void StaticContextImpl::setCollectionType(
+    const String& aCollectionUri,
+    const SequenceType& type)
 {
-  xqtref_t xqType = NULL;
-  if (type != NULL)
-  {
-    xqType = theCtx->get_typemanager()->create_type(*type);
-  }
+  xqtref_t xqType = Unmarshaller::getInternalType(type);
   zstring& uri = Unmarshaller::getInternalString(aCollectionUri);
+
+  ZORBA_ASSERT(xqType != NULL);
+
   theCtx->bind_w3c_collection(uri, xqType);
 }
 
@@ -872,20 +863,17 @@
 /*******************************************************************************
 
 ********************************************************************************/
-TypeIdentifier_t
-StaticContextImpl::getCollectionType(const String& aCollectionUri) const
+SequenceType StaticContextImpl::getCollectionType(const String& uri) const
 {
 
-  const zstring& uri = Unmarshaller::getInternalString(aCollectionUri);
-  const XQType* xqType = theCtx->lookup_w3c_collection(uri);
-  TypeIdentifier_t type = NULL;
-  if (xqType == NULL)
-  {
-    return NULL;
-  }
-  return TypeOps::get_type_identifier(theCtx->get_typemanager(), *xqType);
+  const zstring& uri2 = Unmarshaller::getInternalString(uri);
+
+  const XQType* xqType = theCtx->lookup_w3c_collection(uri2);
+
+  return Unmarshaller::createSequenceType(xqType);
 }
 
+
 /*******************************************************************************
 
 ********************************************************************************/
@@ -1041,14 +1029,12 @@
 /*******************************************************************************
 
 ********************************************************************************/
-void
-StaticContextImpl::setContextItemStaticType(TypeIdentifier_t type)
+void StaticContextImpl::setContextItemStaticType(const SequenceType& type)
 {
-  xqtref_t xqType = NULL;
-  if (type != NULL)
-  {
-    xqType = theCtx->get_typemanager()->create_type(*type);
-  }
+  xqtref_t xqType = Unmarshaller::getInternalType(type);
+
+  ZORBA_ASSERT(xqType != NULL);
+
   theCtx->set_context_item_type(xqType, QueryLoc::null);
 }
 
@@ -1056,15 +1042,11 @@
 /*******************************************************************************
 
 ********************************************************************************/
-TypeIdentifier_t
-StaticContextImpl::getContextItemStaticType() const
+SequenceType StaticContextImpl::getContextItemStaticType() const
 {
   xqtref_t type = theCtx->get_context_item_type();
-  if (type == NULL)
-  {
-    return NULL;
-  }
-  return TypeOps::get_type_identifier(theCtx->get_typemanager(), *type);
+
+  return Unmarshaller::createSequenceType(type.getp());
 }
 
 

=== modified file 'src/api/staticcontextimpl.h'
--- src/api/staticcontextimpl.h	2013-08-06 08:34:43 +0000
+++ src/api/staticcontextimpl.h	2013-09-24 21:48:10 +0000
@@ -17,7 +17,6 @@
 #ifndef ZORBA_API_STATIC_CONTEXT_IMPL_H
 #define ZORBA_API_STATIC_CONTEXT_IMPL_H
 
-#include <zorba/typeident.h>
 #include <zorba/static_context.h>
 #include <zorba/api_shared_types.h>
 #include <map>
@@ -187,9 +186,9 @@
   registerModule(ExternalModule* aModule);
 
   virtual void
-  setDocumentType(const String& aDocUri, TypeIdentifier_t type);
+  setDocumentType(const String& aDocUri, const SequenceType& type);
 
-  virtual TypeIdentifier_t
+  virtual SequenceType
   getDocumentType(const String& aDocUri) const;
 
   virtual void
@@ -199,9 +198,9 @@
   registerURLResolver(URLResolver* aResolver);
 
   virtual void
-  setCollectionType(const String& aCollectionUri, TypeIdentifier_t type);
+  setCollectionType(const String& aCollectionUri, const SequenceType& type);
 
-  virtual TypeIdentifier_t
+  virtual SequenceType
   getCollectionType(const String& aCollectionUri) const;
 
   virtual bool
@@ -229,9 +228,9 @@
       std::vector<Function_t>& aFunctions) const;
 
   virtual void
-  setContextItemStaticType(TypeIdentifier_t type);
+  setContextItemStaticType(const SequenceType& type);
 
-  virtual TypeIdentifier_t
+  virtual SequenceType
   getContextItemStaticType() const;
 
   virtual void

=== removed file 'src/api/typeidentimpl.cpp'
--- src/api/typeidentimpl.cpp	2013-06-15 02:57:08 +0000
+++ src/api/typeidentimpl.cpp	1970-01-01 00:00:00 +0000
@@ -1,397 +0,0 @@
-/*
- * 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 "stdafx.h"
-
-#ifndef ZORBA_TYPEIDENT_IMPL_H
-#define ZORBA_TYPEIDENT_IMPL_H
-
-#include <zorba/typeident.h>
-
-#include "diagnostics/assert.h"
-
-namespace zorba {
-
-TypeIdentifier::TypeIdentifier()
-  :
-  m_kind(IdentTypes::INVALID_TYPE),
-  m_quantifier(IdentTypes::QUANT_ONE),
-  m_uri(""),
-  m_uriWildcard(false),
-  m_localName(""),
-  m_localNameWildcard(false),
-  m_contentType()
-{
-}
-
-
-TypeIdentifier::~TypeIdentifier()
-{
-}
-
-
-IdentTypes::kind_t TypeIdentifier::getKind() const
-{
-  return m_kind;
-}
-
-
-IdentTypes::quantifier_t TypeIdentifier::getQuantifier() const
-{
-  return m_quantifier;
-}
-
-
-const String& TypeIdentifier::getUri() const
-{
-  return m_uri;
-}
-
-
-bool TypeIdentifier::isUriWildcard() const
-{
-  return m_uriWildcard;
-}
-
-
-const String& TypeIdentifier::getLocalName() const
-{
-  return m_localName;
-}
-
-
-bool TypeIdentifier::isLocalNameWildcard() const
-{
-  return m_localNameWildcard;
-}
-
-
-TypeIdentifier_t TypeIdentifier::getContentType() const
-{
-  return m_contentType;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createNamedType(
-    const String& uri,
-    const String& localName,
-    IdentTypes::quantifier_t quantifier)
-{
-    TypeIdentifier_t ti(new TypeIdentifier());
-    ti->m_kind = IdentTypes::NAMED_TYPE;
-    ti->m_quantifier = quantifier;
-    ti->m_uri = uri;
-    ti->m_localName = localName;
-
-    return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createElementType(
-    const String& uri,
-    bool uriWildcard,
-    const String& localName,
-    bool localNameWildcard,
-    TypeIdentifier_t contentType,
-    IdentTypes::quantifier_t quantifier)
-{
-  // not sure why those were 2 different flags, we maintain 2 flags for
-  // compatibility, but they always need to be the same
-  ZORBA_ASSERT(uriWildcard == localNameWildcard);
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::ELEMENT_TYPE;
-  ti->m_quantifier = quantifier;
-  ti->m_uri = uri;
-  ti->m_uriWildcard = uriWildcard;
-  ti->m_localName = localName;
-  ti->m_localNameWildcard = localNameWildcard;
-  ti->m_contentType = contentType;
-
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createAttributeType(
-    const String& uri,
-    bool uriWildcard,
-    const String& localName,
-    bool localNameWildcard,
-    TypeIdentifier_t contentType,
-    IdentTypes::quantifier_t quantifier)
-{
-    // not sure why those were 2 different flags, we maintain 2 flags for
-    // compatibility, but they always need to be the same
-    ZORBA_ASSERT(uriWildcard == localNameWildcard);
-    TypeIdentifier_t ti(new TypeIdentifier());
-    ti->m_kind = IdentTypes::ATTRIBUTE_TYPE;
-    ti->m_quantifier = quantifier;
-    ti->m_uri = uri;
-    ti->m_uriWildcard = uriWildcard;
-    ti->m_localName = localName;
-    ti->m_localNameWildcard = localNameWildcard;
-    ti->m_contentType = contentType;
-
-    return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createDocumentType(
-    TypeIdentifier_t contentType,
-    IdentTypes::quantifier_t quantifier)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::DOCUMENT_TYPE;
-  ti->m_quantifier = quantifier;
-  ti->m_contentType = contentType;
-  
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createPIType(IdentTypes::quantifier_t quantifier)
-{
-    TypeIdentifier_t ti(new TypeIdentifier());
-    ti->m_kind = IdentTypes::PI_TYPE;
-    ti->m_quantifier = quantifier;
-
-    return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createTextType(IdentTypes::quantifier_t quantifier)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::TEXT_TYPE;
-  ti->m_quantifier = quantifier;
-
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createCommentType(IdentTypes::quantifier_t quantifier)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::COMMENT_TYPE;
-  ti->m_quantifier = quantifier;
-
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createNamespaceType(IdentTypes::quantifier_t quantifier)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::NAMESPACE_TYPE;
-  ti->m_quantifier = quantifier;
-
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createAnyNodeType(IdentTypes::quantifier_t quantifier)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::ANY_NODE_TYPE;
-  ti->m_quantifier = quantifier;
-
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createStructuredItemType(IdentTypes::quantifier_t q)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::STRUCTURED_ITEM_TYPE;
-  ti->m_quantifier = q;
-
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createJSONItemType(IdentTypes::quantifier_t q)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::JSON_ITEM_TYPE;
-  ti->m_quantifier = q;
-
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createJSONObjectType(IdentTypes::quantifier_t q)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::JSON_OBJECT_TYPE;
-  ti->m_quantifier = q;
-
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createJSONArrayType(IdentTypes::quantifier_t q)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::JSON_ARRAY_TYPE;
-  ti->m_quantifier = q;
-
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createItemType(IdentTypes::quantifier_t quantifier)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::ITEM_TYPE;
-  ti->m_quantifier = quantifier;
-
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createEmptyType()
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::EMPTY_TYPE;
-  ti->m_quantifier = IdentTypes::QUANT_ONE;
-
-  return ti;
-}
-
-TypeIdentifier_t TypeIdentifier::createSchemaElementType(
-    const String& uri,
-    const String& localName,
-    IdentTypes::quantifier_t quantifier)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::SCHEMA_ELEMENT_TYPE;
-  ti->m_quantifier = quantifier;
-  ti->m_uri = uri;
-  ti->m_uriWildcard = false;
-  ti->m_localName = localName;
-  ti->m_localNameWildcard = false;
-  
-  return ti;
-}
-
-
-TypeIdentifier_t TypeIdentifier::createSchemaAttributeType(
-    const String& uri,
-    const String& localName,
-    IdentTypes::quantifier_t quantifier)
-{
-  TypeIdentifier_t ti(new TypeIdentifier());
-  ti->m_kind = IdentTypes::SCHEMA_ATTRIBUTE_TYPE;
-  ti->m_quantifier = quantifier;
-  ti->m_uri = uri;
-  ti->m_uriWildcard = false;
-  ti->m_localName = localName;
-  ti->m_localNameWildcard = false;
-  
-  return ti;
-}
-
-
-std::ostream& TypeIdentifier::emit(std::ostream& os) const 
-{
-  emitItemType(os);
-  return os << m_quantifier;
-}
-
-
-std::ostream& TypeIdentifier::emitItemType(std::ostream& os) const 
-{
-  if (m_kind == IdentTypes::NAMED_TYPE) 
-  {
-    return emitName(os);
-  }
-
-  os << m_kind;
-
-  switch (m_kind) 
-  {
-    case IdentTypes::DOCUMENT_TYPE:
-      os << "(";
-      if (m_contentType != NULL)
-      {
-        os << m_contentType;
-      }
-      return os << ")";
-
-    case IdentTypes::ELEMENT_TYPE:
-    case IdentTypes::ATTRIBUTE_TYPE:
-      os << "(";
-      if (m_uriWildcard) 
-      {
-        os << "*";
-      }
-      else
-      {
-        emitName(os);
-      }
-      if (! m_contentType.isNull()) 
-      {
-        os << "," << m_contentType;
-      }
-      return os << ")";
-
-    case IdentTypes::SCHEMA_ELEMENT_TYPE:
-    case IdentTypes::SCHEMA_ATTRIBUTE_TYPE:
-      os << "(";
-      emitName(os);
-      return os << ")";
-
-    case IdentTypes::ANY_NODE_TYPE:
-    case IdentTypes::COMMENT_TYPE:
-    case IdentTypes::EMPTY_TYPE:
-    case IdentTypes::ITEM_TYPE:
-    case IdentTypes::PI_TYPE:
-    case IdentTypes::TEXT_TYPE:
-      return os << "()";
-
-    case IdentTypes::INVALID_TYPE:
-      return os;
-
-    case IdentTypes::NAMED_TYPE:
-    default:
-      ZORBA_ASSERT(false);
-  }
-}
-
-
-std::ostream& TypeIdentifier::emitName(std::ostream& os) const 
-{
-    return os << "{" << m_uri << "}" << m_localName;
-}
-
-}
-
-namespace std 
-{
-
-ostream& operator<<(ostream& o, const zorba::TypeIdentifier& ti) 
-{
-  return ti.emit(o);
-}
-
-ostream& operator<<(ostream& o, const zorba::TypeIdentifier_t ti) 
-{
-  return ti->emit(o);
-}
-
-}
-
-
-#endif
-/* vim:set et sw=2 ts=2: */

=== modified file 'src/api/unmarshaller.cpp'
--- src/api/unmarshaller.cpp	2013-08-01 17:23:58 +0000
+++ src/api/unmarshaller.cpp	2013-09-24 21:48:10 +0000
@@ -79,6 +79,18 @@
 }
 
 
+const XQType* Unmarshaller::getInternalType(const SequenceType& type)
+{
+  return type.theType;
+}
+
+
+SequenceType Unmarshaller::createSequenceType(const XQType* type)
+{
+  return type;
+}
+
+
 #define THE_STRING(STRING_OBJ)                                        \
   (const_cast<zstring*>(                                              \
     reinterpret_cast<zstring const*>( &(STRING_OBJ).string_storage_ ) \

=== modified file 'src/api/unmarshaller.h'
--- src/api/unmarshaller.h	2013-02-07 17:24:36 +0000
+++ src/api/unmarshaller.h	2013-09-24 21:48:10 +0000
@@ -24,16 +24,22 @@
 #include "common/shared_types.h"
 #include "zorbatypes/zstring.h"
 
-namespace zorba {
+namespace zorba 
+{
 
 class ZORBA_DLL_PUBLIC Unmarshaller 
 {
 public:
   static store::Item* getInternalItem(const Item& aItem);
 
+  static const XQType* getInternalType(const SequenceType& type);
+
+  static SequenceType createSequenceType(const XQType* type);
+
   static zstring& getInternalString(const String& aString);
 
-  static String newString( zstring const &s ) {
+  static String newString(const zstring& s)
+  {
     String::zstring_ptr const p = { &s };
     return String( p );
   }

=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp	2013-09-17 21:12:49 +0000
+++ src/compiler/codegen/plan_visitor.cpp	2013-09-24 21:48:10 +0000
@@ -671,7 +671,7 @@
 
     xqtref_t exprType = initExpr->get_return_type();
 
-    if (exprType->get_quantifier() == TypeConstants::QUANT_ONE)
+    if (exprType->get_quantifier() == SequenceType::QUANT_ONE)
       singleItem = true;
   }
 
@@ -714,7 +714,7 @@
                            (varExpr->get_kind() == var_expr::local_var),
                            exprIter);
 
-  if (exprType->get_quantifier() == TypeConstants::QUANT_ONE)
+  if (exprType->get_quantifier() == SequenceType::QUANT_ONE)
     iter->setSingleItem();
 
   push_itstack(iter);
@@ -1028,7 +1028,7 @@
           {
             xqtref_t domainType = domExpr->get_return_type();
 
-            if (domainType->get_quantifier() != TypeConstants::QUANT_ONE)
+            if (domainType->get_quantifier() != SequenceType::QUANT_ONE)
               ++numForClauses;
           }
 
@@ -1257,9 +1257,9 @@
     clauseVarMap->theVarExprs.push_back(lc->get_var());
     clauseVarMap->theVarRebinds.push_back(varRebind);
 
-    if (domType->get_quantifier() == TypeConstants::QUANT_ONE)
+    if (domType->get_quantifier() == SequenceType::QUANT_ONE)
       varRebind->theIsFakeLetVar = true;
-    else if (domType->get_quantifier() == TypeConstants::QUANT_QUESTION)
+    else if (domType->get_quantifier() == SequenceType::QUANT_QUESTION)
       varRebind->theIsSingleItemLetVar = true;
 
     break;
@@ -2766,7 +2766,7 @@
     if (typeName != NULL)
     {
       prd->setType(sctx->get_typemanager()->create_named_type(typeName,
-                                                              TypeConstants::QUANT_ONE,
+                                                              SequenceType::QUANT_ONE,
                                                               loc,
                                                               XPTY0004));
     }
@@ -2989,7 +2989,7 @@
     {
       axisItep->setType(sctx->get_typemanager()->
                         create_named_type(typeName,
-                                          TypeConstants::QUANT_ONE,
+                                          SequenceType::QUANT_ONE,
                                           qloc));
     }
     axisItep->setNilledAllowed(v.getNilledAllowed());

=== modified file 'src/compiler/expression/expr.cpp'
--- src/compiler/expression/expr.cpp	2013-09-12 08:25:47 +0000
+++ src/compiler/expression/expr.cpp	2013-09-24 21:48:10 +0000
@@ -337,9 +337,9 @@
   cast_base_expr(ccb, sctx, udf, loc, cast_expr_kind, inputExpr, type),
   theAllowsEmtpyInput(allowsEmptyInput)
 {
-  assert(type->get_quantifier() == TypeConstants::QUANT_ONE ||
-         type->get_quantifier() == TypeConstants::QUANT_QUESTION ||
-         type->get_quantifier() == TypeConstants::QUANT_STAR);
+  assert(type->get_quantifier() == SequenceType::QUANT_ONE ||
+         type->get_quantifier() == SequenceType::QUANT_QUESTION ||
+         type->get_quantifier() == SequenceType::QUANT_STAR);
 
   setNonDiscardable(ANNOTATION_TRUE_FIXED);
 }

=== modified file 'src/compiler/expression/expr_base.cpp'
--- src/compiler/expression/expr_base.cpp	2013-05-29 04:17:01 +0000
+++ src/compiler/expression/expr_base.cpp	2013-09-24 21:48:10 +0000
@@ -820,9 +820,9 @@
     return false;
 
   xqtref_t type = e->get_return_type();
-  TypeConstants::quantifier_t q = type->get_quantifier();
+  SequenceType::Quantifier q = type->get_quantifier();
 
-  if (q == TypeConstants::QUANT_ONE || q == TypeConstants::QUANT_QUESTION)
+  if (q == SequenceType::QUANT_ONE || q == SequenceType::QUANT_QUESTION)
     return true;
 
   bool found = false;
@@ -1051,9 +1051,9 @@
   case treat_expr_kind:
   {
     const treat_expr* treatExpr = static_cast<const treat_expr*>(this);
-    TypeConstants::quantifier_t q = treatExpr->get_target_type()->get_quantifier();
+    SequenceType::Quantifier q = treatExpr->get_target_type()->get_quantifier();
 
-    if (q == TypeConstants::QUANT_STAR || q == TypeConstants::QUANT_PLUS)
+    if (q == SequenceType::QUANT_STAR || q == SequenceType::QUANT_PLUS)
     {
       const expr* argExpr = treatExpr->get_input();
       return argExpr->is_map_internal(e, found);
@@ -1065,9 +1065,9 @@
   case promote_expr_kind:
   {
     const promote_expr* promoteExpr = static_cast<const promote_expr*>(this);
-    TypeConstants::quantifier_t q = promoteExpr->get_target_type()->get_quantifier();
+    SequenceType::Quantifier q = promoteExpr->get_target_type()->get_quantifier();
 
-    if (q == TypeConstants::QUANT_STAR || q == TypeConstants::QUANT_PLUS)
+    if (q == SequenceType::QUANT_STAR || q == SequenceType::QUANT_PLUS)
     {
       const expr* argExpr = promoteExpr->get_input();
       return argExpr->is_map_internal(e, found);

=== modified file 'src/compiler/expression/expr_type.cpp'
--- src/compiler/expression/expr_type.cpp	2013-09-19 16:47:08 +0000
+++ src/compiler/expression/expr_type.cpp	2013-09-24 21:48:10 +0000
@@ -52,7 +52,7 @@
     TypeManager* tm,
     store::StoreConsts::NodeKind nodekind,
     const store::Item_t& nodename,
-    TypeConstants::quantifier_t quant,
+    SequenceType::Quantifier quant,
     bool untyped);
 
 
@@ -121,11 +121,11 @@
   {
     flwor_expr* e = static_cast<flwor_expr*>(this);
 
-    TypeConstants::quantifier_t quant = TypeConstants::QUANT_ONE;
+    SequenceType::Quantifier quant = SequenceType::QUANT_ONE;
 
     csize numClauses = e->num_clauses();
 
-    for (csize i = 0; i < numClauses && quant != TypeConstants::QUANT_STAR; ++i)
+    for (csize i = 0; i < numClauses && quant != SequenceType::QUANT_STAR; ++i)
     {
       const flwor_clause* c = e->theClauses[i];
 
@@ -140,12 +140,12 @@
       }
       case flwor_clause::window_clause :
       {
-        quant = TypeConstants::QUANT_STAR;
+        quant = SequenceType::QUANT_STAR;
         break;
       }
       case flwor_clause::where_clause :
       {
-        quant = TypeOps::union_quant(quant, TypeConstants::QUANT_QUESTION);
+        quant = TypeOps::union_quant(quant, SequenceType::QUANT_QUESTION);
         break;
       }
       default:
@@ -202,7 +202,7 @@
 
         if (e->get_forlet_clause()->is_allowing_empty())
         {
-          derivedType = tm->create_type(*derivedType, TypeConstants::QUANT_QUESTION);
+          derivedType = tm->create_type(*derivedType, SequenceType::QUANT_QUESTION);
         }
       }
       else if (varKind == var_expr::wincond_in_var ||
@@ -211,11 +211,11 @@
         // TODO: we can be a little more specific here: if the quantifier of the
         // domain type is PLUS or ONE, then the quantifier of the "current" cond
         // var is ONE.
-        derivedType = tm->create_type(*domainType, TypeConstants::QUANT_QUESTION);
+        derivedType = tm->create_type(*domainType, SequenceType::QUANT_QUESTION);
       }
       else if (varKind == var_expr::non_groupby_var)
       {
-        derivedType = tm->create_type(*domainType, TypeConstants::QUANT_STAR);
+        derivedType = tm->create_type(*domainType, SequenceType::QUANT_STAR);
       }
       else
       {
@@ -373,20 +373,20 @@
     cast_expr* e = static_cast<cast_expr*>(this);
 
     xqtref_t argType = e->theInput->get_return_type();
-    TypeConstants::quantifier_t argQuant = argType->get_quantifier();
-    TypeConstants::quantifier_t targetQuant = e->theTargetType->get_quantifier();
+    SequenceType::Quantifier argQuant = argType->get_quantifier();
+    SequenceType::Quantifier targetQuant = e->theTargetType->get_quantifier();
 
     if (TypeOps::is_equal(tm, *argType, *rtm.EMPTY_TYPE, get_loc()))
     {
-      if (targetQuant == TypeConstants::QUANT_QUESTION ||
-          targetQuant == TypeConstants::QUANT_STAR)
+      if (targetQuant == SequenceType::QUANT_QUESTION ||
+          targetQuant == SequenceType::QUANT_STAR)
         newType = rtm.EMPTY_TYPE;
       else
         newType = rtm.NONE_TYPE;
     }
     else if (e->theTargetType->isAtomicAny())
     {
-      TypeConstants::quantifier_t q = TypeOps::intersect_quant(argQuant, targetQuant);
+      SequenceType::Quantifier q = TypeOps::intersect_quant(argQuant, targetQuant);
 
       newType = tm->create_type(*e->theTargetType, q);
     }
@@ -400,13 +400,13 @@
       if (targetType->isList())
       {
         newType = tm->create_type(*targetType->getListItemType(),
-                                  TypeConstants::QUANT_STAR);
+                                  SequenceType::QUANT_STAR);
       }
       else
       {
         assert(targetType->isAtomicAny() || targetType->isUnion());
 
-        TypeConstants::quantifier_t q = TypeOps::intersect_quant(argQuant, targetQuant);
+        SequenceType::Quantifier q = TypeOps::intersect_quant(argQuant, targetQuant);
 
         newType = tm->create_type(*e->theTargetType, q);
       }
@@ -423,7 +423,7 @@
     xqtref_t input_ptype = TypeOps::prime_type(tm, *input_type);
     xqtref_t target_ptype = TypeOps::prime_type(tm, *e->theTargetType);
 
-    TypeConstants::quantifier_t q =
+    SequenceType::Quantifier q =
     TypeOps::intersect_quant(input_type->get_quantifier(),
                              e->theTargetType->get_quantifier());
 
@@ -446,7 +446,7 @@
     xqtref_t in_ptype = TypeOps::prime_type(tm, *in_type);
     xqtref_t target_ptype = TypeOps::prime_type(tm, *e->theTargetType);
 
-    TypeConstants::quantifier_t q =
+    SequenceType::Quantifier q =
     TypeOps::intersect_quant(in_type->get_quantifier(),
                              e->theTargetType->get_quantifier());
 
@@ -512,7 +512,7 @@
     newType = tm->create_node_type(store::StoreConsts::documentNode,
                                    NULL,
                                    contentType,
-                                   TypeConstants::QUANT_ONE,
+                                   SequenceType::QUANT_ONE,
                                    false,
                                    false);
     break;
@@ -527,7 +527,7 @@
     newType = tm->create_node_type(store::StoreConsts::elementNode,
                                    NULL,
                                    contentType,
-                                   TypeConstants::QUANT_ONE,
+                                   SequenceType::QUANT_ONE,
                                    false,
                                    false);
     break;
@@ -551,7 +551,7 @@
 
     store::StoreConsts::NodeKind nodeKind;
 
-    TypeConstants::quantifier_t q = TypeConstants::QUANT_ONE;
+    SequenceType::Quantifier q = SequenceType::QUANT_ONE;
 
     switch (e->type)
     {
@@ -563,7 +563,7 @@
         newType = t;
 
       else if (t->min_card() == 0)
-        q = TypeConstants::QUANT_QUESTION;
+        q = SequenceType::QUANT_QUESTION;
 
       nodeKind = store::StoreConsts::textNode;
       break;
@@ -593,7 +593,7 @@
     newType = tm->create_node_type(store::StoreConsts::piNode,
                                    NULL,
                                    contentType,
-                                   TypeConstants::QUANT_ONE,
+                                   SequenceType::QUANT_ONE,
                                    false,
                                    false);
     break;
@@ -675,7 +675,7 @@
       for (csize i = 0; i < fiExpr->get_function()->getSignature().paramCount(); ++i)
         paramTypes.push_back(fiExpr->get_function()->getSignature()[i]);
 
-      theType = rtm.create_function_type(paramTypes, retType, TypeConstants::QUANT_ONE);
+      theType = rtm.create_function_type(paramTypes, retType, SequenceType::QUANT_ONE);
     }
     return;
   }
@@ -855,11 +855,11 @@
   store::Item* testNodeName = nodeTest->getQName();
   match_wild_t wildKind = nodeTest->getWildKind();
 
-  TypeConstants::quantifier_t inQuant = inputType->get_quantifier();
+  SequenceType::Quantifier inQuant = inputType->get_quantifier();
   store::StoreConsts::NodeKind inNodeKind = inputType->get_node_kind();
   xqtref_t inContentType = inputType->get_content_type();
 
-  TypeConstants::quantifier_t star = TypeConstants::QUANT_STAR;
+  SequenceType::Quantifier star = SequenceType::QUANT_STAR;
 
   bool inUntyped = false;
   if (inContentType != NULL)
@@ -1257,7 +1257,7 @@
     TypeManager* tm,
     store::StoreConsts::NodeKind nodekind,
     const store::Item_t& nodename,
-    TypeConstants::quantifier_t quant,
+    SequenceType::Quantifier quant,
     bool untyped)
 {
   RootTypeManager& RTM = GENV_TYPESYSTEM;
@@ -1270,12 +1270,12 @@
     else
       contentType = RTM.UNTYPED_TYPE;
 
-    if (TypeOps::is_sub_quant(quant, TypeConstants::QUANT_QUESTION))
+    if (TypeOps::is_sub_quant(quant, SequenceType::QUANT_QUESTION))
     {
       return tm->create_node_type(nodekind,
                                   nodename,
                                   contentType,
-                                  TypeConstants::QUANT_QUESTION,
+                                  SequenceType::QUANT_QUESTION,
                                   false,
                                   false);
     }
@@ -1284,7 +1284,7 @@
       return tm->create_node_type(nodekind,
                                   nodename,
                                   contentType,
-                                  TypeConstants::QUANT_STAR,
+                                  SequenceType::QUANT_STAR,
                                   false,
                                   false);
     }
@@ -1297,12 +1297,12 @@
     else
       contentType = RTM.ANY_TYPE;
 
-    if (TypeOps::is_sub_quant(quant, TypeConstants::QUANT_QUESTION))
+    if (TypeOps::is_sub_quant(quant, SequenceType::QUANT_QUESTION))
     {
       return tm->create_node_type(nodekind,
                                   nodename,
                                   contentType,
-                                  TypeConstants::QUANT_QUESTION,
+                                  SequenceType::QUANT_QUESTION,
                                   false,
                                   false);
     }
@@ -1311,7 +1311,7 @@
       return tm->create_node_type(nodekind,
                                   nodename,
                                   contentType,
-                                  TypeConstants::QUANT_STAR,
+                                  SequenceType::QUANT_STAR,
                                   false,
                                   false);
     }

=== modified file 'src/compiler/expression/flwor_expr.cpp'
--- src/compiler/expression/flwor_expr.cpp	2013-08-12 13:05:15 +0000
+++ src/compiler/expression/flwor_expr.cpp	2013-09-24 21:48:10 +0000
@@ -165,14 +165,14 @@
       {
         if (kind == flwor_clause::for_clause)
         {
-          TypeConstants::quantifier_t domQuant = domainType->get_quantifier();
-          TypeConstants::quantifier_t declQuant = declaredType->get_quantifier();
+          SequenceType::Quantifier domQuant = domainType->get_quantifier();
+          SequenceType::Quantifier declQuant = declaredType->get_quantifier();
 
           if (theAllowingEmpty &&
-              (declQuant == TypeConstants::QUANT_ONE ||
-               declQuant == TypeConstants::QUANT_PLUS))
+              (declQuant == SequenceType::QUANT_ONE ||
+               declQuant == SequenceType::QUANT_PLUS))
           {
-            declaredType = tm->create_type(*declaredType, TypeConstants::QUANT_PLUS);
+            declaredType = tm->create_type(*declaredType, SequenceType::QUANT_PLUS);
           }
           else
           {

=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp	2013-09-16 18:32:17 +0000
+++ src/compiler/parser/jsoniq_parser.cpp	2013-09-24 21:48:10 +0000
@@ -1,8 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.6.2.  */
+/* A Bison parser, made by GNU Bison 2.5.  */
 
 /* Skeleton implementation for Bison LALR(1) parsers in C++
    
-      Copyright (C) 2002-2012 Free Software Foundation, Inc.
+      Copyright (C) 2002-2011 Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,12 +34,14 @@
 #define yylex   zorbalex
 
 /* First part of user declarations.  */
-/* Line 278 of lalr1.cc  */
-#line 1 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+
+/* Line 293 of lalr1.cc  */
+#line 1 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
 
 #define JSONIQ_PARSER
-/* Line 278 of lalr1.cc  */
-#line 58 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+
+/* Line 293 of lalr1.cc  */
+#line 59 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
 
 
 #include "common/common.h"
@@ -75,8 +77,9 @@
 using namespace std;
 using namespace zorba;
 
-/* Line 278 of lalr1.cc  */
-#line 101 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+
+/* Line 293 of lalr1.cc  */
+#line 102 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
 
 
 #ifdef XQUERY_PARSER
@@ -93,17 +96,17 @@
 #endif
 
 
-/* Line 278 of lalr1.cc  */
-#line 98 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+
+/* Line 293 of lalr1.cc  */
+#line 102 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
 
 
 #include "jsoniq_parser.hpp"
 
 /* User implementation prologue.  */
-/* Line 284 of lalr1.cc  */
-#line 904 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-
-
+
+/* Line 299 of lalr1.cc  */
+#line 792 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
 
 template<typename T> inline void release_hack( T *ref ) {
     if ( ref ) {
@@ -111,8 +114,9 @@
         RCHelper::removeReference( ref );
     }
 }
-/* Line 284 of lalr1.cc  */
-#line 1042 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
+
+/* Line 299 of lalr1.cc  */
+#line 849 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
 
 namespace {
 bool convert_postfix_to_target_and_selector(
@@ -126,8 +130,6 @@
       dynamic_cast<DynamicFunctionInvocation*>(aPostfixExpr);
   rchandle<FilterExpr> lFilterExpr = dynamic_cast<FilterExpr*>(aPostfixExpr);
   rchandle<JSONObjectLookup> lObjectLookup = dynamic_cast<JSONObjectLookup*>(aPostfixExpr);
-
-
   if (lDynamicFunctionInvocation != NULL) {
     if (lDynamicFunctionInvocation->getArgList()->size() != 1)
     {
@@ -138,8 +140,6 @@
     *aSelectorExpr = lDynamicFunctionInvocation->getArgList()->operator[](0);
     return true;
   }
-
-
   else if (lObjectLookup != NULL)
   {
     *aTargetExpr = lObjectLookup->get_object_expr();
@@ -148,7 +148,6 @@
     lObjectLookup->release_selector_expr();
     return true;
   }
-
   else if (!allowArray && lFilterExpr != NULL)
   {
     *anError = "An object lookup is expected.";
@@ -159,8 +158,6 @@
     rchandle<exprnode> lPrimary = lFilterExpr->get_primary();
     rchandle<PredicateList> lPredicateList = lFilterExpr->get_pred_list();
     ulong lSize = lPredicateList->size();
-
-
     if (lSize < 1)
     {
       *anError = "An object or array lookup with exactly one argument is expected. No argument was found.";
@@ -180,8 +177,6 @@
       return false;
     }
     lConstructor->set_expr(NULL);
-
-
     *aTargetExpr = lPrimary;
     if (lSize > 1)
     {
@@ -198,7 +193,6 @@
     }
     return true;
   }
-
   else
   {
     *anError = "An object or array lookup is expected.";
@@ -207,17 +201,9 @@
 };
 }
 
-/* Line 284 of lalr1.cc  */
-#line 212 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-
-
-# ifndef YY_NULL
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULL nullptr
-#  else
-#   define YY_NULL 0
-#  endif
-# endif
+
+/* Line 299 of lalr1.cc  */
+#line 207 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
 
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
@@ -231,26 +217,25 @@
 # endif
 #endif
 
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
 /* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
    If N is 0, then set CURRENT to the empty location which ends
    the previous symbol: RHS[0] (always defined).  */
 
-# ifndef YYLLOC_DEFAULT
-#  define YYLLOC_DEFAULT(Current, Rhs, N)                               \
-    do                                                                  \
-      if (N)                                                            \
-        {                                                               \
-          (Current).begin  = YYRHSLOC (Rhs, 1).begin;                   \
-          (Current).end    = YYRHSLOC (Rhs, N).end;                     \
-        }                                                               \
-      else                                                              \
-        {                                                               \
-          (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;      \
-        }                                                               \
-    while (/*CONSTCOND*/ false)
-# endif
-
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)                               \
+ do                                                                    \
+   if (N)                                                              \
+     {                                                                 \
+       (Current).begin = YYRHSLOC (Rhs, 1).begin;                      \
+       (Current).end   = YYRHSLOC (Rhs, N).end;                        \
+     }                                                                 \
+   else                                                                \
+     {                                                                 \
+       (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end;        \
+     }                                                                 \
+ while (false)
+#endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #define YYUSE(e) ((void) (e))
@@ -302,8 +287,9 @@
 
 
 namespace zorba {
-/* Line 352 of lalr1.cc  */
-#line 307 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+
+/* Line 382 of lalr1.cc  */
+#line 293 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
 
   /* Return YYSTR after stripping away unnecessary quotes and
      backslashes, so that it's suitable for yyerror.  The heuristic is
@@ -369,9 +355,6 @@
   {
     YYUSE (yylocationp);
     YYUSE (yyvaluep);
-    std::ostream& yyo = debug_stream ();
-    std::ostream& yyoutput = yyo;
-    YYUSE (yyoutput);
     switch (yytype)
       {
          default:
@@ -404,2007 +387,2579 @@
 
     switch (yytype)
       {
-        case 111: /* "'DECIMAL'" */
-/* Line 453 of lalr1.cc  */
-#line 902 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ delete ((*yyvaluep).decval); };
-/* Line 453 of lalr1.cc  */
-#line 413 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 126: /* "'DOUBLE'" */
-/* Line 453 of lalr1.cc  */
-#line 901 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ delete ((*yyvaluep).dval); };
-/* Line 453 of lalr1.cc  */
-#line 420 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 151: /* "'INTEGER'" */
-/* Line 453 of lalr1.cc  */
-#line 900 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ delete ((*yyvaluep).ival); };
-/* Line 453 of lalr1.cc  */
-#line 427 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 344: /* VersionDecl */
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 434 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 345: /* MainModule */
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 441 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 346: /* LibraryModule */
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 448 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 347: /* ModuleDecl */
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 455 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 348: /* SIND_DeclList */
-/* Line 453 of lalr1.cc  */
-#line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 462 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 349: /* SIND_Decl */
-/* Line 453 of lalr1.cc  */
-#line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 469 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 350: /* Setter */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 476 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 351: /* BoundarySpaceDecl */
-/* Line 453 of lalr1.cc  */
-#line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 483 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 352: /* DefaultCollationDecl */
-/* Line 453 of lalr1.cc  */
-#line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 490 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 353: /* BaseURIDecl */
-/* Line 453 of lalr1.cc  */
-#line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 497 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 354: /* ConstructionDecl */
-/* Line 453 of lalr1.cc  */
-#line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 504 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 355: /* OrderingModeDecl */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 511 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 356: /* EmptyOrderDecl */
-/* Line 453 of lalr1.cc  */
-#line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 518 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 357: /* CopyNamespacesDecl */
-/* Line 453 of lalr1.cc  */
-#line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 525 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 358: /* Import */
-/* Line 453 of lalr1.cc  */
-#line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 532 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 359: /* SchemaImport */
-/* Line 453 of lalr1.cc  */
-#line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 539 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 360: /* URILiteralList */
-/* Line 453 of lalr1.cc  */
-#line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 546 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 361: /* SchemaPrefix */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 553 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 362: /* ModuleImport */
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 560 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 363: /* NamespaceDecl */
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 567 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 364: /* DefaultNamespaceDecl */
-/* Line 453 of lalr1.cc  */
-#line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 574 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 365: /* VFO_DeclList */
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 581 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 366: /* VFO_Decl */
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 588 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 367: /* DecimalFormatDecl */
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 595 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 368: /* DecimalFormatParamList */
-/* Line 453 of lalr1.cc  */
-#line 951 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ delete ((*yyvaluep).vstrpair); };
-/* Line 453 of lalr1.cc  */
-#line 602 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 369: /* DecimalFormatParam */
-/* Line 453 of lalr1.cc  */
-#line 951 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ delete ((*yyvaluep).strpair); };
-/* Line 453 of lalr1.cc  */
-#line 609 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 371: /* OptionDecl */
-/* Line 453 of lalr1.cc  */
-#line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 616 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 372: /* FTOptionDecl */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 623 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 373: /* CtxItemDecl */
-/* Line 453 of lalr1.cc  */
-#line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 630 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 374: /* CtxItemDecl2 */
-/* Line 453 of lalr1.cc  */
-#line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 637 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 375: /* CtxItemDecl3 */
-/* Line 453 of lalr1.cc  */
-#line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 644 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 376: /* CtxItemDecl4 */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 651 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 377: /* VarDecl */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 658 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 378: /* VarNameAndType */
-/* Line 453 of lalr1.cc  */
-#line 951 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ delete ((*yyvaluep).varnametype); };
-/* Line 453 of lalr1.cc  */
-#line 665 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 379: /* AnnotationList */
-/* Line 453 of lalr1.cc  */
-#line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 672 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 380: /* Annotation */
-/* Line 453 of lalr1.cc  */
-#line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 679 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 381: /* AnnotationLiteralList */
-/* Line 453 of lalr1.cc  */
-#line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 686 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 382: /* FunctionDecl */
-/* Line 453 of lalr1.cc  */
-#line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 693 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 383: /* FunctionDecl2 */
-/* Line 453 of lalr1.cc  */
-#line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 700 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 384: /* FunctionDeclSimple */
-/* Line 453 of lalr1.cc  */
-#line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 707 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 385: /* FunctionDeclUpdating */
-/* Line 453 of lalr1.cc  */
-#line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 714 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 386: /* FunctionSig */
-/* Line 453 of lalr1.cc  */
-#line 951 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ delete ((*yyvaluep).fnsig); };
-/* Line 453 of lalr1.cc  */
-#line 721 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 387: /* ParamList */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 728 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 388: /* Param */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 735 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 389: /* CollectionDecl */
-/* Line 453 of lalr1.cc  */
-#line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 742 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 391: /* IndexDecl */
-/* Line 453 of lalr1.cc  */
-#line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 749 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 392: /* IndexKeyList */
-/* Line 453 of lalr1.cc  */
-#line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 756 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 393: /* IndexKeySpec */
-/* Line 453 of lalr1.cc  */
-#line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 763 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 394: /* IntegrityConstraintDecl */
-/* Line 453 of lalr1.cc  */
-#line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 770 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 395: /* QueryBody */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 777 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 396: /* StatementsAndOptionalExprTop */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 784 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 397: /* StatementsAndOptionalExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 791 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 398: /* StatementsAndExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 798 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 399: /* Statements */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 805 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 400: /* Statement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 812 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 401: /* BlockStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 819 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 402: /* BlockExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 826 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 403: /* EnclosedStatementsAndOptionalExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 833 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 404: /* VarDeclStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 840 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 407: /* AssignStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 847 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 408: /* ApplyStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 854 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 409: /* ExitStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 861 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 410: /* WhileStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 868 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 411: /* FlowCtlStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 875 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 412: /* FLWORStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 882 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 413: /* ReturnStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 889 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 414: /* IfStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 896 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 415: /* TryStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 903 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 416: /* CatchListStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 910 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 417: /* CatchStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 418: /* VoidStatement */
-/* Line 453 of lalr1.cc  */
-#line 932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 419: /* Expr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 420: /* ExprSingle */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 938 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 421: /* ExprSimple */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 945 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 422: /* FLWORExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 952 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 423: /* ReturnExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 959 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 427: /* FLWORWinCond */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 966 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 428: /* WindowClause */
-/* Line 453 of lalr1.cc  */
-#line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 973 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 429: /* CountClause */
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 980 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 430: /* ForLetWinClause */
-/* Line 453 of lalr1.cc  */
-#line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 987 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 432: /* FLWORClauseList */
-/* Line 453 of lalr1.cc  */
-#line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 994 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 433: /* ForClause */
-/* Line 453 of lalr1.cc  */
-#line 923 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1001 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 435: /* VarInDeclList */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1008 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 436: /* VarInDecl */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1015 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 437: /* PositionalVar */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1022 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 438: /* FTScoreVar */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1029 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 439: /* LetClause */
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1036 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 440: /* VarGetsDeclList */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1043 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 441: /* VarGetsDecl */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1050 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 442: /* WindowVarDecl */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1057 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 443: /* WindowVars */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1064 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 444: /* WindowVars3 */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1071 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 445: /* WindowVars2 */
-/* Line 453 of lalr1.cc  */
-#line 930 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1078 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 446: /* WhereClause */
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1085 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 447: /* GroupByClause */
-/* Line 453 of lalr1.cc  */
-#line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1092 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 448: /* GroupSpecList */
-/* Line 453 of lalr1.cc  */
-#line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1099 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 449: /* GroupSpec */
-/* Line 453 of lalr1.cc  */
-#line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1106 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 450: /* GroupCollationSpec */
-/* Line 453 of lalr1.cc  */
-#line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1113 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 451: /* OrderByClause */
-/* Line 453 of lalr1.cc  */
-#line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1120 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 452: /* OrderSpecList */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1127 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 453: /* OrderSpec */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1134 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 454: /* OrderModifier */
-/* Line 453 of lalr1.cc  */
-#line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1141 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 455: /* OrderDirSpec */
-/* Line 453 of lalr1.cc  */
-#line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1148 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 456: /* OrderEmptySpec */
-/* Line 453 of lalr1.cc  */
-#line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1155 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 457: /* OrderCollationSpec */
-/* Line 453 of lalr1.cc  */
-#line 925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1162 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 458: /* QuantifiedExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1169 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 459: /* QVarInDeclList */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1176 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 460: /* QVarInDecl */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1183 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 461: /* SwitchExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1190 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 462: /* SwitchCaseClauseList */
-/* Line 453 of lalr1.cc  */
-#line 932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1197 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 463: /* SwitchCaseClause */
-/* Line 453 of lalr1.cc  */
-#line 932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1204 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 464: /* SwitchCaseOperandList */
-/* Line 453 of lalr1.cc  */
-#line 932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1211 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 465: /* SwitchStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1218 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 468: /* TypeswitchExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1225 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 469: /* TypeswitchStatement */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1232 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 470: /* CaseClauseList */
-/* Line 453 of lalr1.cc  */
-#line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1239 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 471: /* CaseClause */
-/* Line 453 of lalr1.cc  */
-#line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1246 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 474: /* SequenceTypeList */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1253 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 475: /* IfExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1260 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 476: /* OrExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1267 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 477: /* AndExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1274 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 478: /* NotExpr */
-/* Line 453 of lalr1.cc  */
-#line 935 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1281 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 479: /* ComparisonExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1288 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 481: /* FTContainsExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1295 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 482: /* StringConcatExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1302 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 483: /* opt_FTIgnoreOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1309 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 484: /* RangeExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1316 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 485: /* AdditiveExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1323 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 486: /* MultiplicativeExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1330 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 487: /* UnionExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1337 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 488: /* IntersectExceptExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1344 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 489: /* InstanceofExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1351 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 490: /* TreatExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1358 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 491: /* CastableExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1365 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 492: /* CastExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1372 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 493: /* SingleType */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1379 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 494: /* UnaryExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1386 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 495: /* SignList */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1393 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 496: /* ValueExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1400 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 497: /* SimpleMapExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1407 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 498: /* ValueComp */
-/* Line 453 of lalr1.cc  */
-#line 929 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1414 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 499: /* NodeComp */
-/* Line 453 of lalr1.cc  */
-#line 932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1421 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 500: /* ValidateExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1428 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 501: /* ExtensionExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1435 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 502: /* Pragma_list */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1442 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 503: /* Pragma */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1449 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 504: /* PathExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1456 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 506: /* RelativePathExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1463 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 507: /* StepExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1470 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 508: /* AxisStep */
-/* Line 453 of lalr1.cc  */
-#line 945 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1477 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 509: /* ForwardStep */
-/* Line 453 of lalr1.cc  */
-#line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1484 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 510: /* ForwardAxis */
-/* Line 453 of lalr1.cc  */
-#line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1491 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 511: /* AbbrevForwardStep */
-/* Line 453 of lalr1.cc  */
-#line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1498 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 512: /* ReverseStep */
-/* Line 453 of lalr1.cc  */
-#line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1505 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 513: /* ReverseAxis */
-/* Line 453 of lalr1.cc  */
-#line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1512 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 514: /* NodeTest */
-/* Line 453 of lalr1.cc  */
-#line 917 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1519 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 515: /* NameTest */
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1526 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 516: /* Wildcard */
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1533 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 517: /* PostfixExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1540 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 518: /* PredicateList */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1547 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 519: /* Predicate */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1554 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 520: /* PrimaryExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1561 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 521: /* Literal */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1568 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 522: /* NumericLiteral */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1575 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 523: /* VarRef */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1582 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 524: /* ParenthesizedExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1589 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 525: /* ContextItemExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1596 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 526: /* OrderedExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1603 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 527: /* UnorderedExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1610 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 528: /* FunctionCall */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1617 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 529: /* ArgList */
-/* Line 453 of lalr1.cc  */
-#line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1624 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 533: /* Constructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1631 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 534: /* DirectConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1638 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 535: /* DirElemConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1645 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 536: /* DirElemContentList */
-/* Line 453 of lalr1.cc  */
-#line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1652 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 537: /* DirAttributeList */
-/* Line 453 of lalr1.cc  */
-#line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1659 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 538: /* DirAttr */
-/* Line 453 of lalr1.cc  */
-#line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1666 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 540: /* DirAttributeValue */
-/* Line 453 of lalr1.cc  */
-#line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1673 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 541: /* opt_QuoteAttrContentList */
-/* Line 453 of lalr1.cc  */
-#line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1680 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 542: /* QuoteAttrContentList */
-/* Line 453 of lalr1.cc  */
-#line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1687 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 543: /* opt_AposAttrContentList */
-/* Line 453 of lalr1.cc  */
-#line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1694 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 544: /* AposAttrContentList */
-/* Line 453 of lalr1.cc  */
-#line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1701 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 545: /* QuoteAttrValueContent */
-/* Line 453 of lalr1.cc  */
-#line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1708 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 546: /* AposAttrValueContent */
-/* Line 453 of lalr1.cc  */
-#line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1715 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 547: /* DirElemContent */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1722 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 548: /* CommonContent */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1729 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 549: /* DirCommentConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1736 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 550: /* DirPIConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1743 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 551: /* CDataSection */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1750 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 552: /* ComputedConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1757 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 553: /* CompDocConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1764 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 554: /* CompElemConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1771 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 555: /* CompAttrConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1778 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 556: /* CompTextConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1785 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 557: /* CompCommentConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1792 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 558: /* CompPIConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1799 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 559: /* CompNamespaceConstructor */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1806 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 560: /* TypeDeclaration */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1813 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 561: /* SequenceType */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1820 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 562: /* OccurrenceIndicator */
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1827 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 563: /* ItemType */
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1834 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 564: /* TypeList */
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1841 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 565: /* GeneralizedAtomicType */
-/* Line 453 of lalr1.cc  */
-#line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1848 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 566: /* SimpleType */
-/* Line 453 of lalr1.cc  */
-#line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1855 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 567: /* KindTest */
-/* Line 453 of lalr1.cc  */
-#line 924 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1862 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 568: /* AnyKindTest */
-/* Line 453 of lalr1.cc  */
-#line 920 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1869 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 570: /* DocumentTest */
-/* Line 453 of lalr1.cc  */
-#line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1876 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 571: /* NamespaceTest */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1883 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 572: /* TextTest */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1890 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 573: /* CommentTest */
-/* Line 453 of lalr1.cc  */
-#line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1897 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 574: /* PITest */
-/* Line 453 of lalr1.cc  */
-#line 926 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1904 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 575: /* AttributeTest */
-/* Line 453 of lalr1.cc  */
-#line 921 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1911 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 576: /* SchemaAttributeTest */
-/* Line 453 of lalr1.cc  */
-#line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1918 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 577: /* ElementTest */
-/* Line 453 of lalr1.cc  */
-#line 922 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1925 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 578: /* SchemaElementTest */
-/* Line 453 of lalr1.cc  */
-#line 927 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1932 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 579: /* TypeName */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 580: /* TypeName_WITH_HOOK */
-/* Line 453 of lalr1.cc  */
-#line 928 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1946 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 581: /* StringLiteral */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1953 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 583: /* AnyFunctionTest */
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1960 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 584: /* TypedFunctionTest */
-/* Line 453 of lalr1.cc  */
-#line 931 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 1967 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 587: /* InsertExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1974 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 588: /* DeleteExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1981 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 589: /* ReplaceExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1988 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 590: /* RenameExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 1995 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 591: /* TransformExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2002 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 592: /* VarNameList */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2009 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 593: /* VarNameDecl */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2016 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 594: /* TryExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2023 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 595: /* CatchListExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2030 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 596: /* CatchExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2037 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 597: /* BracedExpr */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2044 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 598: /* NameTestList */
-/* Line 453 of lalr1.cc  */
-#line 951 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ delete ((*yyvaluep).name_test_list); };
-/* Line 453 of lalr1.cc  */
-#line 2051 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 599: /* FTSelection */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2058 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 602: /* FTOr */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2065 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 603: /* FTAnd */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2072 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 604: /* FTMildNot */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2079 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 605: /* FTUnaryNot */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2086 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 606: /* FTPrimaryWithOptions */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2093 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 607: /* opt_FTMatchOptions */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2100 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 609: /* FTWeight */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2107 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 610: /* FTPrimary */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2114 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 611: /* opt_FTTimes */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2121 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 612: /* FTExtensionSelection */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2128 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 614: /* FTWords */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2135 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 615: /* FTWordsValue */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2142 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 617: /* FTAnyallOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2149 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 620: /* FTPosFilter */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2156 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 621: /* FTOrder */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2163 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 622: /* FTWindow */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2170 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 623: /* FTDistance */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2177 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 624: /* FTUnit */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2184 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 625: /* FTMatchOptions */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2191 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 626: /* FTMatchOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2198 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 627: /* FTCaseOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2205 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 628: /* FTDiacriticsOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2212 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 629: /* FTExtensionOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2219 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 630: /* FTStemOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2226 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 631: /* FTThesaurusOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2233 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 635: /* FTThesaurusID */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2240 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 638: /* FTStopWordOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2247 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 639: /* FTStopWords */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2254 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 643: /* FTStopWordsInclExcl */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2261 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 644: /* FTLanguageOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2268 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 645: /* FTWildCardOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2275 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 646: /* FTContent */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2282 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 647: /* FTTimes */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2289 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 648: /* FTRange */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2296 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 649: /* FTScope */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2303 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 650: /* FTBigUnit */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2310 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 651: /* FTIgnoreOption */
-/* Line 453 of lalr1.cc  */
-#line 939 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2317 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 652: /* JSONArrayConstructor */
-/* Line 453 of lalr1.cc  */
-#line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2324 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 653: /* JSONSimpleObjectUnion */
-/* Line 453 of lalr1.cc  */
-#line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2331 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 654: /* JSONAccumulatorObjectUnion */
-/* Line 453 of lalr1.cc  */
-#line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2338 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 655: /* JSONObjectConstructor */
-/* Line 453 of lalr1.cc  */
-#line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2345 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 656: /* JSONPairList */
-/* Line 453 of lalr1.cc  */
-#line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).node) ); };
-/* Line 453 of lalr1.cc  */
-#line 2352 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 657: /* JSONInsertExpr */
-/* Line 453 of lalr1.cc  */
-#line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2359 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 658: /* JSONAppendExpr */
-/* Line 453 of lalr1.cc  */
-#line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2366 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 659: /* JSONDeleteExpr */
-/* Line 453 of lalr1.cc  */
-#line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2373 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 660: /* JSONRenameExpr */
-/* Line 453 of lalr1.cc  */
-#line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2380 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 661: /* JSONReplaceExpr */
-/* Line 453 of lalr1.cc  */
-#line 942 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2387 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 664: /* QNAME */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2394 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 665: /* FUNCTION_NAME */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2401 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
-	break;
-      case 666: /* EQNAME */
-/* Line 453 of lalr1.cc  */
-#line 948 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.y"
-	{ release_hack( ((*yyvaluep).expr) ); };
-/* Line 453 of lalr1.cc  */
-#line 2408 "/Users/zorba/Code/zorba/release/src/compiler/parser/jsoniq_parser.cpp"
+        case 111: /* "\"'DECIMAL'\"" */
+
+/* Line 480 of lalr1.cc  */
+#line 791 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ delete (yyvaluep->decval); };
+
+/* Line 480 of lalr1.cc  */
+#line 398 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 126: /* "\"'DOUBLE'\"" */
+
+/* Line 480 of lalr1.cc  */
+#line 790 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ delete (yyvaluep->dval); };
+
+/* Line 480 of lalr1.cc  */
+#line 407 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 151: /* "\"'INTEGER'\"" */
+
+/* Line 480 of lalr1.cc  */
+#line 789 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ delete (yyvaluep->ival); };
+
+/* Line 480 of lalr1.cc  */
+#line 416 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 344: /* "VersionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 812 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 425 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 345: /* "MainModule" */
+
+/* Line 480 of lalr1.cc  */
+#line 805 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 434 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 346: /* "LibraryModule" */
+
+/* Line 480 of lalr1.cc  */
+#line 805 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 443 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 347: /* "ModuleDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 805 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 452 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 348: /* "SIND_DeclList" */
+
+/* Line 480 of lalr1.cc  */
+#line 808 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 461 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 349: /* "SIND_Decl" */
+
+/* Line 480 of lalr1.cc  */
+#line 808 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 470 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 350: /* "Setter" */
+
+/* Line 480 of lalr1.cc  */
+#line 809 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 479 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 351: /* "BoundarySpaceDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 802 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 488 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 352: /* "DefaultCollationDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 803 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 497 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 353: /* "BaseURIDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 802 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 506 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 354: /* "ConstructionDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 802 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 515 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 355: /* "OrderingModeDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 807 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 524 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 356: /* "EmptyOrderDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 804 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 533 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 357: /* "CopyNamespacesDecl" */
+
+/* Line 480 of lalr1.cc  */
+#line 803 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.y"
+	{ release_hack( (yyvaluep->node) ); };
+
+/* Line 480 of lalr1.cc  */
+#line 542 "/home/markos/zorba/repo/type-api/build-nocc-g/src/compiler/parser/jsoniq_parser.cpp"
+	break;
+      case 358: /* "Import" */
+