zorba-coders team mailing list archive

["Paul J. Lucas" <paul@xxxxxxxxxxxxx>]

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
Added ZORBA_IO_NS_PREFIX.

Requested reviews:
  Matthias Brantner (matthias-brantner)
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/171441

Added ZORBA_IO_NS_PREFIX.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/171441
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2013-06-21 12:54:29 +0000
+++ src/context/static_context.cpp	2013-06-26 00:28:28 +0000
@@ -331,6 +331,9 @@
 static_context::ZORBA_NS_PREFIX = "http://www.zorba-xquery.com/";;
 
 const char*
+static_context::ZORBA_IO_NS_PREFIX = "http://zorba.io/";;
+
+const char*
 static_context::W3C_FN_NS = "http://www.w3.org/2005/xpath-functions";;
 
 const char*
@@ -529,7 +532,7 @@
 ********************************************************************************/
 bool static_context::is_builtin_module(const zstring& ns)
 {
-  if (ns.compare(0, strlen(ZORBA_NS_PREFIX), ZORBA_NS_PREFIX) == 0)
+  if ( ns == ZORBA_NS_PREFIX || ns == ZORBA_IO_NS_PREFIX )
   {
     return (ns == ZORBA_MATH_FN_NS ||
             ns == ZORBA_BASE64_FN_NS ||
@@ -586,7 +589,7 @@
 ********************************************************************************/
 bool static_context::is_builtin_virtual_module(const zstring& ns)
 {
-  if (ns.compare(0, strlen(ZORBA_NS_PREFIX), ZORBA_NS_PREFIX) == 0)
+  if ( ns == ZORBA_NS_PREFIX || ns == ZORBA_IO_NS_PREFIX )
   {
     return (ns == ZORBA_SCRIPTING_FN_NS ||
             ns == ZORBA_UTIL_FN_NS);
@@ -612,7 +615,7 @@
 ********************************************************************************/
 bool static_context::is_non_pure_builtin_module(const zstring& ns)
 {
-  if (ns.compare(0, strlen(ZORBA_NS_PREFIX), ZORBA_NS_PREFIX) == 0)
+  if ( ns == ZORBA_NS_PREFIX || ns == ZORBA_IO_NS_PREFIX )
   {
     return (ns == ZORBA_MATH_FN_NS ||
             ns == ZORBA_INTROSP_SCTX_FN_NS ||
@@ -638,7 +641,7 @@
 ********************************************************************************/
 bool static_context::is_reserved_module(const zstring& ns)
 {
-  if (ns.compare(0, strlen(ZORBA_NS_PREFIX), ZORBA_NS_PREFIX) == 0)
+  if ( ns == ZORBA_NS_PREFIX || ns == ZORBA_IO_NS_PREFIX )
   {
     return (ns == ZORBA_OP_NS || ns == XQUERY_OP_NS);
   }

=== modified file 'src/context/static_context.h'
--- src/context/static_context.h	2013-06-15 02:57:08 +0000
+++ src/context/static_context.h	2013-06-26 00:28:28 +0000
@@ -511,6 +511,7 @@
   //
 
   static const char* ZORBA_NS_PREFIX; // http://www.zorba-xquery.com/
+  static const char* ZORBA_IO_NS_PREFIX; // http://zorba.io/
 
   // Namespaces of external modules declaring zorba builtin functions
   static const char* ZORBA_MATH_FN_NS;