Zorba

Merge lp:~nbrinza/zorba/bugs3 into lp:zorba

  1. bugs3
  2. Merge into trunk
Proposed by Nicolae Brinza
Status: Merged
Approved by: Chris Hillery
Approved revision: 11333
Merged at revision: 11337
Proposed branch: lp:~nbrinza/zorba/bugs3
Merge into: lp:zorba
Diff against target: 187 lines (+43/-3)
11 files modified
ChangeLog (+1/-0)
include/zorba/pregenerated/diagnostic_list.h (+2/-0)
modules/w3c/pregenerated/xqt-errors.xq (+8/-0)
src/compiler/translator/translator.cpp (+9/-1)
src/context/static_context.cpp (+4/-0)
src/context/static_context.h (+2/-1)
src/diagnostics/diagnostic_en.xml (+11/-0)
src/diagnostics/pregenerated/diagnostic_list.cpp (+3/-0)
src/diagnostics/pregenerated/dict_en.cpp (+2/-0)
src/diagnostics/pregenerated/dict_zed_keys.h (+1/-0)
test/fots/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~nbrinza/zorba/bugs3
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Nicolae Brinza Approve
Review via email: mp+156734@code.launchpad.net

This proposal supersedes a proposal from 2013-04-02.

Commit message

Unrecognized options in the XQuery namespace now raise an error, fixes K-OptionDeclarationProlog-1b

Description of the change

Unrecognized options in the XQuery namespace now raise an error, fixes K-OptionDeclarationProlog-1b

To post a comment you must log in.
Revision history for this message
Nicolae Brinza (nbrinza) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs3-2013-04-02T22-04-43.127Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

The attempt to merge lp:~nbrinza/zorba/bugs3 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job bugs3-2013-04-02T22-04-43.127Z is finished. The final
  status was:

  13 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Nicolae Brinza (nbrinza) :
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/bugs3-2013-04-03T04-03-48.436Z/log.html

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

Validation queue job bugs3-2013-04-03T04-03-48.436Z is finished. The final status was:

All tests succeeded!

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

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending.

Revision history for this message
Chris Hillery (ceejatec) :
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/bugs3-2013-04-03T07-08-55.435Z/log.html

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

