zorba-coders team mailing list archive

[Ghislain Fourny <ghislain.fourny@xxxxxxxxxx>]

Ghislain Fourny has proposed merging lp:~gislenius/zorba/jsoniq-jnprefix into lp:zorba/3.0.

Requested reviews:
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~gislenius/zorba/jsoniq-jnprefix/+merge/92026

Bound jn prefix by default.
-- 
https://code.launchpad.net/~gislenius/zorba/jsoniq-jnprefix/+merge/92026
Your team Zorba Coders is subscribed to branch lp:zorba/3.0.

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2012-02-08 02:17:02 +0000
+++ src/compiler/translator/translator.cpp	2012-02-08 13:49:24 +0000
@@ -10084,6 +10084,9 @@
   if (f != NULL &&
            f->isBuiltin() &&
            fn_ns != static_context::W3C_FN_NS &&
+#ifdef ZORBA_WITH_JSON
+           fn_ns != JSONIQ_FN_NS &&
+#endif
            fn_ns != XQUERY_MATH_FN_NS &&
            fn_ns != theModuleNamespace)
   {

=== modified file 'src/context/root_static_context.cpp'
--- src/context/root_static_context.cpp	2012-01-25 13:14:27 +0000
+++ src/context/root_static_context.cpp	2012-02-08 13:49:24 +0000
@@ -79,6 +79,9 @@
     "xs", XML_SCHEMA_NS,
     "xsi", XSI_NS,
     //"zerr", ZORBA_ERR_NS,
+#ifdef ZORBA_WITH_JSON
+    "jn", JSONIQ_FN_NS,
+#endif
       NULL, NULL
   };