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

[Markos Zaharioudakis]

1.In jsoniq mode, allow multiple default function namespaces and no need to use the xs prefix for naming builtin atomic types.
2. Optimization for indef-of function.

1.In jsoniq mode, allow multiple default function namespaces and no need to use the xs prefix for naming builtin atomic types.
2. Optimization for indef-of function.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

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

text conflict in ChangeLog

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-03-18T22-04-45.483Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job markos-scratch-2013-03-18T22-04-45.483Z is finished.
  The final status was:

  6 tests did not succeed - changes not commited.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-03-20T01-44-56.424Z/log.html

[Zorba Build Bot (zorba-buildbot)]

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

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job markos-scratch-2013-03-20T01-44-56.424Z is finished.
  The final status was:

  5 tests did not succeed - changes not commited.

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

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

11042. By Markos Zaharioudakis on 2013-03-20

a bug fix for index-of

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-03-20T02-52-48.899Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-03-20T02-52-48.899Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2013-03-16 20:55:24 +0000
+++ ChangeLog	2013-03-20 02:47:23 +0000
@@ -15,6 +15,7 @@
     for streamable strings and base64Binary.
   * Added millis-to-dateTime() function in datetime module.
   * fn:trace outputs "empty-sequence()" if the input is the empty-sequence.
+  * Allow multiple default function namespaces.
   * Added xqxq:variable-value function.
   * Added canonicalize function to modules/xml.
   * Added support for xs:dateTimeStamp type from XMLSchema 1.1, bug #924754.
 
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp	2013-02-07 17:24:36 +0000
+++ bin/zorbacmd.cpp	2013-03-20 02:47:23 +0000
@@ -673,6 +673,8 @@
   std::auto_ptr<std::fstream> planFile;
   std::fstream* planFilep = NULL;
 
+  lHints.jsoniq_mode = (qfilepath.rfind(".jq") == qfilepath.size() - 3);
+
   if (serializePlan)
   {
     if (savePlan || loadPlan)
@@ -724,6 +726,7 @@
   }
 
   Zorba_SerializerOptions lSerOptions = Zorba_SerializerOptions::SerializerOptionsFromStringParams(properties.getSerializerParameters());
+
   createSerializerOptions(lSerOptions, properties);
 
   zorba::XQuery_t query;
 
=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp	2013-02-07 17:24:36 +0000
+++ src/api/staticcontextimpl.cpp	2013-03-20 02:47:23 +0000
@@ -316,7 +316,7 @@
 
 ********************************************************************************/
 String
