Merge lp:~zorba-coders/zorba/xquery3.0_funcs into lp:zorba

[Matthias Brantner]

Added XQuery 3.0 Functions
path, has-children#0, nilled#0

Added XQuery 3.0 Functions
path, has-children#0, nilled#0

[Matthias Brantner (matthias-brantner)]

- The fn:path functions returns a wrong result for the following doc/query:

doc.xml
<a><b/><b/></a>

fn:path(doc("doc.xml")/a/b[2])
/"":a[2]/"":b[1]

- As far as I understood from the spec, fn:parse-xml-fragment should return true for the query

fn:parse-xml-fragment("<alpha>abcd</alpha><beta>abcd</beta>") instance of document-node()

review: Needs Fixing

[Juan Zacarias (juan457)]

> - The fn:path functions returns a wrong result for the following doc/query:
>
> doc.xml
> <a><b/><b/></a>
>
> fn:path(doc("doc.xml")/a/b[2])
> /"":a[2]/"":b[1]
Oh It seems I used the wrong value for the position. I have a question about this I was using Item->getRefCount() for the value of the position of the node, but it appears to be wrong is that info on the node stored anywhere else? if not should I implement it as info inside the Item? or just for the function?

>
> - As far as I understood from the spec, fn:parse-xml-fragment should return
> true for the query
>
> fn:parse-xml-fragment("<alpha>abcd</alpha><beta>abcd</beta>") instance of
> document-node()
I will take a look on this

[Matthias Brantner (matthias-brantner)]

> > - The fn:path functions returns a wrong result for the following doc/query:
> >
> > doc.xml
> > <a><b/><b/></a>
> >
> > fn:path(doc("doc.xml")/a/b[2])
> > /"":a[2]/"":b[1]
> Oh It seems I used the wrong value for the position. I have a question about
> this I was using Item->getRefCount() for the value of the position of the
> node, but it appears to be wrong is that info on the node stored anywhere
> else? if not should I implement it as info inside the Item? or just for the
> function?
getRefCount() returns the number of references to the node. It cannot be used as the position among siblings. I'm afraid there is no such information stored in a node. You probably have to count the number of preceding siblings, i.e. go to the parent and iterate over the children until you reached the node in question.

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xquery3.0_funcs-2012-05-02T06-49-10.108Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/xquery3.0_funcs into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job xquery3.0_funcs-2012-05-02T06-49-10.108Z is finished.
  The final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xquery3.0_funcs-2012-05-02T06-57-56.708Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/xquery3.0_funcs into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job xquery3.0_funcs-2012-05-02T06-57-56.708Z is finished.
  The final status was:

  No tests were run - build or configure step must have failed.

  Not commiting changes.

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

[lp:~zorba-coders/zorba/xquery3.0_funcs]

10743. By Matthias Brantner on 2012-05-02

commit of generated files

10744. By Matthias Brantner on 2012-05-02

commit of more pregenerated files

10745. By Matthias Brantner on 2012-05-02

fixed failing tests

10747. By Nicolae Brinza on 2012-05-07

Enabled fn:parse-xml-fragment() which now correctly retuns only one document node holding all the fragments

10748. By Nicolae Brinza on 2012-05-10

Fixed a new bug in the parse-fragment code reported by Juan. Added relevant testcases

10749. By Nicolae Brinza on 2012-05-10

Merged with Zorba trunk.

10750. By Nicolae Brinza on 2012-05-15

Fixed a reported bug in the parse-fragment code.

10751. By Nicolae Brinza on 2012-05-15

Merged with Zorba trunk

10752. By Juan Zacarias on 2012-05-15

Fixed failing tests

10753. By Nicolae Brinza on 2012-05-16

Fixed the parse-fragment() bug where an empty string input would not return a document node.

10754. By Juan Zacarias on 2012-06-12

updated changelog

10755. By Nicolae Brinza on 2012-06-21

Merged with Zorba trunk

10756. By Nicolae Brinza on 2012-06-24

Fixed the Changelog note for the fn:parse-xml-fragment#1 implementation

10757. By Nicolae Brinza on 2012-06-24

Merged with Zorba trunk

10758. By Nicolae Brinza on 2012-06-26

Fixed the fn:parse-xml-fragment() pregenerated files so that Zorba now correctly builds

10759. By Nicolae Brinza on 2012-06-26

Fixed the backwards-compatible zorba:parse-xml-fragment() function so that it works with the 'w' option enabled

Unmerged revisions

=== modified file 'ChangeLog'
--- ChangeLog	2012-05-01 15:54:27 +0000
+++ ChangeLog	2012-05-02 07:18:18 +0000
@@ -3,11 +3,15 @@
 version 2.5
 
 New Features:
-  * fn:available-environment-variables
-  * fn:environment-variables
-  * fn:uri-collection
-  * fn:unparsed-text
-  * fn:unparsed-text-available
+  * XQuery 3.0 functions
+    - fn:available-environment-variables
+    - fn:environment-variables
+    - fn:uri-collection
+    - fn:unparsed-text
+    - fn:unparsed-text-available
+    - fn:has-children#0
+    - fn:nilled#0
+    - fn:path
   * Extended API for Python, Java, PHP and Ruby.
   * Add jvm classpath to zorbacmd and to Zorba API. Tracked by #931816
   * Added full-text module.
@@ -15,14 +19,11 @@
   * Added XQJ support.
   * Added CollectionManager and DocumentManager support for XQJ.
 
-Optimization:
-
 Bug Fixes/Other Changes:
   * Fixed bugs #931501 and #866987 (improved error messages for fn:format-number(). Additionally, the function now throws the FODF1310 error instead of XTDE1310, as the 3.0 spec requires)
   * Fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
   * Fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
-  * Fixed bug #986075 (encountering flwor expr with no clauses; due to common 
-	  subexression being formed when inlining var in if-then-else expression) 
+  * Fixed bug #986075 (encountering flwor expr with no clauses; due to common subexression being formed when inlining var in if-then-else expression) 
   * Fixed bug #967864 (var substitution did not update theFreeVars property)
   * Fixed bug #891650 (context size var not always declared within path expr)
   * Fixed bug #948879 (--uri-path doesn't work with fetch:content())
@@ -36,17 +37,14 @@
   * Fixed bug #988412 (date:current-dateTime daylight saving)
   * Fixed bug #912586, #912593 and #912722 (assertion failures with lax validation)
   * Fixed bug #921458 (file:read-text-lines() blocking)
-  * Fixed bug #981405 (do not hoist expr containing try-catch variables out of the
-          associated try-catch expression)
-  * Fixed bug #947627 (throw XQST0099 if more than one declarations of context item
-	               type in same module)
+  * Fixed bug #981405 (do not hoist expr containing try-catch variables out of the associated try-catch expression)
+  * Fixed bug #947627 (throw XQST0099 if more than one declarations of context item type in same module)
   * Fixed bug #980526 (no-copy rule bug due to global var being set in "distant" udf)
   * Fixed bug #949910 (has-children may be invoked on all nodes). Internally, zorba::store::Item::getChildren() now returns NULL on node classes without offspring (instead of raising an error).
-  * Fixed Bug #933490: Error ItemFactoryImpl::createBase64Binary with istream
+  * Fixed Bug #933490 (Error ItemFactoryImpl::createBase64Binary with istream)
   * Fixed bug #867112 (Diagnostic Handler was not working on external APIs)
   * Fixed bug #857842 (Assertion failed with simple content element with comments)
 
-
 version 2.2
 
 New Features:

=== modified file 'modules/w3c/xpath_functions.xq'
--- modules/w3c/xpath_functions.xq	2012-04-24 12:39:38 +0000
+++ modules/w3c/xpath_functions.xq	2012-05-02 07:18:18 +0000
@@ -522,6 +522,12 @@
 declare function fn:parse-xml( $arg as xs:string?, $baseURI as xs:string) as document-node(element(*, xs:untyped)) external;
 
 (:~
+ : @see for semantics please check <a href="http://www.w3.org/TR/xpath-functions-30/#func-parse-xml-fragment">fn:parse-xml-fragment</a>
+ :)
+declare function fn:parse-xml-fragment( $arg as xs:string?) as document-node(element(*, xs:untyped)) external;
+
+
+(:~
  : @see for semantics please check <a href="http://www.w3.org/TR/xpath-functions-30/#func-prefix-from-QName">fn:prefix-from-QName</a>
  :)
 declare function fn:prefix-from-QName($arg as xs:QName?) as xs:NCName? external;
