zorba-coders team mailing list archive

[Matthias Brantner <matthias.brantner@xxxxxxxxxx>]

Matthias Brantner has proposed merging lp:~zorba-coders/zorba/XUDY00021 into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Markos Zaharioudakis (markos-za)

For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93099

added error message for XUDY00021 in apply iterator. The error message was lost during the work on generating the dictionary from XML files.
-- 
https://code.launchpad.net/~zorba-coders/zorba/XUDY00021/+merge/93099
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'modules/com/zorba-xquery/www/modules/CMakeLists.txt'
--- modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-02-05 12:31:20 +0000
+++ modules/com/zorba-xquery/www/modules/CMakeLists.txt	2012-02-14 22:53:18 +0000
@@ -63,6 +63,8 @@
   URI "http://www.zorba-xquery.com/modules/schema";)
 DECLARE_ZORBA_MODULE(FILE string.xq VERSION 2.1
   URI "http://www.zorba-xquery.com/modules/string";)
+DECLARE_ZORBA_MODULE(FILE uri.xq VERSION 1.0
+  URI "http://www.zorba-xquery.com/modules/uri";)
 DECLARE_ZORBA_MODULE(FILE xml.xq VERSION 2.0
   URI "http://www.zorba-xquery.com/modules/xml";)
 DECLARE_ZORBA_MODULE(FILE xqdoc.xq VERSION 2.0

=== added file 'modules/com/zorba-xquery/www/modules/uri.xq'
--- modules/com/zorba-xquery/www/modules/uri.xq	1970-01-01 00:00:00 +0000
+++ modules/com/zorba-xquery/www/modules/uri.xq	2012-02-14 22:53:18 +0000
@@ -0,0 +1,90 @@
+xquery version "1.0";
+
+(:
+ : Copyright 2006-2012 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 module provides string related functions.
+ :
+ : @author Matthias Brantner
+ : @project XDM/atomic
+ :
+ :)
+module namespace uri = "http://www.zorba-xquery.com/modules/uri";;
+declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
+declare option ver:module-version "1.0";
+
+
+(:~
+ : Percent-decodes (aka URL decoding) the given string.
+ :
+ : All percent encoded octets will be translated into their
+ : decoded UTF-8 representation.
+ :
+ : @param $s the string to decode
+ :
+ : @return the percent decoded string
+ :)
+declare function uri:decode($u as xs:string) as xs:string
+{
+  uri:decode($u, fn:false())
+};
+
+(:~
+ : Percent-decodes (aka URL decoding) the given string.
+ :
+ : All percent encoded octets will be translated into their
+ : decoded UTF-8 representation.
+ :
+ : If $decode-plus is specified all occurrences of the char '+'
+ : will be replaced with a space ' ' before the percent decoding
+ : happens.
+ :
+ : @param $s the string to decode
+ : @param $decode-plus whether '+' chars will be replaced with spaces
+ :
+ : @return the percent decoded string
+ :)
+declare function uri:decode(
+  $u as xs:string,
+  $decode-plus as xs:boolean) as xs:string
+{
+  uri:decode($u, $decode-plus, "UTF-8")
+};
+
+(:~
+ : Percent-decodes (aka URL decoding) the given string.
+ :
+ : All percent encoded octets will be translated into their
+ : decoded UTF-8 representation.
+ :
+ : If $decode-plus is specified all occurrences of the char '+'
+ : will be replaced with a space ' ' before the percent decoding
+ : happens.
+ :
+ : The $charset parameter specifies the source charset after precent
+ : decoding. It is used to convert the decoded string into UTF-8.
+ :
+ : @param $s the string to decode
+ : @param $decode-plus whether '+' chars will be replaced with spaces
+ : @param $charset the source charset of the string after percent decoding
+ :
+ : @return the percent decoded string
+ :)
+declare function uri:decode(
+  $s as xs:string,
+  $decode-plus as xs:boolean,
+  $charset as xs:string) as xs:string external;

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2012-02-05 12:31:20 +0000
+++ src/context/static_context.cpp	2012-02-14 22:53:18 +0000
@@ -361,6 +361,10 @@
 "http://www.zorba-xquery.com/modules/string";;
 
 const char*
+static_context::ZORBA_URI_FN_NS = 
+"http://www.zorba-xquery.com/modules/uri";;
+
+const char*
 static_context::ZORBA_FETCH_FN_NS = 
 "http://www.zorba-xquery.com/modules/fetch";;
 
@@ -436,6 +440,7 @@
             ns == ZORBA_REFLECTION_FN_NS ||
             ns == ZORBA_SCRIPTING_FN_NS ||
             ns == ZORBA_STRING_FN_NS ||
+            ns == ZORBA_URI_FN_NS ||
             ns == ZORBA_FETCH_FN_NS ||
             ns == ZORBA_NODE_FN_NS ||
             ns == ZORBA_XML_FN_NS);