-StaticContextImpl::getDefaultFunctionNamespace( ) const
+StaticContextImpl::getDefaultFunctionNamespace() const
 {
   try
   {
 
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-03-08 00:09:46 +0000
+++ src/compiler/translator/translator.cpp	2013-03-20 02:47:23 +0000
@@ -1031,6 +1031,11 @@
   Convert a lexical qname identifying a function to an expanded qname item.
   If the lexical qname does not have a prefix, the default function namespace
   (if any) will be used to build the expanded qname item.
+
+  Raise error is the prefix is non-empty and there is no ns associated with it.
+
+  This method is used during the processing of function declarations (when the
+  function object is not supposed to exist already).
 ********************************************************************************/
 void expand_function_qname(
     store::Item_t& qnameItem,
@@ -1297,7 +1302,7 @@
 ********************************************************************************/
 void bind_fn(
     function_t& f,
-    ulong nargs,
+    csize nargs,
     const QueryLoc& loc)
 {
   theSctx->bind_fn(f, nargs, loc);
@@ -1313,14 +1318,17 @@
 
 /*******************************************************************************
   Lookup in the sctx the function object for a function with a given prefix
-  local name and arity. Return NULL if such a function is not found
+  local name and arity. Raise error if the prefix is non-empty and does not have
+  an associated namespace. Return NULL if such a function is not found.
 ********************************************************************************/
-function* lookup_fn(const QName* qname, ulong arity, const QueryLoc& loc)
+function* lookup_fn(const QName* qname, csize arity, const QueryLoc& loc)
 {
-  store::Item_t qnameItem;
-  expand_function_qname(qnameItem, qname, loc);
-
-  return theSctx->lookup_fn(qnameItem, arity);
+  return theSctx->lookup_fn(qname->get_namespace(),
+                            qname->get_prefix(),
+                            qname->get_localname(),
+                            arity,
+                            theCCB->theConfig.jsoniq_mode,
+                            loc);
 }
 
 
@@ -4140,10 +4148,10 @@
 
   //bool recognised = false;
 
-  store::Item_t lExpandedQName;
-  expand_function_qname(lExpandedQName, v.get_qname(), loc);
+  store::Item_t expandedQName;
+  expand_function_qname(expandedQName, v.get_qname(), loc);
 
-  zstring annotNS = lExpandedQName->getNamespace();
+  zstring annotNS = expandedQName->getNamespace();
 
   if (annotNS == static_context::W3C_XML_NS ||
       annotNS == XML_SCHEMA_NS ||
@@ -4152,10 +4160,10 @@
       annotNS == XQUERY_MATH_FN_NS ||
       annotNS == ZORBA_ANNOTATIONS_NS)
   {
-    if (AnnotationInternal::lookup(lExpandedQName) == AnnotationInternal::zann_end)
+    if (AnnotationInternal::lookup(expandedQName) == AnnotationInternal::zann_end)
     {
       RAISE_ERROR(err::XQST0045, loc,
-      ERROR_PARAMS(lExpandedQName->getLocalName(), ZED(ANNOTATION), annotNS));
+      ERROR_PARAMS(expandedQName->getLocalName(), ZED(ANNOTATION), annotNS));
     }
 
     //recognised = true;
@@ -4177,7 +4185,7 @@
   }
 
   //if (recognised)
-    theAnnotations->push_back(lExpandedQName, lLiterals);
+  theAnnotations->push_back(expandedQName, lLiterals);
 }
 
 
@@ -8640,9 +8648,19 @@
 
   rchandle<QName> qname = v.get_qname();
   store::Item_t qnameItem;
-  expand_elem_qname(qnameItem, qname, loc);
+
+  if (!qname->get_prefix().empty() || !theCCB->theConfig.jsoniq_mode)
+  {
+    expand_elem_qname(qnameItem, qname, loc);
+  }
+  else
+  {
+    GENV_ITEMFACTORY->
+    createQName(qnameItem, XML_SCHEMA_NS, "", qname->get_localname());
+  }
 
   xqtref_t t = CTX_TM->create_named_simple_type(qnameItem);
+
   if (t == NULL)
   {
     if (theSctx->xquery_version() < StaticContextConsts::xquery_version_3_0)
@@ -10738,20 +10756,6 @@
 
   TypeManager* tm = CTX_TM;
 
-  // Expand the function qname
-  rchandle<QName> qname = v.get_fname();
-
-  store::Item_t qnameItem;
-  expand_function_qname(qnameItem, qname, loc);
-
-  const zstring& fn_ns = qnameItem->getNamespace();
-
-  if (static_context::is_reserved_module(fn_ns))
-  {
-    RAISE_ERROR(zerr::ZXQP0016_RESERVED_MODULE_TARGET_NAMESPACE, loc,
-    ERROR_PARAMS(fn_ns));
-  }
-
   // Collect the arguments of this function in reverse order
   std::vector<expr*> arguments;
 
@@ -10767,17 +10771,73 @@
 
   csize numArgs = arguments.size();
 
+  // Lookup the function
+  store::Item_t qnameItem;
+  const QName* qname = v.get_fname();
+
   function* f = lookup_fn(qname, numArgs, loc);
 
+  zstring fn_ns;
+
+  if (f != NULL)
+  {
+    qnameItem = f->getName();
+    fn_ns = qnameItem->getNamespace();
+
+    if (static_context::is_reserved_module(fn_ns))
+    {
+      RAISE_ERROR(zerr::ZXQP0016_RESERVED_MODULE_TARGET_NAMESPACE, loc,
+                  ERROR_PARAMS(fn_ns));
+    }
+  }
+  else
+  {
+    // Check if this is a call to a type constructor function
+    expand_function_qname(qnameItem, qname, loc);
+
+    xqtref_t type = CTX_TM->create_named_type(qnameItem,
+                                              TypeConstants::QUANT_QUESTION,
+                                              loc);
+
+    if (type != NULL)
+    {
+      if (numArgs != 1 ||
+          TypeOps::is_equal(tm, *type, *GENV_TYPESYSTEM.NOTATION_TYPE_QUESTION, loc) ||
+          TypeOps::is_equal(tm, *type, *GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, loc))
+      {
+        RAISE_ERROR(err::XPST0017, loc,
+        ERROR_PARAMS(qname->get_qname(), ZED(FunctionUndeclared_3), numArgs));
+      }
+
+      push_nodestack(create_cast_expr(loc, arguments[0], type, true, true));
+
+      return;
+    }
+
+    if (theHaveModuleImportCycle)
+    {
+      fn_ns = qnameItem->getNamespace();
+
+      std::map<zstring, zstring>::const_iterator ite = theModulesStack.begin();
+      std::map<zstring, zstring>::const_iterator end = theModulesStack.end();
+
+      --end;
+      assert((*end).second == theModuleNamespace);
+
+      for (; ite != end; ++ite)
+      {
+        if ((*ite).second == fn_ns)
+          RAISE_ERROR(err::XQST0093, loc, ERROR_PARAMS(theModuleNamespace));
+      }
+    }
+    
+    RAISE_ERROR(err::XPST0017, loc,
+    ERROR_PARAMS(qname->get_qname(), ZED(FunctionUndeclared_3), numArgs));
+  }
+
   if (fn_ns == static_context::W3C_FN_NS)
   {
     // Some special processing is required for certain "fn" functions
-    if (f == NULL)
-    {
-      RAISE_ERROR(err::XPST0017, loc,
-      ERROR_PARAMS(qname->get_qname(), ZED(FunctionUndeclared_3), numArgs));
-    }
-
     switch (f->getKind())
     {
       case FunctionConsts::FN_HEAD_1:
@@ -11062,48 +11122,7 @@
 
   numArgs = arguments.size();  // recompute size
 
-  // Check if this is a call to a type constructor function
-  xqtref_t type = CTX_TM->create_named_type(qnameItem,
-                                            TypeConstants::QUANT_QUESTION,
-                                            loc);
-
-  if (type != NULL)
-  {
-    if (numArgs != 1 ||
-        TypeOps::is_equal(tm, *type, *GENV_TYPESYSTEM.NOTATION_TYPE_QUESTION, loc) ||
-        TypeOps::is_equal(tm, *type, *GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_QUESTION, loc))
-    {
-      RAISE_ERROR(err::XPST0017, loc,
-      ERROR_PARAMS(qname->get_qname(), ZED(FunctionUndeclared_3), numArgs));
-    }
-
-    push_nodestack(create_cast_expr(loc, arguments[0], type, true, true));
-  }
-
-  // It is not a builtin constructor function
-  else
-  {
-    if (f == NULL)
-    {
-      if (theHaveModuleImportCycle)
-      {
-        std::map<zstring, zstring>::const_iterator ite = theModulesStack.begin();
-        std::map<zstring, zstring>::const_iterator end = theModulesStack.end();
-
-        --end;
-        assert((*end).second == theModuleNamespace);
-
-        for (; ite != end; ++ite)
-        {
-          if ((*ite).second == fn_ns)
-            RAISE_ERROR(err::XQST0093, loc, ERROR_PARAMS(theModuleNamespace));
-        }
-      }
-
-      RAISE_ERROR(err::XPST0017, loc,
-      ERROR_PARAMS(qname->get_qname(), ZED(FunctionUndeclared_3), numArgs));
-    }
-
+  {
     // If this is a udf that is invoked from another udf, mark that other udf
     // as a non-leaf function.
     if (f->isUdf())
@@ -13084,7 +13103,16 @@
 
   rchandle<QName> qname = v.get_qname();
   store::Item_t qnameItem;
-  expand_elem_qname(qnameItem, qname, loc);
+
+  if (!qname->get_prefix().empty() || !theCCB->theConfig.jsoniq_mode)
+  {
+    expand_elem_qname(qnameItem, qname, loc);
+  }
+  else
+  {
+    GENV_ITEMFACTORY->
+    createQName(qnameItem, XML_SCHEMA_NS, "", qname->get_localname());
+  }
 
   xqtref_t t = CTX_TM->create_named_simple_type(qnameItem);
 
 
=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp	2013-02-07 17:24:36 +0000
+++ src/context/root_static_context.cpp	2013-03-20 02:47:23 +0000
@@ -157,7 +157,8 @@
 
   set_default_elem_type_ns(zstring(), true, loc);   
 
-  set_default_function_ns(W3C_FN_NS, true, loc);
+  set_default_function_ns(JSONIQ_FN_NS, false, loc);
+  set_default_function_ns(W3C_FN_NS, false, loc);
 
   add_collation(ZORBA_DEF_COLLATION_NS, QueryLoc::null);
   add_collation(W3C_CODEPT_COLLATION_NS, QueryLoc::null);
 
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2013-02-26 04:12:43 +0000
+++ src/context/static_context.cpp	2013-03-20 02:47:23 +0000
@@ -677,7 +677,6 @@
   theExternalModulesMap(NULL),
   theNamespaceBindings(NULL),
   theHaveDefaultElementNamespace(false),
-  theHaveDefaultFunctionNamespace(false),
   theContextItemType(NULL),
   theVariablesMap(NULL),
   theImportedPrivateVariablesMap(NULL),
@@ -724,7 +723,6 @@
   theExternalModulesMap(NULL),
   theNamespaceBindings(NULL),
   theHaveDefaultElementNamespace(false),
-  theHaveDefaultFunctionNamespace(false),
   theContextItemType(NULL),
   theVariablesMap(NULL),
   theImportedPrivateVariablesMap(NULL),
@@ -776,7 +774,6 @@
   theExternalModulesMap(NULL),
   theNamespaceBindings(NULL),
   theHaveDefaultElementNamespace(false),
-  theHaveDefaultFunctionNamespace(false),
   theContextItemType(NULL),
   theVariablesMap(NULL),
   theImportedPrivateVariablesMap(NULL),
@@ -1086,8 +1083,7 @@
   ar & theNamespaceBindings;
   ar & theDefaultElementNamespace;
   ar & theHaveDefaultElementNamespace;
-  ar & theDefaultFunctionNamespace;
-  ar & theHaveDefaultFunctionNamespace;
+  ar & theDefaultFunctionNamespaces;
 
   ar & theContextItemType;
 
@@ -2039,9 +2035,9 @@
 ********************************************************************************/
 const zstring& static_context::default_function_ns() const
 {
-  if (theHaveDefaultFunctionNamespace || theParent == NULL)
+  if (!theDefaultFunctionNamespaces.empty() || theParent == NULL)
   {
-    return theDefaultFunctionNamespace;
+    return theDefaultFunctionNamespaces[0];
   }
   else
   {
@@ -2058,10 +2054,9 @@
    bool raiseError,
    const QueryLoc& loc)
 {
-  if (!theHaveDefaultFunctionNamespace)
+  if (theDefaultFunctionNamespaces.empty())
   {
-    theDefaultFunctionNamespace = ns;
-    theHaveDefaultFunctionNamespace = true;
+    theDefaultFunctionNamespaces.push_back(ns);
   }
   else if (raiseError)
   {
@@ -2069,7 +2064,7 @@
   }
   else
   {
-    theDefaultFunctionNamespace = ns;
+    theDefaultFunctionNamespaces.insert(theDefaultFunctionNamespaces.begin(), ns);
   }
 }
 
@@ -2429,7 +2424,7 @@
 ********************************************************************************/
 void static_context::bind_fn(
     function_t& f,
-    ulong arity,
+    csize arity,
     const QueryLoc& loc)
 {
   store::Item* qname = f->getName();
@@ -2441,7 +2436,7 @@
 
   if (theFunctionMap == NULL)
   {
-    ulong size = (is_global_root_sctx() ? 500 : 32);
+    csize size = (is_global_root_sctx() ? 500 : 32);
     theFunctionMap = new FunctionMap(HashMapItemPointerCmp(0, NULL), size, false);
   }
 
@@ -2503,7 +2498,7 @@
 ********************************************************************************/
 void static_context::unbind_fn(
     const store::Item* qname,
-    ulong arity)
+    csize arity)
 {
   ZORBA_ASSERT(!is_global_root_sctx());
 
@@ -2563,6 +2558,66 @@
 }
 
 
+/*******************************************************************************
+  Search in the sctx, starting from "this" and moving upwards, for the function
+  object for a function with a given prefix local name and arity. Raise error if
+  the prefix is non-empty and does not have an associated namespace. Return NULL
+  if such a function is not found.
+********************************************************************************/
+function* static_context::lookup_fn(
+    const zstring& ns,
+    const zstring& pre,
+    const zstring& local,
+    csize arity,
+    bool allowMultipleDefaultNamespaces,
+    const QueryLoc& loc)
+{
+  store::Item_t qnameItem;
+  std::vector<zstring>::const_iterator ite;
+  std::vector<zstring>::const_iterator end;
+  function* f = NULL;
+
+  if (!ns.empty())
+  {
+    ITEM_FACTORY->createQName(qnameItem, ns, "", local);
+
+    f = lookup_fn(qnameItem, arity, true);
+  }
+  else if (!pre.empty())
+  {
+    expand_qname(qnameItem, "", pre, local, loc);
+    
+    f = lookup_fn(qnameItem, arity, true);
+  }
+  else if (allowMultipleDefaultNamespaces)
+  {
+    static_context* sctx = this;
+
+    while (f == NULL && sctx != NULL)
+    {
+      ite = sctx->theDefaultFunctionNamespaces.begin();
+      end = sctx->theDefaultFunctionNamespaces.end();
+
+      for (; f == NULL && ite != end; ++ite)
+      {
+        ITEM_FACTORY->createQName(qnameItem, *ite, "", local);
+        f = lookup_fn(qnameItem, arity, true);
+      }
+
+      sctx = sctx->theParent;
+    }
+  }
+  else
+  {
+    expand_qname(qnameItem, default_function_ns(), pre, local, loc);
+    
+    f = lookup_fn(qnameItem, arity, true);
+  }
+
+  return f;
+}
+
+
 /***************************************************************************//**
   Search the static-context tree, starting from "this" and moving upwards,
   looking for the 1st sctx obj that contains a binding for a function with
@@ -2572,7 +2627,7 @@
 ********************************************************************************/
 function* static_context::lookup_fn(
     const store::Item* qname,
-    ulong arity,
+    csize arity,
     bool skipDisabled)
 {
   FunctionInfo fi;
@@ -2627,7 +2682,7 @@
 ********************************************************************************/
 function* static_context::lookup_local_fn(
     const store::Item* qname,
-    ulong arity,
+    csize arity,
     bool skipDisabled)
 {
   FunctionInfo fi;
 
=== modified file 'src/context/static_context.h'
--- src/context/static_context.h	2013-02-26 04:12:43 +0000
+++ src/context/static_context.h	2013-03-20 02:47:23 +0000
@@ -352,9 +352,9 @@
   ----------------------------
   The namespace URI to be used for element and type qnames whose prefix is empty.
 
-  theDefaultFunctionNamespace :
-  -----------------------------
-  The namespace URI to be used for function qnames whose prefix is empty.
+  theDefaultFunctionNamespaces :
+  ------------------------------
+  The namespace URIs to be used for function qnames whose prefix is empty.
 
   theContextItemType :
   --------------------
@@ -598,8 +598,7 @@
   zstring                                 theDefaultElementNamespace;
   bool                                    theHaveDefaultElementNamespace;
 
-  zstring                                 theDefaultFunctionNamespace;
-  bool                                    theHaveDefaultFunctionNamespace;
+  std::vector<zstring>                    theDefaultFunctionNamespaces;
 
   xqtref_t                                theContextItemType;
 
@@ -893,18 +892,26 @@
   //
   // Functions
   //
-  void bind_fn(function_t& f, ulong arity, const QueryLoc& loc);
-
-  void unbind_fn(const store::Item* qname, ulong arity);
+  void bind_fn(function_t& f, csize arity, const QueryLoc& loc);
+
+  void unbind_fn(const store::Item* qname, csize arity);
+
+  function* lookup_fn(
+      const zstring& ns,
+      const zstring& pre,
+      const zstring& local,
+      csize arity,
+      bool allowMultipleDefaultNamespaces,
+      const QueryLoc& loc);
 
   function* lookup_fn(
       const store::Item* qname,
-      ulong arity,
+      csize arity,
       bool skipDisabled = true);
 
   function* lookup_local_fn(
       const store::Item* qname,
-      ulong arity,
+      csize arity,
       bool skipDisabled = true);
 
   void get_functions(std::vector<function*>& functions) const;
 
=== modified file 'src/functions/func_sequences_impl.cpp'
--- src/functions/func_sequences_impl.cpp	2013-02-07 17:24:36 +0000
+++ src/functions/func_sequences_impl.cpp	2013-03-20 02:47:23 +0000
@@ -492,6 +492,50 @@
 /*******************************************************************************
 
 ********************************************************************************/
+PlanIter_t fn_index_of::codegen(
+    CompilerCB*,
+    static_context* sctx,
+    const QueryLoc& loc,
+    std::vector<PlanIter_t>& argv,
+    expr& caller) const
+{
+  TypeManager* tm = caller.get_type_manager();
+  RootTypeManager& rtm = GENV_TYPESYSTEM;
+
+  fo_expr* fo = static_cast<fo_expr*>(&caller);
+  expr* seqArg = fo->get_arg(0);
+  expr* keyArg = fo->get_arg(1);
+  xqtref_t seqType = seqArg->get_return_type();
+  xqtref_t pseqType = TypeOps::prime_type(tm, *seqType);
+  xqtref_t keyType = keyArg->get_return_type();
+
+  if (TypeOps::is_equal(tm, *keyType, *rtm.ANY_ATOMIC_TYPE_ONE) ||
+      TypeOps::is_equal(tm, *pseqType, *rtm.ANY_ATOMIC_TYPE_ONE))
+  {
+    return new FnIndexOfIterator(sctx, loc, argv, 0);
+  }
+
+  if (TypeOps::is_subtype(tm, *keyType, *seqType) ||
+      (TypeOps::is_subtype(tm, *keyType, *rtm.UNTYPED_ATOMIC_TYPE_ONE) &&
+       TypeOps::is_subtype(tm, *seqType, *rtm.STRING_TYPE_STAR)) ||
+      (TypeOps::is_subtype(tm, *keyType, *rtm.STRING_TYPE_ONE) &&
+       TypeOps::is_subtype(tm, *seqType, *rtm.UNTYPED_ATOMIC_TYPE_STAR)))
+  {
+    return new FnIndexOfIterator(sctx, loc, argv, 1);
+  }
+
+  if (TypeOps::is_subtype(tm, *pseqType, *keyType))
+  {
+    return new FnIndexOfIterator(sctx, loc, argv, 2);
+  }
+
+  return new FnIndexOfIterator(sctx, loc, argv, 0);
+}
+
+
+/*******************************************************************************
+
+********************************************************************************/
 xqtref_t fn_subsequence::getReturnType(const fo_expr* caller) const
 {
   TypeManager* tm = caller->get_type_manager();
 
=== modified file 'src/functions/pregenerated/func_sequences.cpp'
--- src/functions/pregenerated/func_sequences.cpp	2013-03-05 23:11:50 +0000
+++ src/functions/pregenerated/func_sequences.cpp	2013-03-20 02:47:23 +0000
@@ -44,15 +44,6 @@
   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*,
 
=== modified file 'src/runtime/sequences/pregenerated/sequences.cpp'
--- src/runtime/sequences/pregenerated/sequences.cpp	2013-03-05 23:11:50 +0000
+++ src/runtime/sequences/pregenerated/sequences.cpp	2013-03-20 02:47:23 +0000
@@ -72,6 +72,8 @@
 {
   serialize_baseclass(ar,
   (NaryBaseIterator<FnIndexOfIterator, FnIndexOfIteratorState>*)this);
+
+    ar & theFastComp;
 }
 
 
 
=== modified file 'src/runtime/sequences/pregenerated/sequences.h'
--- src/runtime/sequences/pregenerated/sequences.h	2013-03-05 23:11:50 +0000
+++ src/runtime/sequences/pregenerated/sequences.h	2013-03-20 02:47:23 +0000
@@ -124,6 +124,8 @@
 
 class FnIndexOfIterator : public NaryBaseIterator<FnIndexOfIterator, FnIndexOfIteratorState>
 { 
+protected:
+  int theFastComp; //
 public:
   SERIALIZABLE_CLASS(FnIndexOfIterator);
 
@@ -135,9 +137,11 @@
   FnIndexOfIterator(
     static_context* sctx,
     const QueryLoc& loc,
-    std::vector<PlanIter_t>& children)
+    std::vector<PlanIter_t>& children,
+    int fastComp)
     : 
-    NaryBaseIterator<FnIndexOfIterator, FnIndexOfIteratorState>(sctx, loc, children)
+    NaryBaseIterator<FnIndexOfIterator, FnIndexOfIteratorState>(sctx, loc, children),
+    theFastComp(fastComp)
   {}
 
   virtual ~FnIndexOfIterator();
 
=== modified file 'src/runtime/sequences/sequences_impl.cpp'
--- src/runtime/sequences/sequences_impl.cpp	2013-03-05 12:34:19 +0000
+++ src/runtime/sequences/sequences_impl.cpp	2013-03-20 02:47:23 +0000
@@ -76,18 +76,16 @@
   store::Item_t temp;
 
   if (!PlanIterator::consumeNext(lCollationItem, iter, planState))
-    throw XQUERY_EXCEPTION(
-      err::XPTY0004,
-      ERROR_PARAMS( ZED( NoEmptySeqAsCollationParam ) ),
-      ERROR_LOC( loc )
-    );
+  {
+    RAISE_ERROR(err::XPTY0004, loc,
+    ERROR_PARAMS(ZED(NoEmptySeqAsCollationParam)));
+  }
 
   if (PlanIterator::consumeNext(temp, iter, planState))
-    throw XQUERY_EXCEPTION(
-      err::XPTY0004,
-      ERROR_PARAMS( ZED( NoSeqAsCollationParam ) ),
-      ERROR_LOC( loc )
-    );
+  {
+    RAISE_ERROR(err::XPTY0004, loc,
+    ERROR_PARAMS(ZED(NoSeqAsCollationParam)));
+  }
 
   return sctx->get_collator(lCollationItem->getStringValue().str(), loc);
 }
@@ -147,11 +145,9 @@
 bool
 FnIndexOfIterator::nextImpl(store::Item_t& result, PlanState& planState) const
 {
-  store::Item_t lSequenceItem;
-  store::Item_t lCollationItem;
-  xqtref_t      lCollationItemType;
+  store::Item_t seqItem;
   store::Item_t searchItem;
-  TypeManager* typemgr = theSctx->get_typemanager();
+  TypeManager* tm = theSctx->get_typemanager();
   long timezone = 0;
   bool found;
 
@@ -163,26 +159,39 @@
 		RAISE_ERROR(err::FORG0006, loc, ERROR_PARAMS(ZED(EmptySeqNoSearchItem)));
   }
 
-  if ( theChildren.size() == 3 )
-    state->theCollator = getCollator(theSctx, loc,
-                                     planState, theChildren[2].getp());
+  if (theChildren.size() == 3)
+  {
+    state->theCollator = 
+    getCollator(theSctx, loc, planState, theChildren[2].getp());
+  }
 
-  while ( consumeNext(lSequenceItem, theChildren[0].getp(), planState))
+  while (consumeNext(seqItem, theChildren[0].getp(), planState))
   {
     // inc the position in the sequence; do it at the beginning of the loop
     // because index-of starts with one
     ++state->theCurrentPos;
 
-    searchItem = state->theSearchItem;
-
     try
     {
-      found = CompareIterator::valueEqual(loc,
-                                          lSequenceItem,
-                                          searchItem,
-                                          typemgr,
-                                          timezone,
-                                          state->theCollator);
+      if (theFastComp == 1)
+      {
+        found = seqItem->equals(state->theSearchItem, timezone, state->theCollator);
+      }
+      else if (theFastComp == 2)
+      {
+        found = state->theSearchItem->equals(seqItem, timezone, state->theCollator);
+      }
+      else
+      {
+        searchItem = state->theSearchItem;
+
+        found = CompareIterator::valueEqual(loc,
+                                            seqItem,
+                                            searchItem,
+                                            tm,
+                                            timezone,
+                                            state->theCollator);
+      }
     }
     catch (ZorbaException const& e)
     {
@@ -203,6 +212,7 @@
   STACK_END(state);
 }
 
+
 /*******************************************************************************
   15.1.4 fn:empty
 ********************************************************************************/
 
=== modified file 'src/runtime/spec/sequences/sequences.xml'
--- src/runtime/spec/sequences/sequences.xml	2013-02-07 17:24:36 +0000
+++ src/runtime/spec/sequences/sequences.xml	2013-03-20 02:47:23 +0000
@@ -102,7 +102,7 @@
   The result sequence is in ascending numeric order.
   </zorba:description>
 
-  <zorba:function >
+  <zorba:function generateCodegen="false">
 
     <zorba:signature localname="index-of" prefix="fn">
       <zorba:param>xs:anyAtomicType*</zorba:param>
@@ -124,12 +124,18 @@
                   brief="the current position in the sequence"/>
 
     <zorba:member type="store::Item_t" name="theSearchItem" defaultValue="NULL"
-      brief="the item to search for"/>
+                  brief="the item to search for"/>
 
     <zorba:member type="XQPCollator*" name="theCollator" defaultValue="0"
-      brief="the collator"/>
+                  brief="the collator"/>
   </zorba:state>
 
+  <zorba:constructor>
+    <zorba:parameter type="int" name="fastComp"/>
+  </zorba:constructor>
+
+  <zorba:member type="int" name="theFastComp"/>
+
 </zorba:iterator>
 
 <!--
 
=== modified file 'test/rbkt/testdriver.cpp'
--- test/rbkt/testdriver.cpp	2013-03-16 00:58:28 +0000
+++ test/rbkt/testdriver.cpp	2013-03-20 02:47:23 +0000
@@ -325,7 +325,8 @@
     lQuery = engine->createQuery(&errHandler);
     lQuery->setFileName(lQueryFile.get_path());
 
-    bool lJSONiqMode = lQueryFile.get_path().rfind(".jq") == lQueryFile.get_path().size() - 3;
+    bool lJSONiqMode = 
+    (lQueryFile.get_path().rfind(".jq") == lQueryFile.get_path().size() - 3);
 
     lQuery->compile(lQueryString.c_str(), lContext, getCompilerHints(lJSONiqMode));