@@ -864,6 +870,11 @@
 (:~
  : @see for semantics please check <a href="http://www.w3.org/TR/xpath-functions-30/#func-has-children">fn:has-children</a>
  :)
+declare function fn:has-children() as xs:boolean external;
+
+(:~
+ : @see for semantics please check <a href="http://www.w3.org/TR/xpath-functions-30/#func-has-children">fn:has-children</a>
+ :)
 declare function fn:has-children($node as node()?) as xs:boolean external;
 
 (:~
@@ -923,12 +934,17 @@
 
 (:~
  : @see for semantics please check <a href="http://www.w3.org/TR/xpath-functions-30/#func-namespace-uri">fn:namespace-uri</a>
- :)
+ :)       
 declare function fn:namespace-uri($arg as node()?) as xs:anyURI external;
 
 (:~
  : @see for semantics please check <a href="http://www.w3.org/TR/xpath-functions-30/#func-nilled">fn:nilled</a>
  :)
+declare function fn:nilled() as xs:boolean external;
+
+(:~
+ : @see for semantics please check <a href="http://www.w3.org/TR/xpath-functions-30/#func-nilled">fn:nilled</a>
+ :)
 declare function fn:nilled($arg as node()?) as xs:boolean? external;
 
 (:~

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-05-01 21:21:04 +0000
+++ src/compiler/translator/translator.cpp	2012-05-02 07:18:18 +0000
@@ -694,6 +694,10 @@
   xquery_fns_def_dot.set(FunctionConsts::FN_DATA_0);
   xquery_fns_def_dot.set(FunctionConsts::FN_DOCUMENT_URI_0);
   xquery_fns_def_dot.set(FunctionConsts::FN_NODE_NAME_0);
+  xquery_fns_def_dot.set(FunctionConsts::FN_NILLED_0);
+  xquery_fns_def_dot.set(FunctionConsts::FN_HAS_CHILDREN_0);
+  xquery_fns_def_dot.set(FunctionConsts::FN_PATH_0);
+
 
   op_concatenate = GET_BUILTIN_FUNCTION(OP_CONCATENATE_N);
   assert(op_concatenate != NULL);

=== modified file 'src/functions/pregenerated/func_accessors.cpp'
--- src/functions/pregenerated/func_accessors.cpp	2012-04-24 12:39:38 +0000
+++ src/functions/pregenerated/func_accessors.cpp	2012-05-02 07:18:18 +0000
@@ -50,6 +50,15 @@
   return new NodeNameIterator(sctx, loc, argv);
 }
 
+PlanIter_t fn_nilled_3_0::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new NilledIterator(sctx, loc, argv);
+}
 PlanIter_t fn_nilled::codegen(
   CompilerCB*,
   static_context* sctx,
@@ -138,6 +147,17 @@
   {
     
 
+    DECL_WITH_KIND(sctx, fn_nilled_3_0,
+        (createQName("http://www.w3.org/2005/xpath-functions","","nilled"), 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_NILLED_0);
+
+  }
+
+
+  {
+    
+
     DECL_WITH_KIND(sctx, fn_nilled,
         (createQName("http://www.w3.org/2005/xpath-functions","","nilled"), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION, 

=== modified file 'src/functions/pregenerated/func_accessors.h'
--- src/functions/pregenerated/func_accessors.h	2012-04-24 12:39:38 +0000
+++ src/functions/pregenerated/func_accessors.h	2012-05-02 07:18:18 +0000
@@ -72,6 +72,22 @@
 
 
 //fn:nilled
+class fn_nilled_3_0 : public function
+{
+public:
+  fn_nilled_3_0(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+theXQueryVersion = StaticContextConsts::xquery_version_3_0;
+  }
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return true; }
+
+  CODEGEN_DECL();
+};
+
+//fn:nilled
 class fn_nilled : public function
 {
 public:
@@ -82,7 +98,7 @@
 
   }
 
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return true; }
 
   CODEGEN_DECL();
 };

=== modified file 'src/functions/pregenerated/func_nodes.cpp'
--- src/functions/pregenerated/func_nodes.cpp	2012-04-24 12:39:38 +0000
+++ src/functions/pregenerated/func_nodes.cpp	2012-05-02 07:18:18 +0000
@@ -231,6 +231,16 @@
   return new LeastCommonAncestor(sctx, loc, argv);
 }
 
+PlanIter_t fn_path_3_0::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnPathIterator(sctx, loc, argv);
+}
+
 void populate_context_nodes(static_context* sctx)
 {
   {
@@ -356,6 +366,17 @@
 
     DECL_WITH_KIND(sctx, fn_has_children_3_0,
         (createQName("http://www.w3.org/2005/xpath-functions","","has-children"), 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_HAS_CHILDREN_0);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_has_children_3_0,
+        (createQName("http://www.w3.org/2005/xpath-functions","","has-children"), 
         GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION, 
         GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
         FunctionConsts::FN_HAS_CHILDREN_1);
@@ -538,6 +559,29 @@
 
   }
 
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_path_3_0,
+        (createQName("http://www.w3.org/2005/xpath-functions","","path"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION),
+        FunctionConsts::FN_PATH_0);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_path_3_0,
+        (createQName("http://www.w3.org/2005/xpath-functions","","path"), 
+        GENV_TYPESYSTEM.ANY_NODE_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION),
+        FunctionConsts::FN_PATH_1);
+
+  }
+
 }
 
 

=== modified file 'src/functions/pregenerated/func_nodes.h'
--- src/functions/pregenerated/func_nodes.h	2012-04-24 12:39:38 +0000
+++ src/functions/pregenerated/func_nodes.h	2012-05-02 07:18:18 +0000
@@ -372,6 +372,21 @@
 };
 
 
+//fn:path
+class fn_path_3_0 : public function
+{
+public:
+  fn_path_3_0(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+theXQueryVersion = StaticContextConsts::xquery_version_3_0;
+  }
+
+  CODEGEN_DECL();
+};
+
+
 } //namespace zorba
 
 

=== modified file 'src/functions/pregenerated/func_parse_fragment.cpp'
--- src/functions/pregenerated/func_parse_fragment.cpp	2012-04-24 12:39:38 +0000
+++ src/functions/pregenerated/func_parse_fragment.cpp	2012-05-02 07:18:18 +0000
@@ -38,7 +38,7 @@
   std::vector<PlanIter_t>& argv,
   expr& ann) const
 {
-  return new FnParseXmlFragmentIterator(sctx, loc, argv);
+  return new FnZorbaParseXmlFragmentIterator(sctx, loc, argv);
 }
 
 void populate_context_parse_fragment(static_context* sctx)

