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

[Markos Zaharioudakis]

in XQuery 3.0, raise XQDY0054 instead of XQST0093

in XQuery 3.0, raise XQDY0054 instead of XQST0093

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-04-29T21-06-53.321Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job markos-scratch-2013-04-29T21-06-53.321Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2013-04-29 00:12:35 +0000
+++ src/compiler/translator/translator.cpp	2013-04-29 21:04:29 +0000
@@ -10939,7 +10939,12 @@
       for (; ite != end; ++ite)
       {
         if ((*ite).second == var_ns)
-          RAISE_ERROR(err::XQST0093, loc, ERROR_PARAMS(theModuleNamespace));
+        {
+          if (theSctx->xquery_version() == StaticContextConsts::xquery_version_1_0)
+            RAISE_ERROR(err::XQST0093, loc, ERROR_PARAMS(theModuleNamespace));
+          else
+            RAISE_ERROR(err::XQDY0054, loc, ERROR_PARAMS(qnameItem->getStringValue()));
+        }
       }
     }
 
@@ -11349,7 +11354,12 @@
       for (; ite != end; ++ite)
       {
         if ((*ite).second == fn_ns)
-          RAISE_ERROR(err::XQST0093, loc, ERROR_PARAMS(theModuleNamespace));
+        {
+          if (theSctx->xquery_version() == StaticContextConsts::xquery_version_1_0)
+            RAISE_ERROR(err::XQST0093, loc, ERROR_PARAMS(theModuleNamespace));
+          else
+            RAISE_ERROR(err::XQDY0054, loc, ERROR_PARAMS(qnameItem->getStringValue()));
+        }
       }
     }
     
 
=== modified file 'test/rbkt/Queries/zorba/modules/modules-28.spec'
--- test/rbkt/Queries/zorba/modules/modules-28.spec	2013-02-07 17:24:36 +0000
+++ test/rbkt/Queries/zorba/modules/modules-28.spec	2013-04-29 21:04:29 +0000
@@ -1,4 +1,4 @@
 Args: 
 -x 
 input-context=$RBKT_SRC_DIR/Queries/zorba/w3c/emptydoc.xml
-Error: http://www.w3.org/2005/xqt-errors:XQST0093
+Error: http://www.w3.org/2005/xqt-errors:XQDY0054