@@ -482,6 +487,7 @@
   {
     return (ns == ZORBA_MATH_FN_NS ||
             ns == ZORBA_INTROSP_SCTX_FN_NS ||
+            ns == ZORBA_STRING_FN_NS ||
             ns == ZORBA_RANDOM_FN_NS);
   }
 

=== modified file 'src/context/static_context.h'
--- src/context/static_context.h	2012-02-02 09:56:52 +0000
+++ src/context/static_context.h	2012-02-14 22:53:18 +0000
@@ -464,6 +464,7 @@
   static const char* ZORBA_INTROSP_SCTX_FN_NS;
   static const char* ZORBA_REFLECTION_FN_NS;
   static const char* ZORBA_STRING_FN_NS;
+  static const char* ZORBA_URI_FN_NS;
   static const char* ZORBA_FETCH_FN_NS;
   static const char* ZORBA_NODE_FN_NS;
   static const char* ZORBA_XML_FN_NS;

=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml	2011-12-21 14:40:33 +0000
+++ src/diagnostics/diagnostic_en.xml	2012-02-14 22:53:18 +0000
@@ -1307,7 +1307,10 @@
        [XQuery 1.0 and XPath 2.0 Data Model]. In this case, none of the updates
        in the query are made effective.
       </comment>
-      <value>updates violate constraint</value>
+      <value>updates violate constraint${ 1}</value>
+      <entry key="AppliedAt">
+        <value>applied at $2</value>
+      </entry>
     </diagnostic>
 
     <diagnostic code="XUTY0022">

=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp	2011-12-21 14:40:33 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp	2012-02-14 22:53:18 +0000
@@ -203,7 +203,7 @@
   { "XUDY0017", "node is target of multiple \"replace value of\" expressions in same query" },
   { "XUDY0018", "\"$1\": function declared external, non-updating returns non-empty pending update list" },
   { "XUDY0019", "\"$1\": function declated external, updating returns non-empty data model instance" },
-  { "XUDY0021", "updates violate constraint" },
+  { "XUDY0021", "updates violate constraint${ 1}" },
   { "XUDY0023", "\"$1\": namespace binding conflicts with $2=$3" },
   { "XUDY0024", "\"$1\": namespace binding conflicts with $2=$3" },
   { "XUDY0027", "target expression is empty sequence" },
@@ -660,6 +660,7 @@
   { "~XQST0106_CONFLICTING", "conflicting" },
   { "~XQST0106_THE_SAME", "the same" },
   { "~XQueryVersionAtLeast10_2", "\"$2\": XQuery version must be at least 1.0" },
+  { "~XUDY0021_AppliedAt", "applied at $2" },
   { "~XUST0001_CONCAT", "comma expression with updating and non-updating branches" },
   { "~XUST0001_Generic", "updating expression illegal here" },
   { "~XUST0001_IF", "conditional expression with updating and non-updating branch" },

=== modified file 'src/functions/library.cpp'
--- src/functions/library.cpp	2011-10-14 07:35:51 +0000
+++ src/functions/library.cpp	2012-02-14 22:53:18 +0000
@@ -57,6 +57,7 @@
 #include "functions/func_sequences.h"
 #include "functions/func_sequences_impl.h"
 #include "functions/func_strings.h"
+#include "functions/func_uris.h"
 #include "functions/func_var_decl.h"
 #include "functions/func_xqdoc.h"
 #include "functions/func_documents.h"
@@ -119,6 +120,7 @@
   populate_context_schema(sctx);
   populate_context_sctx(sctx);
   populate_context_strings(sctx);
+  populate_context_uris(sctx);
   populate_context_sequences(sctx);
   populate_context_sequences_impl(sctx);
   populate_context_xqdoc(sctx);

