Zorba

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

  1. markos-scratch
  2. Merge into trunk
Proposed by Markos Zaharioudakis
Status: Merged
Approved by: Markos Zaharioudakis
Approved revision: 11089
Merged at revision: 11417
Proposed branch: lp:~zorba-coders/zorba/markos-scratch
Merge into: lp:zorba
Diff against target: 41 lines (+13/-3)
2 files modified
src/compiler/translator/translator.cpp (+12/-2)
test/rbkt/Queries/zorba/modules/modules-28.spec (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/markos-scratch
Reviewer Review Type Date Requested Status
Markos Zaharioudakis Approve
Review via email: mp+161503@code.launchpad.net

Commit message

in XQuery 3.0, raise XQDY0054 instead of XQST0093

Description of the change

in XQuery 3.0, raise XQDY0054 instead of XQST0093

To post a comment you must log in.
Revision history for this message
Markos Zaharioudakis (markos-za) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/compiler/translator/translator.cpp'
2--- src/compiler/translator/translator.cpp 2013-04-29 00:12:35 +0000
3+++ src/compiler/translator/translator.cpp 2013-04-29 21:04:29 +0000
4@@ -10939,7 +10939,12 @@
5 for (; ite != end; ++ite)
6 {
7 if ((*ite).second == var_ns)
8- RAISE_ERROR(err::XQST0093, loc, ERROR_PARAMS(theModuleNamespace));
9+ {
10+ if (theSctx->xquery_version() == StaticContextConsts::xquery_version_1_0)
11+ RAISE_ERROR(err::XQST0093, loc, ERROR_PARAMS(theModuleNamespace));
12+ else
13+ RAISE_ERROR(err::XQDY0054, loc, ERROR_PARAMS(qnameItem->getStringValue()));
14+ }
15 }
16 }
17
18@@ -11349,7 +11354,12 @@
19 for (; ite != end; ++ite)
20 {
21 if ((*ite).second == fn_ns)
22- RAISE_ERROR(err::XQST0093, loc, ERROR_PARAMS(theModuleNamespace));
23+ {
24+ if (theSctx->xquery_version() == StaticContextConsts::xquery_version_1_0)
25+ RAISE_ERROR(err::XQST0093, loc, ERROR_PARAMS(theModuleNamespace));
26+ else
27+ RAISE_ERROR(err::XQDY0054, loc, ERROR_PARAMS(qnameItem->getStringValue()));
28+ }
29 }
30 }
31
32
33=== modified file 'test/rbkt/Queries/zorba/modules/modules-28.spec'
34--- test/rbkt/Queries/zorba/modules/modules-28.spec 2013-02-07 17:24:36 +0000
35+++ test/rbkt/Queries/zorba/modules/modules-28.spec 2013-04-29 21:04:29 +0000
36@@ -1,4 +1,4 @@
37 Args:
38 -x
39 input-context=$RBKT_SRC_DIR/Queries/zorba/w3c/emptydoc.xml
40-Error: http://www.w3.org/2005/xqt-errors:XQST0093
41+Error: http://www.w3.org/2005/xqt-errors:XQDY0054

Subscribers

People subscribed via source and target branches