Validation queue job bugs3-2013-04-03T07-08-55.435Z 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
=== modified file 'ChangeLog'
--- ChangeLog 2013-04-01 02:48:23 +0000
+++ ChangeLog 2013-04-03 04:02:29 +0000
@@ -36,6 +36,7 @@
36 * Extented index join rule to general flwor expressions. 36 * Extented index join rule to general flwor expressions.
3737
38Bug Fixes/Other Changes:38Bug Fixes/Other Changes:
39 * Fixed bug #1114228 (unrecognized options in the XQuery namespace now raise an error)
39 * Fixed bug #1124273 (xqdoc crash because of annotation literals)40 * Fixed bug #1124273 (xqdoc crash because of annotation literals)
40 * Fixed bug #867027 (XQST0059 error messages inconsistent)41 * Fixed bug #867027 (XQST0059 error messages inconsistent)
41 * Fixed bug #1095889 (Improve error message for xml-parsing error).42 * Fixed bug #1095889 (Improve error message for xml-parsing error).
4243
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-03-28 05:32:59 +0000
+++ include/zorba/pregenerated/diagnostic_list.h 2013-04-03 04:02:29 +0000
@@ -158,6 +158,8 @@
158158
159extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0111;159extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0111;
160160
161extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0123;
162
161extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0002;163extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0002;
162164
163extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0050;165extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0050;
164166
=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq 2013-03-28 05:32:59 +0000
+++ modules/w3c/pregenerated/xqt-errors.xq 2013-04-03 04:02:29 +0000
@@ -674,6 +674,14 @@
674674
675(:~675(:~
676 :676 :
677 : It is a static error if the name of a feature in require-feature is not recognized by the implementation.
678 :
679 : @see http://www.w3.org/2005/xqt-errors
680:)
681declare variable $err:XQST0123 as xs:QName := fn:QName($err:NS, "err:XQST0123");
682
683(:~
684 :
677 : It is a dynamic error if evaluation of an expression relies on some part685 : It is a dynamic error if evaluation of an expression relies on some part
678 : of the dynamic context that has not been assigned a value.686 : of the dynamic context that has not been assigned a value.
679 : 687 :
680688
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-03-27 12:40:41 +0000
+++ src/compiler/translator/translator.cpp 2013-04-03 04:02:29 +0000
@@ -3525,7 +3525,7 @@
3525 {3525 {
3526 theSctx->expand_qname(3526 theSctx->expand_qname(
3527 qnameItem,3527 qnameItem,
3528 static_context::XQUERY_OPTION_NS,3528 static_context::XQUERY_NS,
3529 "",3529 "",
3530 lQName->get_localname(),3530 lQName->get_localname(),
3531 lQName->get_location());3531 lQName->get_location());
@@ -3539,6 +3539,14 @@
3539 }3539 }
3540 }3540 }
35413541
3542 if (qnameItem->getNamespace() == static_context::XQUERY_NS
3543 &&
3544 qnameItem->getLocalName() != "require-feature"
3545 &&
3546 qnameItem->getLocalName() != "prohibit-feature")
3547 {
3548 RAISE_ERROR(err::XQST0123, loc, ERROR_PARAMS(ZED(UnrecognizedXQueryOption), qnameItem->getLocalName()));
3549 }
35423550
3543 if (qnameItem->getNamespace() == static_context::ZORBA_OPTION_FEATURE_NS &&3551 if (qnameItem->getNamespace() == static_context::ZORBA_OPTION_FEATURE_NS &&
3544 value == "http-uri-resolution")3552 value == "http-uri-resolution")
35453553
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2013-03-22 00:49:51 +0000
+++ src/context/static_context.cpp 2013-04-03 04:02:29 +0000
@@ -512,6 +512,10 @@
512"http://www.zorba-xquery.com/options/optimizer";512"http://www.zorba-xquery.com/options/optimizer";
513513
514const char*514const char*
515static_context::XQUERY_NS =
516"http://www.w3.org/2012/xquery";
517
518const char*
515static_context::XQUERY_OPTION_NS =519static_context::XQUERY_OPTION_NS =
516"http://www.w3.org/2011/xquery-options";520"http://www.w3.org/2011/xquery-options";
517521
518522
=== modified file 'src/context/static_context.h'
--- src/context/static_context.h 2013-03-22 00:49:51 +0000
+++ src/context/static_context.h 2013-04-03 04:02:29 +0000
@@ -567,7 +567,8 @@
567 static const char* ZORBA_OPTION_WARN_NS;567 static const char* ZORBA_OPTION_WARN_NS;
568 static const char* ZORBA_OPTION_FEATURE_NS;568 static const char* ZORBA_OPTION_FEATURE_NS;
569 static const char* ZORBA_OPTION_OPTIM_NS;569 static const char* ZORBA_OPTION_OPTIM_NS;
570 static const char* XQUERY_OPTION_NS;570 static const char* XQUERY_NS; // http://www.w3.org/2012/xquery
571 static const char* XQUERY_OPTION_NS; // http://www.w3.org/2011/xquery-options
571 static const char* ZORBA_VERSIONING_NS;572 static const char* ZORBA_VERSIONING_NS;
572573
573protected:574protected:
574575
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-04-01 02:22:49 +0000
+++ src/diagnostics/diagnostic_en.xml 2013-04-03 04:02:29 +0000
@@ -814,6 +814,13 @@
814 <value>$1</value>814 <value>$1</value>
815 </diagnostic>815 </diagnostic>
816816
817 <diagnostic code="XQST0123">
818 <comment>
819 It is a static error if the name of a feature in require-feature is not recognized by the implementation.
820 </comment>
821 <value>$1</value>
822 </diagnostic>
823
817 <diagnostic code="XPDY0002">824 <diagnostic code="XPDY0002">
818 <comment>825 <comment>
819 It is a dynamic error if evaluation of an expression relies on some part826 It is a dynamic error if evaluation of an expression relies on some part
@@ -5007,6 +5014,10 @@
5007 <value>"$5": duplicate attribute enumeration value token</value>5014 <value>"$5": duplicate attribute enumeration value token</value>
5008 </entry>5015 </entry>
50095016
5017 <entry key="UnrecognizedXQueryOption">
5018 <value>"$2": unrecognized XQuery namespace option</value>
5019 </entry>
5020
5010 </subvalues>5021 </subvalues>
50115022
5012</diagnostic-list>5023</diagnostic-list>
50135024
=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp 2013-03-28 05:32:59 +0000
+++ src/diagnostics/pregenerated/diagnostic_list.cpp 2013-04-03 04:02:29 +0000
@@ -220,6 +220,9 @@
220XQueryErrorCode XQST0111( "XQST0111" );220XQueryErrorCode XQST0111( "XQST0111" );
221221
222222
223XQueryErrorCode XQST0123( "XQST0123" );
224
225
223XQueryErrorCode XPDY0002( "XPDY0002" );226XQueryErrorCode XPDY0002( "XPDY0002" );
224227
225228
226229
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2013-04-01 02:22:49 +0000
+++ src/diagnostics/pregenerated/dict_en.cpp 2013-04-03 04:02:29 +0000
@@ -260,6 +260,7 @@
260 { "XQST0103", "$1: non-distinct variable in window clause" },260 { "XQST0103", "$1: non-distinct variable in window clause" },
261 { "XQST0106", "$1: multiple annotations with $2 names" },261 { "XQST0106", "$1: multiple annotations with $2 names" },
262 { "XQST0111", "$1" },262 { "XQST0111", "$1" },
263 { "XQST0123", "$1" },
263 { "XQTY0024", "element constructor content sequence must not have an attribute node following a non-attribute node" },264 { "XQTY0024", "element constructor content sequence must not have an attribute node following a non-attribute node" },
264 { "XQTY0030", "validate argument must be exactly one document or element node" },265 { "XQTY0030", "validate argument must be exactly one document or element node" },
265 { "XQTY0086", "typed value of copied element or attribute node is namespace-sensitive when construction mode is preserve and copy-namespaces mode is no-preserve" },266 { "XQTY0086", "typed value of copied element or attribute node is namespace-sensitive when construction mode is preserve and copy-namespaces mode is no-preserve" },
@@ -925,6 +926,7 @@
925 { "~UnescapedChar_3", "character '$3' must be escaped here" },926 { "~UnescapedChar_3", "character '$3' must be escaped here" },
926#endif927#endif
927 { "~UnexpectedElement", "unexpected element" },928 { "~UnexpectedElement", "unexpected element" },
929 { "~UnrecognizedXQueryOption", "\"$2\": unrecognized XQuery namespace option" },
928 { "~VarValMustBeSingleItem_2", "\"$2\": variable value must be single item" },930 { "~VarValMustBeSingleItem_2", "\"$2\": variable value must be single item" },
929 { "~XMLParserInitFailed", "XML parser initialization failed" },931 { "~XMLParserInitFailed", "XML parser initialization failed" },
930 { "~XMLParserNoCreateTree", "XML tree creation failed" },932 { "~XMLParserNoCreateTree", "XML tree creation failed" },
931933
=== modified file 'src/diagnostics/pregenerated/dict_zed_keys.h'
--- src/diagnostics/pregenerated/dict_zed_keys.h 2013-04-01 02:22:49 +0000
+++ src/diagnostics/pregenerated/dict_zed_keys.h 2013-04-03 04:02:29 +0000
@@ -515,6 +515,7 @@
515#define ZED_libxml_ERR_539 "~libxml_ERR_539"515#define ZED_libxml_ERR_539 "~libxml_ERR_539"
516#define ZED_libxml_ERR_540 "~libxml_ERR_540"516#define ZED_libxml_ERR_540 "~libxml_ERR_540"
517#define ZED_libxml_ERR_541 "~libxml_ERR_541"517#define ZED_libxml_ERR_541 "~libxml_ERR_541"
518#define ZED_UnrecognizedXQueryOption "~UnrecognizedXQueryOption"
518519
519#endif /* ZORBA_DIAGNOSTICS_ZED_KEYS */520#endif /* ZORBA_DIAGNOSTICS_ZED_KEYS */
520/*521/*
521522
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-04-02 18:29:15 +0000
+++ test/fots/CMakeLists.txt 2013-04-03 04:02:29 +0000
@@ -474,7 +474,6 @@
474EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)474EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-30 0)
475EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)475EXPECTED_FOTS_FAILURE (prod-ModuleImport modules-pub-priv-34 0)
476EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0)476EXPECTED_FOTS_FAILURE (prod-ModuleImport cbcl-module-004 0)
477EXPECTED_FOTS_FAILURE (prod-OptionDecl K-OptionDeclarationProlog-1b 0)
478EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 0)477EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-003 0)
479EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-004 0)478EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-004 0)
480EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-005 0)479EXPECTED_FOTS_FAILURE (prod-OptionDecl.serialization Serialization-005 0)

Subscribers

People subscribed via source and target branches