=== added file 'src/functions/pregenerated/func_uris.cpp'
--- src/functions/pregenerated/func_uris.cpp	1970-01-01 00:00:00 +0000
+++ src/functions/pregenerated/func_uris.cpp	2012-02-14 22:53:18 +0000
@@ -0,0 +1,65 @@
+/*
+ * 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/uris/uris.h"
+#include "functions/func_uris.h"
+
+
+namespace zorba{
+
+
+
+PlanIter_t fn_zorba_uri_decode::codegen(
+  CompilerCB*,
+  static_context* sctx,
+  const QueryLoc& loc,
+  std::vector<PlanIter_t>& argv,
+  AnnotationHolder& ann) const
+{
+  return new DecodeURIIterator(sctx, loc, argv);
+}
+
+void populate_context_uris(static_context* sctx)
+{
+  {
+    
+
+    DECL_WITH_KIND(sctx, fn_zorba_uri_decode,
+        (createQName("http://www.zorba-xquery.com/modules/uri","","decode";), 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE, 
+        GENV_TYPESYSTEM.STRING_TYPE_ONE),
+        FunctionConsts::FN_ZORBA_URI_DECODE_3);
+
+  }
+
+}
+
+
+}
+
+
+

=== added file 'src/functions/pregenerated/func_uris.h'
--- src/functions/pregenerated/func_uris.h	1970-01-01 00:00:00 +0000
+++ src/functions/pregenerated/func_uris.h	2012-02-14 22:53:18 +0000
@@ -0,0 +1,64 @@
+/*
+ * 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_URIS_H
+#define ZORBA_FUNCTIONS_URIS_H
+
+
+#include "common/shared_types.h"
+#include "functions/function_impl.h"
+
+
+namespace zorba {
+
+
+void populate_context_uris(static_context* sctx);
+
+
+
+
+//fn-zorba-uri:decode
+class fn_zorba_uri_decode : public function
+{
+public:
+  fn_zorba_uri_decode(const signature& sig, FunctionConsts::FunctionKind kind)
+    : 
+    function(sig, kind)
+  {
+
+  }
+
+  CODEGEN_DECL();
+};
+
+
+} //namespace zorba
+
+
+#endif
+/*
+ * Local variables:
+ * mode: c++
+ * End:
+ */ 

=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h	2012-01-11 17:30:25 +0000
+++ src/functions/pregenerated/function_enum.h	2012-02-14 22:53:18 +0000
@@ -372,6 +372,7 @@
   FN_ZORBA_STRING_MATERIALIZE_1,
   FN_ZORBA_STRING_IS_STREAMABLE_1,
   FN_ZORBA_STRING_SPLIT_2,
+  FN_ZORBA_URI_DECODE_3,
   FN_ZORBA_XQDOC_XQDOC_1,
   FN_ZORBA_XQDOC_XQDOC_CONTENT_1,
 

=== modified file 'src/runtime/spec/mappings.xml'
--- src/runtime/spec/mappings.xml	2011-10-14 07:35:51 +0000
+++ src/runtime/spec/mappings.xml	2012-02-14 22:53:18 +0000
@@ -106,6 +106,10 @@
                      define="ZORBA_STRING_FN_NS" 
                      prefix="fn-zorba-string"/>
 
+		<zorba:namespace uri="http://www.zorba-xquery.com/modules/uri";
+                     define="ZORBA_URI_FN_NS" 
+                     prefix="fn-zorba-uri"/>
+
 		<zorba:namespace uri="http://www.zorba-xquery.com/modules/fetch";
                      define="ZORBA_FETCH_FN_NS" 
                      prefix="fn-zorba-fetch"/>

=== added directory 'src/runtime/spec/uris'
=== added file 'src/runtime/spec/uris/uris.xml'
--- src/runtime/spec/uris/uris.xml	1970-01-01 00:00:00 +0000
+++ src/runtime/spec/uris/uris.xml	2012-02-14 22:53:18 +0000
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+/////////////////////////////////////////////////////////////////////////////////
+//                                                                             //
+// 7.2 Functions to Assemble and Disassemble Strings
+//                                                                             //
+/////////////////////////////////////////////////////////////////////////////////
+-->
+<zorba:iterators
+  xmlns:zorba="http://www.zorba-xquery.com";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://www.zorba-xquery.com ../runtime.xsd">
+
+<zorba:header>
+    <zorba:include form="Quoted">zorbautils/checked_vector.h</zorba:include>
+    <zorba:include form="Quoted">zorbatypes/schema_types.h</zorba:include>
+</zorba:header>
+
+<!--
+/*******************************************************************************
+********************************************************************************/
+-->
+<zorba:iterator  name="DecodeURIIterator">
+
+  <zorba:description author="Zorba Team">
+    uri:decode
+  </zorba:description>
+
+  <zorba:function>
+    <zorba:signature localname="decode" prefix="fn-zorba-uri">
+      <zorba:param>xs:string</zorba:param>
+      <zorba:param>xs:boolean</zorba:param>
+      <zorba:param>xs:string</zorba:param>
+      <zorba:output>xs:string</zorba:output>
+    </zorba:signature>
+  </zorba:function>
+</zorba:iterator>
+
+</zorba:iterators>