=== modified file 'src/functions/pregenerated/func_sequences.cpp'
--- src/functions/pregenerated/func_sequences.cpp	2012-04-24 12:39:38 +0000
+++ src/functions/pregenerated/func_sequences.cpp	2012-05-02 07:18:18 +0000
@@ -1,923 +1,775 @@
-/*
- * 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.
- */
- 
-// ******************************************
-// *                                        *
-// * THIS IS A GENERATED FILE. DO NOT EDIT! *
-// * SEE .xml FILE WITH SAME NAME           *
-// *                                        *
-// ******************************************
-
-
-#include "stdafx.h"
-#include "runtime/sequences/sequences.h"
-#include "functions/func_sequences.h"
-#include "system/globalenv.h"
-#include "types/typeops.h"
-#include "compiler/expression/expr_base.h"
-
-
-namespace zorba{
-
-
-
-PlanIter_t op_concatenate::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnConcatIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_index_of::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnIndexOfIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_empty::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnEmptyIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_exists::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnExistsIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_distinct_values::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnDistinctValuesIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_insert_before::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnInsertBeforeIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_remove::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnRemoveIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_reverse::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnReverseIterator(sctx, loc, argv);
-}
-
-
-
-
-
-PlanIter_t fn_one_or_more::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnOneOrMoreIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_deep_equal::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnDeepEqualIterator(sctx, loc, argv);
-}
-
-
-PlanIter_t fn_avg::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnAvgIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_sum::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnSumIterator(sctx, loc, argv);
-}
-
-PlanIter_t op_sum_double::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnSumDoubleIterator(sctx, loc, argv);
-}
-
-PlanIter_t op_sum_float::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnSumFloatIterator(sctx, loc, argv);
-}
-
-PlanIter_t op_sum_decimal::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnSumDecimalIterator(sctx, loc, argv);
-}
-
-PlanIter_t op_sum_integer::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnSumIntegerIterator(sctx, loc, argv);
-}
-
-PlanIter_t op_to::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new OpToIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_id::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnIdIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_element_with_id::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnElementWithIdIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_idref::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnIdRefIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_doc::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnDocIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_doc_available::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnDocAvailableIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_available_environment_variables_3_0::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnAvailableEnvironmentVariablesIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_environment_variable_3_0::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnEnvironmentVariableIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_unparsed_text_3_0::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnUnparsedTextIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_unparsed_text_available_3_0::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnUnparsedTextAvailableIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_unparsed_text_lines_3_0::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnUnparsedTextLinesIterator(sctx, loc, argv);
-}
-
-void populate_context_sequences(static_context* sctx)
-{
-  {
-    std::vector<xqtref_t> lParamTypes;
-    lParamTypes.push_back(GENV_TYPESYSTEM.ITEM_TYPE_STAR);
-
-    DECL_WITH_KIND(sctx, op_concatenate,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","concatenate"), 
-        lParamTypes, GENV_TYPESYSTEM.ITEM_TYPE_STAR, true),
-        FunctionConsts::OP_CONCATENATE_N);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_index_of,
-        (createQName("http://www.w3.org/2005/xpath-functions","","index-of"), 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_ONE, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_STAR),
-        FunctionConsts::FN_INDEX_OF_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_index_of,
-        (createQName("http://www.w3.org/2005/xpath-functions","","index-of"), 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_STAR),
-        FunctionConsts::FN_INDEX_OF_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_empty,
-        (createQName("http://www.w3.org/2005/xpath-functions","","empty"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_EMPTY_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_exists,
-        (createQName("http://www.w3.org/2005/xpath-functions","","exists"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_EXISTS_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_distinct_values,
-        (createQName("http://www.w3.org/2005/xpath-functions","","distinct-values"), 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR),
-        FunctionConsts::FN_DISTINCT_VALUES_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_distinct_values,
-        (createQName("http://www.w3.org/2005/xpath-functions","","distinct-values"), 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR),
-        FunctionConsts::FN_DISTINCT_VALUES_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_insert_before,
-        (createQName("http://www.w3.org/2005/xpath-functions","","insert-before"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
-        FunctionConsts::FN_INSERT_BEFORE_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_remove,
-        (createQName("http://www.w3.org/2005/xpath-functions","","remove"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
-        FunctionConsts::FN_REMOVE_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_reverse,
-        (createQName("http://www.w3.org/2005/xpath-functions","","reverse"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
-        FunctionConsts::FN_REVERSE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_subsequence,
-        (createQName("http://www.w3.org/2005/xpath-functions","","subsequence"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
-        FunctionConsts::FN_SUBSEQUENCE_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_subsequence,
-        (createQName("http://www.w3.org/2005/xpath-functions","","subsequence"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
-        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
-        FunctionConsts::FN_SUBSEQUENCE_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_zorba_subsequence_int,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","subsequence-int"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
-        FunctionConsts::OP_ZORBA_SUBSEQUENCE_INT_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_zorba_subsequence_int,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","subsequence-int"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
-        FunctionConsts::OP_ZORBA_SUBSEQUENCE_INT_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_zorba_sequence_point_access,
-        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","sequence-point-access"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
-        GENV_TYPESYSTEM.ITEM_TYPE_QUESTION),
-        FunctionConsts::OP_ZORBA_SEQUENCE_POINT_ACCESS_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_zero_or_one,
-        (createQName("http://www.w3.org/2005/xpath-functions","","zero-or-one"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.ITEM_TYPE_QUESTION),
-        FunctionConsts::FN_ZERO_OR_ONE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_one_or_more,
-        (createQName("http://www.w3.org/2005/xpath-functions","","one-or-more"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.ITEM_TYPE_PLUS),
-        FunctionConsts::FN_ONE_OR_MORE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_deep_equal,
-        (createQName("http://www.w3.org/2005/xpath-functions","","deep-equal"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_DEEP_EQUAL_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_deep_equal,
-        (createQName("http://www.w3.org/2005/xpath-functions","","deep-equal"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_DEEP_EQUAL_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_count,
-        (createQName("http://www.w3.org/2005/xpath-functions","","count"), 
-        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
-        FunctionConsts::FN_COUNT_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_avg,
-        (createQName("http://www.w3.org/2005/xpath-functions","","avg"), 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
-        FunctionConsts::FN_AVG_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_sum,
-        (createQName("http://www.w3.org/2005/xpath-functions","","sum"), 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_ONE),
-        FunctionConsts::FN_SUM_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_sum,
-        (createQName("http://www.w3.org/2005/xpath-functions","","sum"), 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
-        FunctionConsts::FN_SUM_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_sum_double,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_double"), 
-        GENV_TYPESYSTEM.DOUBLE_TYPE_STAR, 
-        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
-        FunctionConsts::OP_SUM_DOUBLE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_sum_double,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_double"), 
-        GENV_TYPESYSTEM.DOUBLE_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
-        FunctionConsts::OP_SUM_DOUBLE_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_sum_float,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_float"), 
-        GENV_TYPESYSTEM.FLOAT_TYPE_STAR, 
-        GENV_TYPESYSTEM.FLOAT_TYPE_ONE),
-        FunctionConsts::OP_SUM_FLOAT_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_sum_float,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_float"), 
-        GENV_TYPESYSTEM.FLOAT_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
-        FunctionConsts::OP_SUM_FLOAT_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_sum_decimal,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_decimal"), 
-        GENV_TYPESYSTEM.DECIMAL_TYPE_STAR, 
-        GENV_TYPESYSTEM.DECIMAL_TYPE_ONE),
-        FunctionConsts::OP_SUM_DECIMAL_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_sum_decimal,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_decimal"), 
-        GENV_TYPESYSTEM.DECIMAL_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
-        FunctionConsts::OP_SUM_DECIMAL_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_sum_integer,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_integer"), 
-        GENV_TYPESYSTEM.INTEGER_TYPE_STAR, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
-        FunctionConsts::OP_SUM_INTEGER_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_sum_integer,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_integer"), 
-        GENV_TYPESYSTEM.INTEGER_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
-        FunctionConsts::OP_SUM_INTEGER_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_to,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","to"), 
-        GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_STAR),
-        FunctionConsts::OP_TO_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_id,
-        (createQName("http://www.w3.org/2005/xpath-functions","","id"), 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
-        GENV_TYPESYSTEM.ELEMENT_TYPE_STAR),
-        FunctionConsts::FN_ID_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_id,
-        (createQName("http://www.w3.org/2005/xpath-functions","","id"), 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
-        GENV_TYPESYSTEM.ELEMENT_TYPE_STAR),
-        FunctionConsts::FN_ID_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_element_with_id,
-        (createQName("http://www.w3.org/2005/xpath-functions","","element-with-id"), 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
-        GENV_TYPESYSTEM.ELEMENT_TYPE_STAR),
-        FunctionConsts::FN_ELEMENT_WITH_ID_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_element_with_id,
-        (createQName("http://www.w3.org/2005/xpath-functions","","element-with-id"), 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
-        GENV_TYPESYSTEM.ELEMENT_TYPE_STAR),
-        FunctionConsts::FN_ELEMENT_WITH_ID_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_idref,
-        (createQName("http://www.w3.org/2005/xpath-functions","","idref"), 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR),
-        FunctionConsts::FN_IDREF_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_idref,
-        (createQName("http://www.w3.org/2005/xpath-functions","","idref"), 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
-        GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
-        GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR),
-        FunctionConsts::FN_IDREF_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_doc,
-        (createQName("http://www.w3.org/2005/xpath-functions","","doc"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.DOCUMENT_UNTYPED_TYPE_QUESTION),
-        FunctionConsts::FN_DOC_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_doc_available,
-        (createQName("http://www.w3.org/2005/xpath-functions","","doc-available"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_DOC_AVAILABLE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_available_environment_variables_3_0,
-        (createQName("http://www.w3.org/2005/xpath-functions","","available-environment-variables"), 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR),
-        FunctionConsts::FN_AVAILABLE_ENVIRONMENT_VARIABLES_0);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_environment_variable_3_0,
-        (createQName("http://www.w3.org/2005/xpath-functions","","environment-variable"), 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION),
-        FunctionConsts::FN_ENVIRONMENT_VARIABLE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_unparsed_text_3_0,
-        (createQName("http://www.w3.org/2005/xpath-functions","","unparsed-text"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION),
-        FunctionConsts::FN_UNPARSED_TEXT_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_unparsed_text_3_0,
-        (createQName("http://www.w3.org/2005/xpath-functions","","unparsed-text"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION),
-        FunctionConsts::FN_UNPARSED_TEXT_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_unparsed_text_available_3_0,
-        (createQName("http://www.w3.org/2005/xpath-functions","","unparsed-text-available"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION),
-        FunctionConsts::FN_UNPARSED_TEXT_AVAILABLE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_unparsed_text_available_3_0,
-        (createQName("http://www.w3.org/2005/xpath-functions","","unparsed-text-available"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION),
-        FunctionConsts::FN_UNPARSED_TEXT_AVAILABLE_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_unparsed_text_lines_3_0,
-        (createQName("http://www.w3.org/2005/xpath-functions","","unparsed-text-lines"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR),
-        FunctionConsts::FN_UNPARSED_TEXT_LINES_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_unparsed_text_lines_3_0,
-        (createQName("http://www.w3.org/2005/xpath-functions","","unparsed-text-lines"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR),
-        FunctionConsts::FN_UNPARSED_TEXT_LINES_2);
-
-  }
-
-}
-
-
-}
-
-
-
+/*
+ * 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.
+ */
+ 
+// ******************************************
+// *                                        *
+// * THIS IS A GENERATED FILE. DO NOT EDIT! *
+// * SEE .xml FILE WITH SAME NAME           *
+// *                                        *
+// ******************************************
+
+
+#include "stdafx.h"
+#include "runtime/sequences/sequences.h"
+#include "functions/func_sequences.h"
+#include "system/globalenv.h"
+#include "types/typeops.h"
+#include "compiler/expression/expr_base.h"
+
+
+namespace zorba{
+
+
+
+PlanIter_t op_concatenate::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnConcatIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_index_of::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnIndexOfIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_empty::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnEmptyIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_exists::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnExistsIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_distinct_values::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnDistinctValuesIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_insert_before::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnInsertBeforeIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_remove::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnRemoveIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_reverse::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnReverseIterator(sctx, loc, argv);
+}
+
+
+
+
+
+PlanIter_t fn_one_or_more::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnOneOrMoreIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_deep_equal::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnDeepEqualIterator(sctx, loc, argv);
+}
+
+
+PlanIter_t fn_avg::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnAvgIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_sum::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnSumIterator(sctx, loc, argv);
+}
+
+PlanIter_t op_sum_double::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnSumDoubleIterator(sctx, loc, argv);
+}
+
+PlanIter_t op_sum_float::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnSumFloatIterator(sctx, loc, argv);
+}
+
+PlanIter_t op_sum_decimal::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnSumDecimalIterator(sctx, loc, argv);
+}
+
+PlanIter_t op_sum_integer::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnSumIntegerIterator(sctx, loc, argv);
+}
+
+PlanIter_t op_to::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new OpToIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_id::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnIdIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_element_with_id::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnElementWithIdIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_idref::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnIdRefIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_doc::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnDocIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_doc_available::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnDocAvailableIterator(sctx, loc, argv);
+}
+
+void populate_context_sequences(static_context* sctx)
+{
+  {
+    std::vector<xqtref_t> lParamTypes;
+    lParamTypes.push_back(GENV_TYPESYSTEM.ITEM_TYPE_STAR);
+
+    DECL_WITH_KIND(sctx, op_concatenate,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","concatenate"), 
+        lParamTypes, GENV_TYPESYSTEM.ITEM_TYPE_STAR, true),
+        FunctionConsts::OP_CONCATENATE_N);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_index_of,
+        (createQName("http://www.w3.org/2005/xpath-functions","","index-of"), 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_ONE, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_STAR),
+        FunctionConsts::FN_INDEX_OF_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_index_of,
+        (createQName("http://www.w3.org/2005/xpath-functions","","index-of"), 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_STAR),
+        FunctionConsts::FN_INDEX_OF_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_empty,
+        (createQName("http://www.w3.org/2005/xpath-functions","","empty"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_EMPTY_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_exists,
+        (createQName("http://www.w3.org/2005/xpath-functions","","exists"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_EXISTS_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_distinct_values,
+        (createQName("http://www.w3.org/2005/xpath-functions","","distinct-values"), 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR),
+        FunctionConsts::FN_DISTINCT_VALUES_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_distinct_values,
+        (createQName("http://www.w3.org/2005/xpath-functions","","distinct-values"), 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR),
+        FunctionConsts::FN_DISTINCT_VALUES_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_insert_before,
+        (createQName("http://www.w3.org/2005/xpath-functions","","insert-before"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
+        FunctionConsts::FN_INSERT_BEFORE_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_remove,
+        (createQName("http://www.w3.org/2005/xpath-functions","","remove"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
+        FunctionConsts::FN_REMOVE_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_reverse,
+        (createQName("http://www.w3.org/2005/xpath-functions","","reverse"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
+        FunctionConsts::FN_REVERSE_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_subsequence,
+        (createQName("http://www.w3.org/2005/xpath-functions","","subsequence"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
+        FunctionConsts::FN_SUBSEQUENCE_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_subsequence,
+        (createQName("http://www.w3.org/2005/xpath-functions","","subsequence"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
+        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
+        FunctionConsts::FN_SUBSEQUENCE_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_zorba_subsequence_int,
+        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","subsequence-int"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
+        FunctionConsts::OP_ZORBA_SUBSEQUENCE_INT_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_zorba_subsequence_int,
+        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","subsequence-int"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR),
+        FunctionConsts::OP_ZORBA_SUBSEQUENCE_INT_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_zorba_sequence_point_access,
+        (createQName("http://www.zorba-xquery.com/internal/zorba-ops","","sequence-point-access"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
+        GENV_TYPESYSTEM.ITEM_TYPE_QUESTION),
+        FunctionConsts::OP_ZORBA_SEQUENCE_POINT_ACCESS_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_zero_or_one,
+        (createQName("http://www.w3.org/2005/xpath-functions","","zero-or-one"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.ITEM_TYPE_QUESTION),
+        FunctionConsts::FN_ZERO_OR_ONE_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_one_or_more,
+        (createQName("http://www.w3.org/2005/xpath-functions","","one-or-more"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.ITEM_TYPE_PLUS),
+        FunctionConsts::FN_ONE_OR_MORE_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_deep_equal,
+        (createQName("http://www.w3.org/2005/xpath-functions","","deep-equal"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_DEEP_EQUAL_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_deep_equal,
+        (createQName("http://www.w3.org/2005/xpath-functions","","deep-equal"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_DEEP_EQUAL_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_count,
+        (createQName("http://www.w3.org/2005/xpath-functions","","count"), 
+        GENV_TYPESYSTEM.ITEM_TYPE_STAR, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
+        FunctionConsts::FN_COUNT_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_avg,
+        (createQName("http://www.w3.org/2005/xpath-functions","","avg"), 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
+        FunctionConsts::FN_AVG_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_sum,
+        (createQName("http://www.w3.org/2005/xpath-functions","","sum"), 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_ONE),
+        FunctionConsts::FN_SUM_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_sum,
+        (createQName("http://www.w3.org/2005/xpath-functions","","sum"), 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
+        FunctionConsts::FN_SUM_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_sum_double,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_double"), 
+        GENV_TYPESYSTEM.DOUBLE_TYPE_STAR, 
+        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE),
+        FunctionConsts::OP_SUM_DOUBLE_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_sum_double,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_double"), 
+        GENV_TYPESYSTEM.DOUBLE_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
+        FunctionConsts::OP_SUM_DOUBLE_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_sum_float,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_float"), 
+        GENV_TYPESYSTEM.FLOAT_TYPE_STAR, 
+        GENV_TYPESYSTEM.FLOAT_TYPE_ONE),
+        FunctionConsts::OP_SUM_FLOAT_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_sum_float,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_float"), 
+        GENV_TYPESYSTEM.FLOAT_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
+        FunctionConsts::OP_SUM_FLOAT_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_sum_decimal,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_decimal"), 
+        GENV_TYPESYSTEM.DECIMAL_TYPE_STAR, 
+        GENV_TYPESYSTEM.DECIMAL_TYPE_ONE),
+        FunctionConsts::OP_SUM_DECIMAL_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_sum_decimal,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_decimal"), 
+        GENV_TYPESYSTEM.DECIMAL_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
+        FunctionConsts::OP_SUM_DECIMAL_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_sum_integer,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_integer"), 
+        GENV_TYPESYSTEM.INTEGER_TYPE_STAR, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
+        FunctionConsts::OP_SUM_INTEGER_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_sum_integer,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","sum_integer"), 
+        GENV_TYPESYSTEM.INTEGER_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION),
+        FunctionConsts::OP_SUM_INTEGER_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_to,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","to"), 
+        GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_STAR),
+        FunctionConsts::OP_TO_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_id,
+        (createQName("http://www.w3.org/2005/xpath-functions","","id"), 
+        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
+        GENV_TYPESYSTEM.ELEMENT_TYPE_STAR),
+        FunctionConsts::FN_ID_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_id,
+        (createQName("http://www.w3.org/2005/xpath-functions","","id"), 
+        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
+        GENV_TYPESYSTEM.ELEMENT_TYPE_STAR),
+        FunctionConsts::FN_ID_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_element_with_id,
+        (createQName("http://www.w3.org/2005/xpath-functions","","element-with-id"), 
+        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
+        GENV_TYPESYSTEM.ELEMENT_TYPE_STAR),
+        FunctionConsts::FN_ELEMENT_WITH_ID_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_element_with_id,
+        (createQName("http://www.w3.org/2005/xpath-functions","","element-with-id"), 
+        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
+        GENV_TYPESYSTEM.ELEMENT_TYPE_STAR),
+        FunctionConsts::FN_ELEMENT_WITH_ID_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_idref,
+        (createQName("http://www.w3.org/2005/xpath-functions","","idref"), 
+        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR),
+        FunctionConsts::FN_IDREF_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_idref,
+        (createQName("http://www.w3.org/2005/xpath-functions","","idref"), 
+        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
+        GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE, 
+        GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR),
+        FunctionConsts::FN_IDREF_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_doc,
+        (createQName("http://www.w3.org/2005/xpath-functions","","doc"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.DOCUMENT_UNTYPED_TYPE_QUESTION),
+        FunctionConsts::FN_DOC_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_doc_available,
+        (createQName("http://www.w3.org/2005/xpath-functions","","doc-available"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_DOC_AVAILABLE_1);
+
+  }
+
+}
+
+
+}
+
+
+

=== modified file 'src/functions/pregenerated/func_sequences.h'
--- src/functions/pregenerated/func_sequences.h	2012-04-24 12:39:38 +0000
+++ src/functions/pregenerated/func_sequences.h	2012-05-02 07:18:18 +0000
@@ -1,708 +1,633 @@
-/*
- * 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.
- */
- 
-// ******************************************
-// *                                        *
-// * THIS IS A GENERATED FILE. DO NOT EDIT! *
-// * SEE .xml FILE WITH SAME NAME           *
-// *                                        *
-// ******************************************
-
-
-#ifndef ZORBA_FUNCTIONS_SEQUENCES_H
-#define ZORBA_FUNCTIONS_SEQUENCES_H
-
-
-#include "common/shared_types.h"
-#include "functions/function_impl.h"
-
-
-namespace zorba {
-
-
-void populate_context_sequences(static_context* sctx);
-
-
-
-
-//op:concatenate
-class op_concatenate : public function
-{
-public:
-  op_concatenate(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  xqtref_t getReturnType(const fo_expr* caller) const;
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:index-of
-class fn_index_of : public function
-{
-public:
-  fn_index_of(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:empty
-class fn_empty : public function
-{
-public:
-  fn_empty(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:exists
-class fn_exists : public function
-{
-public:
-  fn_exists(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:distinct-values
-class fn_distinct_values : public function
-{
-public:
-  fn_distinct_values(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  xqtref_t getReturnType(const fo_expr* caller) const;
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  CODEGEN_DECL();
-};
-
-
-//fn:insert-before
-class fn_insert_before : public function
-{
-public:
-  fn_insert_before(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  xqtref_t getReturnType(const fo_expr* caller) const;
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:remove
-class fn_remove : public function
-{
-public:
-  fn_remove(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  xqtref_t getReturnType(const fo_expr* caller) const;
-
-  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
-
-  bool propagatesSortedNodes(csize producer) const { return producer == 0; }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:reverse
-class fn_reverse : public function
-{
-public:
-  fn_reverse(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  xqtref_t getReturnType(const fo_expr* caller) const;
-
-  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:subsequence
-class fn_subsequence : public function
-{
-public:
-  fn_subsequence(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  xqtref_t getReturnType(const fo_expr* caller) const;
-
-  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
-
-  bool propagatesSortedNodes(csize producer) const { return producer == 0; }
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  bool serializable() const { return true; }
-
-  CODEGEN_DECL();
-};
-
-
-//op-zorba:subsequence-int
-class op_zorba_subsequence_int : public function
-{
-public:
-  op_zorba_subsequence_int(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  xqtref_t getReturnType(const fo_expr* caller) const;
-
-  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
-
-  bool propagatesSortedNodes(csize producer) const { return producer == 0; }
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//op-zorba:sequence-point-access
-class op_zorba_sequence_point_access : public function
-{
-public:
-  op_zorba_sequence_point_access(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  xqtref_t getReturnType(const fo_expr* caller) const;
-
-  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
-
-  bool propagatesSortedNodes(csize producer) const { return producer == 0; }
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:zero-or-one
-class fn_zero_or_one : public function
-{
-public:
-  fn_zero_or_one(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  xqtref_t getReturnType(const fo_expr* caller) const;
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:one-or-more
-class fn_one_or_more : public function
-{
-public:
-  fn_one_or_more(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  xqtref_t getReturnType(const fo_expr* caller) const;
-
-  bool isMap(ulong producer) const { return producer == 0; }
-
-  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
-
-  bool propagatesSortedNodes(csize producer) const { return producer == 0; }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:deep-equal
-class fn_deep_equal : public function
-{
-public:
-  fn_deep_equal(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  bool accessesDynCtx() const { return true; }
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:count
-class fn_count : public function
-{
-public:
-  fn_count(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:avg
-class fn_avg : public function
-{
-public:
-  fn_avg(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  CODEGEN_DECL();
-};
-
-
-//fn:sum
-class fn_sum : public function
-{
-public:
-  fn_sum(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  bool specializable() const { return true; }
-
-  function* specialize( static_context* sctx,
-                        const std::vector<xqtref_t>& argTypes) const;
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  CODEGEN_DECL();
-};
-
-
-//op:sum_double
-class op_sum_double : public function
-{
-public:
-  op_sum_double(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  CODEGEN_DECL();
-};
-
-
-//op:sum_float
-class op_sum_float : public function
-{
-public:
-  op_sum_float(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  CODEGEN_DECL();
-};
-
-
-//op:sum_decimal
-class op_sum_decimal : public function
-{
-public:
-  op_sum_decimal(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  CODEGEN_DECL();
-};
-
-
-//op:sum_integer
-class op_sum_integer : public function
-{
-public:
-  op_sum_integer(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  CODEGEN_DECL();
-};
-
-
-//op:to
-class op_to : public function
-{
-public:
-  op_to(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:id
-class fn_id : public function
-{
-public:
-  fn_id(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  FunctionConsts::AnnotationValue producesDistinctNodes() const 
-  {
-    return FunctionConsts::YES;
-  }
-
-  FunctionConsts::AnnotationValue producesSortedNodes() const 
-  {
-    return FunctionConsts::YES;
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return producer == 1; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:element-with-id
-class fn_element_with_id : public function
-{
-public:
-  fn_element_with_id(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  FunctionConsts::AnnotationValue producesDistinctNodes() const 
-  {
-    return FunctionConsts::YES;
-  }
-
-  FunctionConsts::AnnotationValue producesSortedNodes() const 
-  {
-    return FunctionConsts::YES;
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return producer == 1; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:idref
-class fn_idref : public function
-{
-public:
-  fn_idref(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  FunctionConsts::AnnotationValue producesDistinctNodes() const 
-  {
-    return FunctionConsts::YES;
-  }
-
-  FunctionConsts::AnnotationValue producesSortedNodes() const 
-  {
-    return FunctionConsts::YES;
-  }
-
-  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
-
-  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
-
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return producer == 1; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:doc
-class fn_doc : public function
-{
-public:
-  fn_doc(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  bool accessesDynCtx() const { return true; }
-
-  bool isSource() const { return true; }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:doc-available
-class fn_doc_available : public function
-{
-public:
-  fn_doc_available(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-
-  }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:available-environment-variables
-class fn_available_environment_variables_3_0 : public function
-{
-public:
-  fn_available_environment_variables_3_0(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-theXQueryVersion = StaticContextConsts::xquery_version_3_0;
-  }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:environment-variable
-class fn_environment_variable_3_0 : public function
-{
-public:
-  fn_environment_variable_3_0(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-theXQueryVersion = StaticContextConsts::xquery_version_3_0;
-  }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:unparsed-text
-class fn_unparsed_text_3_0 : public function
-{
-public:
-  fn_unparsed_text_3_0(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-theXQueryVersion = StaticContextConsts::xquery_version_3_0;
-  }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:unparsed-text-available
-class fn_unparsed_text_available_3_0 : public function
-{
-public:
-  fn_unparsed_text_available_3_0(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-theXQueryVersion = StaticContextConsts::xquery_version_3_0;
-  }
-
-  CODEGEN_DECL();
-};
-
-
-//fn:unparsed-text-lines
-class fn_unparsed_text_lines_3_0 : public function
-{
-public:
-  fn_unparsed_text_lines_3_0(const signature& sig, FunctionConsts::FunctionKind kind)
-    : 
-    function(sig, kind)
-  {
-theXQueryVersion = StaticContextConsts::xquery_version_3_0;
-  }
-
-  CODEGEN_DECL();
-};
-
-
-} //namespace zorba
-
-
-#endif
-/*
- * Local variables:
- * mode: c++
- * End:
- */ 
+/*
+ * 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.
+ */
+ 
+// ******************************************
+// *                                        *
+// * THIS IS A GENERATED FILE. DO NOT EDIT! *
+// * SEE .xml FILE WITH SAME NAME           *
+// *                                        *
+// ******************************************
+
+
+#ifndef ZORBA_FUNCTIONS_SEQUENCES_H
+#define ZORBA_FUNCTIONS_SEQUENCES_H
+
+
+#include "common/shared_types.h"
+#include "functions/function_impl.h"
+
+
+namespace zorba {
+
+
+void populate_context_sequences(static_context* sctx);
+
+
+
+
+//op:concatenate
+class op_concatenate : public function
+{
+public:
+  op_concatenate(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:index-of
+class fn_index_of : public function
+{
+public:
+  fn_index_of(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:empty
+class fn_empty : public function
+{
+public:
+  fn_empty(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:exists
+class fn_exists : public function
+{
+public:
+  fn_exists(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:distinct-values
+class fn_distinct_values : public function
+{
+public:
+  fn_distinct_values(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  CODEGEN_DECL();
+};
+
+
+//fn:insert-before
+class fn_insert_before : public function
+{
+public:
+  fn_insert_before(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:remove
+class fn_remove : public function
+{
+public:
+  fn_remove(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
+
+  bool propagatesSortedNodes(csize producer) const { return producer == 0; }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:reverse
+class fn_reverse : public function
+{
+public:
+  fn_reverse(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:subsequence
+class fn_subsequence : public function
+{
+public:
+  fn_subsequence(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
+
+  bool propagatesSortedNodes(csize producer) const { return producer == 0; }
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  bool serializable() const { return true; }
+
+  CODEGEN_DECL();
+};
+
+
+//op-zorba:subsequence-int
+class op_zorba_subsequence_int : public function
+{
+public:
+  op_zorba_subsequence_int(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
+
+  bool propagatesSortedNodes(csize producer) const { return producer == 0; }
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//op-zorba:sequence-point-access
+class op_zorba_sequence_point_access : public function
+{
+public:
+  op_zorba_sequence_point_access(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
+
+  bool propagatesSortedNodes(csize producer) const { return producer == 0; }
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:zero-or-one
+class fn_zero_or_one : public function
+{
+public:
+  fn_zero_or_one(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:one-or-more
+class fn_one_or_more : public function
+{
+public:
+  fn_one_or_more(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  xqtref_t getReturnType(const fo_expr* caller) const;
+
+  bool isMap(ulong producer) const { return producer == 0; }
+
+  bool propagatesDistinctNodes(csize producer) const { return producer == 0; }
+
+  bool propagatesSortedNodes(csize producer) const { return producer == 0; }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:deep-equal
+class fn_deep_equal : public function
+{
+public:
+  fn_deep_equal(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  bool accessesDynCtx() const { return true; }
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:count
+class fn_count : public function
+{
+public:
+  fn_count(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:avg
+class fn_avg : public function
+{
+public:
+  fn_avg(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  CODEGEN_DECL();
+};
+
+
+//fn:sum
+class fn_sum : public function
+{
+public:
+  fn_sum(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  bool specializable() const { return true; }
+
+  function* specialize( static_context* sctx,
+                        const std::vector<xqtref_t>& argTypes) const;
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  CODEGEN_DECL();
+};
+
+
+//op:sum_double
+class op_sum_double : public function
+{
+public:
+  op_sum_double(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  CODEGEN_DECL();
+};
+
+
+//op:sum_float
+class op_sum_float : public function
+{
+public:
+  op_sum_float(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  CODEGEN_DECL();
+};
+
+
+//op:sum_decimal
+class op_sum_decimal : public function
+{
+public:
+  op_sum_decimal(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  CODEGEN_DECL();
+};
+
+
+//op:sum_integer
+class op_sum_integer : public function
+{
+public:
+  op_sum_integer(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  CODEGEN_DECL();
+};
+
+
+//op:to
+class op_to : public function
+{
+public:
+  op_to(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:id
+class fn_id : public function
+{
+public:
+  fn_id(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  FunctionConsts::AnnotationValue producesDistinctNodes() const 
+  {
+    return FunctionConsts::YES;
+  }
+
+  FunctionConsts::AnnotationValue producesSortedNodes() const 
+  {
+    return FunctionConsts::YES;
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return producer == 1; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:element-with-id
+class fn_element_with_id : public function
+{
+public:
+  fn_element_with_id(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  FunctionConsts::AnnotationValue producesDistinctNodes() const 
+  {
+    return FunctionConsts::YES;
+  }
+
+  FunctionConsts::AnnotationValue producesSortedNodes() const 
+  {
+    return FunctionConsts::YES;
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return producer == 1; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:idref
+class fn_idref : public function
+{
+public:
+  fn_idref(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  FunctionConsts::AnnotationValue producesDistinctNodes() const 
+  {
+    return FunctionConsts::YES;
+  }
+
+  FunctionConsts::AnnotationValue producesSortedNodes() const 
+  {
+    return FunctionConsts::YES;
+  }
+
+  BoolAnnotationValue ignoresSortedNodes(expr* fo, csize producer) const;
+
+  BoolAnnotationValue ignoresDuplicateNodes(expr* fo, csize producer) const;
+
+  bool mustCopyInputNodes(expr* fo, csize producer) const { return producer == 1; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:doc
+class fn_doc : public function
+{
+public:
+  fn_doc(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  bool accessesDynCtx() const { return true; }
+
+  bool isSource() const { return true; }
+
+  CODEGEN_DECL();
+};
+
+
+//fn:doc-available
+class fn_doc_available : public function
+{
+public:
+  fn_doc_available(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  CODEGEN_DECL();
+};
+
+
+} //namespace zorba
+
+
+#endif
+/*
+ * Local variables:
+ * mode: c++
+ * End:
+ */ 

=== modified file 'src/functions/pregenerated/func_strings.cpp'
--- src/functions/pregenerated/func_strings.cpp	2012-04-24 12:39:38 +0000
+++ src/functions/pregenerated/func_strings.cpp	2012-05-02 07:18:18 +0000
@@ -1,895 +1,922 @@
-/*
- * 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.
- */
- 
-// ******************************************
-// *                                        *
-// * THIS IS A GENERATED FILE. DO NOT EDIT! *
-// * SEE .xml FILE WITH SAME NAME           *
-// *                                        *
-// ******************************************
-
-
-#include "stdafx.h"
-#include "runtime/strings/strings.h"
-#include "functions/func_strings.h"
-
-
-namespace zorba{
-
-
-
-PlanIter_t fn_codepoints_to_string::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new CodepointsToStringIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_string_to_codepoints::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new StringToCodepointsIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_compare::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new CompareStrIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_codepoint_equal::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new CodepointEqualIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_concat::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new ConcatStrIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_string_join_3_0::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new StringJoinIterator(sctx, loc, argv);
-}
-PlanIter_t fn_string_join::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new StringJoinIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_substring::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new SubstringIterator(sctx, loc, argv);
-}
-
-PlanIter_t op_substring_int::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new SubstringIntOptIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_string_length::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new StringLengthIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_normalize_space::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new NormalizeSpaceIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_normalize_unicode::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new NormalizeUnicodeIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_upper_case::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new UpperCaseIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_lower_case::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new LowerCaseIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_translate::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new TranslateIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_encode_for_uri::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new EncodeForUriIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_iri_to_uri::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new IriToUriIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_escape_html_uri::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new EscapeHtmlUriIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_contains::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new ContainsIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_starts_with::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new StartsWithIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_ends_with::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new EndsWithIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_substring_before::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new SubstringBeforeIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_substring_after::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new SubstringAfterIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_matches::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnMatchesIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_replace::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnReplaceIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_tokenize::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnTokenizeIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_analyze_string_3_0::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new FnAnalyzeStringIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_zorba_string_materialize::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new StringMaterializeIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_zorba_string_is_streamable::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new StringIsStreamableIterator(sctx, loc, argv);
-}
-
-PlanIter_t fn_zorba_string_split::codegen(
-  CompilerCB*,
-  static_context* sctx,
-  const QueryLoc& loc,
-  std::vector<PlanIter_t>& argv,
-  expr& ann) const
-{
-  return new StringSplitIterator(sctx, loc, argv);
-}
-
-void populate_context_strings(static_context* sctx)
-{
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_codepoints_to_string,
-        (createQName("http://www.w3.org/2005/xpath-functions","","codepoints-to-string"), 
-        GENV_TYPESYSTEM.INTEGER_TYPE_STAR, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_CODEPOINTS_TO_STRING_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_string_to_codepoints,
-        (createQName("http://www.w3.org/2005/xpath-functions","","string-to-codepoints"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_STAR),
-        FunctionConsts::FN_STRING_TO_CODEPOINTS_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_compare,
-        (createQName("http://www.w3.org/2005/xpath-functions","","compare"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION),
-        FunctionConsts::FN_COMPARE_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_compare,
-        (createQName("http://www.w3.org/2005/xpath-functions","","compare"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION),
-        FunctionConsts::FN_COMPARE_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_codepoint_equal,
-        (createQName("http://www.w3.org/2005/xpath-functions","","codepoint-equal"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_QUESTION),
-        FunctionConsts::FN_CODEPOINT_EQUAL_2);
-
-  }
-
-
-  {
-    std::vector<xqtref_t> lParamTypes;
-    lParamTypes.push_back(GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION);
-
-    DECL_WITH_KIND(sctx, fn_concat,
-        (createQName("http://www.w3.org/2005/xpath-functions","","concat"), 
-        lParamTypes, GENV_TYPESYSTEM.STRING_TYPE_ONE, true),
-        FunctionConsts::FN_CONCAT_N);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_string_join_3_0,
-        (createQName("http://www.w3.org/2005/xpath-functions","","string-join"), 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_STRING_JOIN_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_string_join,
-        (createQName("http://www.w3.org/2005/xpath-functions","","string-join"), 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_STRING_JOIN_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_substring,
-        (createQName("http://www.w3.org/2005/xpath-functions","","substring"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_SUBSTRING_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_substring,
-        (createQName("http://www.w3.org/2005/xpath-functions","","substring"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
-        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_SUBSTRING_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_substring_int,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","substring_int"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::OP_SUBSTRING_INT_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, op_substring_int,
-        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","substring_int"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::OP_SUBSTRING_INT_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_string_length,
-        (createQName("http://www.w3.org/2005/xpath-functions","","string-length"), 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
-        FunctionConsts::FN_STRING_LENGTH_0);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_string_length,
-        (createQName("http://www.w3.org/2005/xpath-functions","","string-length"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
-        FunctionConsts::FN_STRING_LENGTH_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_normalize_space,
-        (createQName("http://www.w3.org/2005/xpath-functions","","normalize-space"), 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_NORMALIZE_SPACE_0);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_normalize_space,
-        (createQName("http://www.w3.org/2005/xpath-functions","","normalize-space"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_NORMALIZE_SPACE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_normalize_unicode,
-        (createQName("http://www.w3.org/2005/xpath-functions","","normalize-unicode"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_NORMALIZE_UNICODE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_normalize_unicode,
-        (createQName("http://www.w3.org/2005/xpath-functions","","normalize-unicode"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_NORMALIZE_UNICODE_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_upper_case,
-        (createQName("http://www.w3.org/2005/xpath-functions","","upper-case"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_UPPER_CASE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_lower_case,
-        (createQName("http://www.w3.org/2005/xpath-functions","","lower-case"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_LOWER_CASE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_translate,
-        (createQName("http://www.w3.org/2005/xpath-functions","","translate"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_TRANSLATE_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_encode_for_uri,
-        (createQName("http://www.w3.org/2005/xpath-functions","","encode-for-uri"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_ENCODE_FOR_URI_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_iri_to_uri,
-        (createQName("http://www.w3.org/2005/xpath-functions","","iri-to-uri"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_IRI_TO_URI_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_escape_html_uri,
-        (createQName("http://www.w3.org/2005/xpath-functions","","escape-html-uri"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_ESCAPE_HTML_URI_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_contains,
-        (createQName("http://www.w3.org/2005/xpath-functions","","contains"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_CONTAINS_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_contains,
-        (createQName("http://www.w3.org/2005/xpath-functions","","contains"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_CONTAINS_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_starts_with,
-        (createQName("http://www.w3.org/2005/xpath-functions","","starts-with"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_STARTS_WITH_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_starts_with,
-        (createQName("http://www.w3.org/2005/xpath-functions","","starts-with"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_STARTS_WITH_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_ends_with,
-        (createQName("http://www.w3.org/2005/xpath-functions","","ends-with"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_ENDS_WITH_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_ends_with,
-        (createQName("http://www.w3.org/2005/xpath-functions","","ends-with"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_ENDS_WITH_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_substring_before,
-        (createQName("http://www.w3.org/2005/xpath-functions","","substring-before"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_SUBSTRING_BEFORE_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_substring_before,
-        (createQName("http://www.w3.org/2005/xpath-functions","","substring-before"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_SUBSTRING_BEFORE_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_substring_after,
-        (createQName("http://www.w3.org/2005/xpath-functions","","substring-after"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_SUBSTRING_AFTER_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_substring_after,
-        (createQName("http://www.w3.org/2005/xpath-functions","","substring-after"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_SUBSTRING_AFTER_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_matches,
-        (createQName("http://www.w3.org/2005/xpath-functions","","matches"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_MATCHES_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_matches,
-        (createQName("http://www.w3.org/2005/xpath-functions","","matches"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_MATCHES_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_replace,
-        (createQName("http://www.w3.org/2005/xpath-functions","","replace"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_REPLACE_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_replace,
-        (createQName("http://www.w3.org/2005/xpath-functions","","replace"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_REPLACE_4);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_tokenize,
-        (createQName("http://www.w3.org/2005/xpath-functions","","tokenize"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR),
-        FunctionConsts::FN_TOKENIZE_2);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_tokenize,
-        (createQName("http://www.w3.org/2005/xpath-functions","","tokenize"), 
-        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR),
-        FunctionConsts::FN_TOKENIZE_3);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_zorba_string_materialize,
-        (createQName("http://www.zorba-xquery.com/modules/string","","materialize"), 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE),
-        FunctionConsts::FN_ZORBA_STRING_MATERIALIZE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_zorba_string_is_streamable,
-        (createQName("http://www.zorba-xquery.com/modules/string","","is-streamable"), 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-        FunctionConsts::FN_ZORBA_STRING_IS_STREAMABLE_1);
-
-  }
-
-
-  {
-    
-
-    DECL_WITH_KIND(sctx, fn_zorba_string_split,
-        (createQName("http://www.zorba-xquery.com/modules/string","","split"), 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
-        GENV_TYPESYSTEM.STRING_TYPE_STAR),
-        FunctionConsts::FN_ZORBA_STRING_SPLIT_2);
-
-  }
-
-}
-
-
-}
-
-
-
+/*
+ * 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.
+ */
+ 
+// ******************************************
+// *                                        *
+// * THIS IS A GENERATED FILE. DO NOT EDIT! *
+// * SEE .xml FILE WITH SAME NAME           *
+// *                                        *
+// ******************************************
+
+
+#include "stdafx.h"
+#include "runtime/strings/strings.h"
+#include "functions/func_strings.h"
+
+
+namespace zorba{
+
+
+
+PlanIter_t fn_codepoints_to_string::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new CodepointsToStringIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_string_to_codepoints::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new StringToCodepointsIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_compare::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new CompareStrIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_codepoint_equal::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new CodepointEqualIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_concat::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new ConcatStrIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_string_join_3_0::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new StringJoinIterator(sctx, loc, argv);
+}
+PlanIter_t fn_string_join::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new StringJoinIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_substring::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new SubstringIterator(sctx, loc, argv);
+}
+
+PlanIter_t op_substring_int::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new SubstringIntOptIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_string_length::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new StringLengthIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_normalize_space::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new NormalizeSpaceIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_normalize_unicode::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new NormalizeUnicodeIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_upper_case::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new UpperCaseIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_lower_case::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new LowerCaseIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_translate::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new TranslateIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_encode_for_uri::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new EncodeForUriIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_iri_to_uri::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new IriToUriIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_escape_html_uri::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new EscapeHtmlUriIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_contains::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new ContainsIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_starts_with::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new StartsWithIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_ends_with::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new EndsWithIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_substring_before::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new SubstringBeforeIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_substring_after::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new SubstringAfterIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_matches::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnMatchesIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_replace::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnReplaceIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_tokenize::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnTokenizeIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_analyze_string_3_0::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new FnAnalyzeStringIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_zorba_string_materialize::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new StringMaterializeIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_zorba_string_is_streamable::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new StringIsStreamableIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_zorba_string_split::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  expr& ann) const
+{
+  return new StringSplitIterator(sctx, loc, argv);
+}
+
+void populate_context_strings(static_context* sctx)
+{
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_codepoints_to_string,
+        (createQName("http://www.w3.org/2005/xpath-functions","","codepoints-to-string"), 
+        GENV_TYPESYSTEM.INTEGER_TYPE_STAR, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_CODEPOINTS_TO_STRING_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_string_to_codepoints,
+        (createQName("http://www.w3.org/2005/xpath-functions","","string-to-codepoints"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_STAR),
+        FunctionConsts::FN_STRING_TO_CODEPOINTS_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_compare,
+        (createQName("http://www.w3.org/2005/xpath-functions","","compare"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION),
+        FunctionConsts::FN_COMPARE_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_compare,
+        (createQName("http://www.w3.org/2005/xpath-functions","","compare"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION),
+        FunctionConsts::FN_COMPARE_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_codepoint_equal,
+        (createQName("http://www.w3.org/2005/xpath-functions","","codepoint-equal"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_QUESTION),
+        FunctionConsts::FN_CODEPOINT_EQUAL_2);
+
+  }
+
+
+  {
+    std::vector<xqtref_t> lParamTypes;
+    lParamTypes.push_back(GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION);
+
+    DECL_WITH_KIND(sctx, fn_concat,
+        (createQName("http://www.w3.org/2005/xpath-functions","","concat"), 
+        lParamTypes, GENV_TYPESYSTEM.STRING_TYPE_ONE, true),
+        FunctionConsts::FN_CONCAT_N);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_string_join_3_0,
+        (createQName("http://www.w3.org/2005/xpath-functions","","string-join"), 
+        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_STRING_JOIN_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_string_join,
+        (createQName("http://www.w3.org/2005/xpath-functions","","string-join"), 
+        GENV_TYPESYSTEM.STRING_TYPE_STAR, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_STRING_JOIN_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_substring,
+        (createQName("http://www.w3.org/2005/xpath-functions","","substring"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_SUBSTRING_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_substring,
+        (createQName("http://www.w3.org/2005/xpath-functions","","substring"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
+        GENV_TYPESYSTEM.DOUBLE_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_SUBSTRING_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_substring_int,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","substring_int"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::OP_SUBSTRING_INT_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, op_substring_int,
+        (createQName("http://www.zorba-xquery.com/internal/xquery-ops","","substring_int"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::OP_SUBSTRING_INT_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_string_length,
+        (createQName("http://www.w3.org/2005/xpath-functions","","string-length"), 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
+        FunctionConsts::FN_STRING_LENGTH_0);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_string_length,
+        (createQName("http://www.w3.org/2005/xpath-functions","","string-length"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
+        FunctionConsts::FN_STRING_LENGTH_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_normalize_space,
+        (createQName("http://www.w3.org/2005/xpath-functions","","normalize-space"), 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_NORMALIZE_SPACE_0);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_normalize_space,
+        (createQName("http://www.w3.org/2005/xpath-functions","","normalize-space"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_NORMALIZE_SPACE_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_normalize_unicode,
+        (createQName("http://www.w3.org/2005/xpath-functions","","normalize-unicode"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_NORMALIZE_UNICODE_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_normalize_unicode,
+        (createQName("http://www.w3.org/2005/xpath-functions","","normalize-unicode"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_NORMALIZE_UNICODE_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_upper_case,
+        (createQName("http://www.w3.org/2005/xpath-functions","","upper-case"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_UPPER_CASE_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_lower_case,
+        (createQName("http://www.w3.org/2005/xpath-functions","","lower-case"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_LOWER_CASE_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_translate,
+        (createQName("http://www.w3.org/2005/xpath-functions","","translate"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_TRANSLATE_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_encode_for_uri,
+        (createQName("http://www.w3.org/2005/xpath-functions","","encode-for-uri"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_ENCODE_FOR_URI_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_iri_to_uri,
+        (createQName("http://www.w3.org/2005/xpath-functions","","iri-to-uri"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_IRI_TO_URI_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_escape_html_uri,
+        (createQName("http://www.w3.org/2005/xpath-functions","","escape-html-uri"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_ESCAPE_HTML_URI_1);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_contains,
+        (createQName("http://www.w3.org/2005/xpath-functions","","contains"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_CONTAINS_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_contains,
+        (createQName("http://www.w3.org/2005/xpath-functions","","contains"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_CONTAINS_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_starts_with,
+        (createQName("http://www.w3.org/2005/xpath-functions","","starts-with"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_STARTS_WITH_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_starts_with,
+        (createQName("http://www.w3.org/2005/xpath-functions","","starts-with"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_STARTS_WITH_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_ends_with,
+        (createQName("http://www.w3.org/2005/xpath-functions","","ends-with"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_ENDS_WITH_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_ends_with,
+        (createQName("http://www.w3.org/2005/xpath-functions","","ends-with"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+        FunctionConsts::FN_ENDS_WITH_3);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_substring_before,
+        (createQName("http://www.w3.org/2005/xpath-functions","","substring-before"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_SUBSTRING_BEFORE_2);
+
+  }
+
+
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_substring_before,
+        (createQName("http://www.w3.org/2005/xpath-functions","","substring-before"), 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_QUESTION, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_SUBSTRING_BEFORE_3);
+
+  }
+
+
+  {
+    
+