=== added directory 'src/runtime/uris'
=== added directory 'src/runtime/uris/pregenerated'
=== added file 'src/runtime/uris/pregenerated/uris.cpp'
--- src/runtime/uris/pregenerated/uris.cpp	1970-01-01 00:00:00 +0000
+++ src/runtime/uris/pregenerated/uris.cpp	2012-02-14 22:53:18 +0000
@@ -0,0 +1,66 @@
+/*
+ * 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 "zorbatypes/rchandle.h"
+#include "zorbatypes/zstring.h"
+#include "runtime/visitors/planiter_visitor.h"
+#include "runtime/uris/uris.h"
+#include "system/globalenv.h"
+
+
+
+namespace zorba {
+
+// <DecodeURIIterator>
+const char* DecodeURIIterator::class_name_str = "DecodeURIIterator";
+DecodeURIIterator::class_factory<DecodeURIIterator>
+DecodeURIIterator::g_class_factory;
+
+const serialization::ClassVersion 
+DecodeURIIterator::class_versions[] ={{ 1, 0x000905, false}};
+
+const int DecodeURIIterator::class_versions_count =
+sizeof(DecodeURIIterator::class_versions)/sizeof(struct serialization::ClassVersion);
+
+void DecodeURIIterator::accept(PlanIterVisitor& v) const {
+  v.beginVisit(*this);
+
+  std::vector<PlanIter_t>::const_iterator lIter = theChildren.begin();
+  std::vector<PlanIter_t>::const_iterator lEnd = theChildren.end();
+  for ( ; lIter != lEnd; ++lIter ){
+    (*lIter)->accept(v);
+  }
+
+  v.endVisit(*this);
+}
+
+DecodeURIIterator::~DecodeURIIterator() {}
+
+// </DecodeURIIterator>
+
+
+
+}
+
+

=== added file 'src/runtime/uris/pregenerated/uris.h'
--- src/runtime/uris/pregenerated/uris.h	1970-01-01 00:00:00 +0000
+++ src/runtime/uris/pregenerated/uris.h	2012-02-14 22:53:18 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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_RUNTIME_URIS_URIS_H
+#define ZORBA_RUNTIME_URIS_URIS_H
+
+
+#include "common/shared_types.h"
+
+
+
+#include "runtime/base/narybase.h"
+#include "zorbautils/checked_vector.h"
+#include "zorbatypes/schema_types.h"
+
+
+namespace zorba {
+
+/**
+ * 
+ *    uri:decode
+ *  
+ * Author: Zorba Team
+ */
+class DecodeURIIterator : public NaryBaseIterator<DecodeURIIterator, PlanIteratorState>
+{ 
+public:
+  SERIALIZABLE_CLASS(DecodeURIIterator);
+
+  SERIALIZABLE_CLASS_CONSTRUCTOR2T(DecodeURIIterator,
+    NaryBaseIterator<DecodeURIIterator, PlanIteratorState>);
+
+  void serialize( ::zorba::serialization::Archiver& ar)
+  {
+    serialize_baseclass(ar,
+    (NaryBaseIterator<DecodeURIIterator, PlanIteratorState>*)this);
+  }
+
+  DecodeURIIterator(
+    static_context* sctx,
+    const QueryLoc& loc,
+    std::vector<PlanIter_t>& children)
+    : 
+    NaryBaseIterator<DecodeURIIterator, PlanIteratorState>(sctx, loc, children)
+  {}
+
+  virtual ~DecodeURIIterator();
+
+  void accept(PlanIterVisitor& v) const;
+
+  bool nextImpl(store::Item_t& result, PlanState& aPlanState) const;
+};
+
+
+}
+#endif
+/*
+ * Local variables:
+ * mode: c++
+ * End:
+ */ 

=== added file 'src/runtime/uris/uris_impl.cpp'
--- src/runtime/uris/uris_impl.cpp	1970-01-01 00:00:00 +0000
+++ src/runtime/uris/uris_impl.cpp	2012-02-14 22:53:18 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2006-2012 The FLWOR Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#include "stdafx.h"
+
+#include <algorithm>
+
+#include "common/common.h"
+
+#include "diagnostics/assert.h"
+#include "diagnostics/xquery_diagnostics.h"
+
+#include "runtime/uris/uris.h"
+
+#include "system/globalenv.h"
+#include "store/api/item_factory.h"
+
+#include "util/uri_util.h"
+
+using namespace std;
+
+namespace zorba {
+
+/******************************************************************************
+*******************************************************************************/
+bool
+DecodeURIIterator::nextImpl(store::Item_t& result, PlanState& planState) const
+{
+  store::Item_t lString;
+  store::Item_t lDecodePlus;
+  store::Item_t lEncoding;
+  zstring       lDecodedString;
+
+  PlanIteratorState* state;
+  DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
+
+  consumeNext(lString, theChildren[0].getp(), planState);
+  consumeNext(lDecodePlus, theChildren[1].getp(), planState);
+  consumeNext(lEncoding, theChildren[2].getp(), planState);
+
+  lString->getStringValue2(lDecodedString);
+
+  if (lDecodePlus->getBooleanValue())
+  {
+    std::replace( lDecodedString.begin(), lDecodedString.end(), '+', ' ' );
+  }
+
+  uri::decode(lDecodedString);
+
+  // TODO: do encoding once the transcode_streambuf is there
+
+  STACK_PUSH(GENV_ITEMFACTORY->createString(result, lDecodedString), state );
+
+  STACK_END (state);
+}
+} // namespace zorba
+/* vim:set et sw=2 ts=2: */

=== modified file 'src/runtime/visitors/pregenerated/planiter_visitor.h'
--- src/runtime/visitors/pregenerated/planiter_visitor.h	2012-01-11 17:30:25 +0000
+++ src/runtime/visitors/pregenerated/planiter_visitor.h	2012-02-14 22:53:18 +0000
@@ -584,6 +584,8 @@
 
     class StringSplitIterator;
 
+    class DecodeURIIterator;
+
     class XQDocIterator;
 
     class XQDocContentIterator;
@@ -1428,6 +1430,9 @@
     virtual void beginVisit ( const StringSplitIterator& ) = 0;
     virtual void endVisit   ( const StringSplitIterator& ) = 0;
 
+    virtual void beginVisit ( const DecodeURIIterator& ) = 0;
+    virtual void endVisit   ( const DecodeURIIterator& ) = 0;
+
     virtual void beginVisit ( const XQDocIterator& ) = 0;
     virtual void endVisit   ( const XQDocIterator& ) = 0;
 

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.cpp'
--- src/runtime/visitors/pregenerated/printer_visitor.cpp	2012-01-11 17:30:25 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.cpp	2012-02-14 22:53:18 +0000
@@ -63,6 +63,7 @@
 #include "runtime/store/documents.h"
 #include "runtime/store/maps.h"
 #include "runtime/strings/strings.h"
+#include "runtime/uris/uris.h"
 #include "runtime/xqdoc/xqdoc.h"
 
 namespace zorba{
@@ -3975,6 +3976,20 @@
 // </StringSplitIterator>
 
 
+// <DecodeURIIterator>
+void PrinterVisitor::beginVisit ( const DecodeURIIterator& a) {
+  thePrinter.startBeginVisit("DecodeURIIterator", ++theId);
+  printCommons( &a, theId );
+  thePrinter.endBeginVisit( theId );
+}
+
+void PrinterVisitor::endVisit ( const DecodeURIIterator& ) {
+  thePrinter.startEndVisit();
+  thePrinter.endEndVisit();
+}
+// </DecodeURIIterator>
+
+
 // <XQDocIterator>
 void PrinterVisitor::beginVisit ( const XQDocIterator& a) {
   thePrinter.startBeginVisit("XQDocIterator", ++theId);

=== modified file 'src/runtime/visitors/pregenerated/printer_visitor.h'
--- src/runtime/visitors/pregenerated/printer_visitor.h	2012-01-11 17:30:25 +0000
+++ src/runtime/visitors/pregenerated/printer_visitor.h	2012-02-14 22:53:18 +0000
@@ -879,6 +879,9 @@
     void beginVisit( const StringSplitIterator& );
     void endVisit  ( const StringSplitIterator& );
 
+    void beginVisit( const DecodeURIIterator& );
+    void endVisit  ( const DecodeURIIterator& );
+
     void beginVisit( const XQDocIterator& );
     void endVisit  ( const XQDocIterator& );