Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs3-2013-04-03T07-08-55.435Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Validation queue job bugs3-2013-04-03T07-08-55.435Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs3 into lp:zorba.
Commit message:
Unrecognized options in the XQuery namespace now raise an error, fixes
K-OptionDeclarationProlog-1b
Requested reviews:
Nicolae Brinza (nbrinza)
Chris Hillery (ceejatec)
Related bugs:
Bug #1114228 in Zorba: prod-OptionDecl failure
https://bugs.launchpad.net/zorba/+bug/1114228
For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703
Unrecognized options in the XQuery namespace now raise an error, fixes
K-OptionDeclarationProlog-1b
--
https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-04-01 02:48:23 +
+++ ChangeLog 2013-04-02 21:49:23 +
@@ -36,6 +36,7 @@
* Extented index join rule to general flwor expressions.
Bug Fixes/Other Changes:
+ * Fixed bug #1114228 (unrecognized options in the XQuery namespace now raise an error)
* Fixed bug #1124273 (xqdoc crash because of annotation literals)
* Fixed bug #867027 (XQST0059 error messages inconsistent)
* Fixed bug #1095889 (Improve error message for xml-parsing error).
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-03-28 05:32:59 +
+++ include/zorba/pregenerated/diagnostic_list.h 2013-04-02 21:49:23 +
@@ -158,6 +158,8 @@
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0111;
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0123;
+
extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0002;
extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0050;
=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq 2013-03-28 05:32:59 +
+++ modules/w3c/pregenerated/xqt-errors.xq 2013-04-02 21:49:23 +
@@ -674,6 +674,14 @@
(:~
:
+ : It is a static error if the name of a feature in require-feature is not recognized by the implementation.
+ :
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0123 as xs:QName := fn:QName($err:NS, err:XQST0123);
+
+(:~
+ :
: It is a dynamic error if evaluation of an expression relies on some part
: of the dynamic context that has not been assigned a value.
:
=== modified file 'src/compiler/parser/xquery_scanner.l'
--- src/compiler/parser/xquery_scanner.l 2013-03-18 18:10:14 +
+++ src/compiler/parser/xquery_scanner.l 2013-04-02 21:49:23 +
@@ -295,7 +295,9 @@
|
| Entity definitions
|__*/
-CharRef #([0-9]+|x([0-9]|[a-f]|[A-F])+);
+ // CharRef #([0-9]+|x([0-9]|[a-f]|[A-F])+);
+
+CharRef #([1-9][0-9]*|x(([1-9]|[a-f]|[A-F])([0-9]|[a-f]|[A-F])*));
PredefinedEntityRef (lt|gt|amp|quot|apos|nbsp);
Ref {CharRef}|{PredefinedEntityRef}
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-03-27 12:40:41 +
+++ src/compiler/translator/translator.cpp 2013-04-02 21:49:23 +
@@ -3525,7 +3525,7 @@
{
theSctx-expand_qname(
qnameItem,
- static_context::XQUERY_OPTION_NS,
+ static_context::XQUERY_NS,
,
lQName-get_localname(),
lQName-get_location());
@@ -3539,6 +3539,14 @@
}
}
+ if (qnameItem-getNamespace() == static_context::XQUERY_NS
+
+ qnameItem-getLocalName() != require-feature
+
+ qnameItem-getLocalName() != prohibit-feature)
+ {
+RAISE_ERROR(err::XQST0123, loc, ERROR_PARAMS(ZED(UnrecognizedXQueryOption), qnameItem-getLocalName()));
+ }
if (qnameItem-getNamespace() == static_context::ZORBA_OPTION_FEATURE_NS
value == http-uri-resolution)
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2013-03-22 00:49:51 +
+++ src/context/static_context.cpp 2013-04-02 21:49:23 +
@@ -512,6 +512,10 @@
http://www.zorba-xquery.com/options/optimizer;;
const char*
+static_context::XQUERY_NS =
+http://www.w3.org/2012/xquery;;
+
+const char*
static_context::XQUERY_OPTION_NS =
http://www.w3.org/2011/xquery-options;;
=== modified file 'src/context/static_context.h'
--- src/context/static_context.h 2013-03-22 00:49:51 +
+++ src/context/static_context.h 2013-04-02 21:49:23 +
@@ -567,7 +567,8 @@
static const char* ZORBA_OPTION_WARN_NS;
static const char* ZORBA_OPTION_FEATURE_NS;
static const char* ZORBA_OPTION_OPTIM_NS;
- static const char* XQUERY_OPTION_NS;
+ static const char* XQUERY_NS; // http://www.w3.org/2012/xquery
+ static const char* XQUERY_OPTION_NS; // http://www.w3.org/2011/xquery-options
static const char* ZORBA_VERSIONING_NS;
protected:
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-04-01 02:22:49 +
+++
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Commit Message changed to: Unrecognized options in the XQuery namespace now raise an error, fixes K-OptionDeclarationProlog-1b For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs3-2013-04-02T22-04-43.127Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
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 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs3 into lp:zorba.
Commit message:
Unrecognized options in the XQuery namespace now raise an error, fixes
K-OptionDeclarationProlog-1b
Requested reviews:
Nicolae Brinza (nbrinza)
Chris Hillery (ceejatec)
Related bugs:
Bug #1114228 in Zorba: prod-OptionDecl failure
https://bugs.launchpad.net/zorba/+bug/1114228
For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734
Unrecognized options in the XQuery namespace now raise an error, fixes
K-OptionDeclarationProlog-1b
--
https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-04-01 02:48:23 +
+++ ChangeLog 2013-04-03 04:02:29 +
@@ -36,6 +36,7 @@
* Extented index join rule to general flwor expressions.
Bug Fixes/Other Changes:
+ * Fixed bug #1114228 (unrecognized options in the XQuery namespace now raise an error)
* Fixed bug #1124273 (xqdoc crash because of annotation literals)
* Fixed bug #867027 (XQST0059 error messages inconsistent)
* Fixed bug #1095889 (Improve error message for xml-parsing error).
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-03-28 05:32:59 +
+++ include/zorba/pregenerated/diagnostic_list.h 2013-04-03 04:02:29 +
@@ -158,6 +158,8 @@
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0111;
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0123;
+
extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0002;
extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0050;
=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq 2013-03-28 05:32:59 +
+++ modules/w3c/pregenerated/xqt-errors.xq 2013-04-03 04:02:29 +
@@ -674,6 +674,14 @@
(:~
:
+ : It is a static error if the name of a feature in require-feature is not recognized by the implementation.
+ :
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0123 as xs:QName := fn:QName($err:NS, err:XQST0123);
+
+(:~
+ :
: It is a dynamic error if evaluation of an expression relies on some part
: of the dynamic context that has not been assigned a value.
:
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-03-27 12:40:41 +
+++ src/compiler/translator/translator.cpp 2013-04-03 04:02:29 +
@@ -3525,7 +3525,7 @@
{
theSctx-expand_qname(
qnameItem,
- static_context::XQUERY_OPTION_NS,
+ static_context::XQUERY_NS,
,
lQName-get_localname(),
lQName-get_location());
@@ -3539,6 +3539,14 @@
}
}
+ if (qnameItem-getNamespace() == static_context::XQUERY_NS
+
+ qnameItem-getLocalName() != require-feature
+
+ qnameItem-getLocalName() != prohibit-feature)
+ {
+RAISE_ERROR(err::XQST0123, loc, ERROR_PARAMS(ZED(UnrecognizedXQueryOption), qnameItem-getLocalName()));
+ }
if (qnameItem-getNamespace() == static_context::ZORBA_OPTION_FEATURE_NS
value == http-uri-resolution)
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2013-03-22 00:49:51 +
+++ src/context/static_context.cpp 2013-04-03 04:02:29 +
@@ -512,6 +512,10 @@
http://www.zorba-xquery.com/options/optimizer;;
const char*
+static_context::XQUERY_NS =
+http://www.w3.org/2012/xquery;;
+
+const char*
static_context::XQUERY_OPTION_NS =
http://www.w3.org/2011/xquery-options;;
=== modified file 'src/context/static_context.h'
--- src/context/static_context.h 2013-03-22 00:49:51 +
+++ src/context/static_context.h 2013-04-03 04:02:29 +
@@ -567,7 +567,8 @@
static const char* ZORBA_OPTION_WARN_NS;
static const char* ZORBA_OPTION_FEATURE_NS;
static const char* ZORBA_OPTION_OPTIM_NS;
- static const char* XQUERY_OPTION_NS;
+ static const char* XQUERY_NS; // http://www.w3.org/2012/xquery
+ static const char* XQUERY_OPTION_NS; // http://www.w3.org/2011/xquery-options
static const char* ZORBA_VERSIONING_NS;
protected:
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-04-01 02:22:49 +
+++ src/diagnostics/diagnostic_en.xml 2013-04-03 04:02:29 +
@@ -814,6 +814,13 @@
value$1/value
/diagnostic
+diagnostic code=XQST0123
+ comment
+ It is a static error if the name of a feature in require-feature is not recognized by the implementation.
+ /comment
+ value$1/value
+/diagnostic
+
diagnostic code=XPDY0002
comment
It is a dynamic error if evaluation of an expression relies on some part
@@ -5007,6 +5014,10 @@
value$5: duplicate attribute enumeration value token/value
/entry
+entry key=UnrecognizedXQueryOption
+ value$2: unrecognized
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Commit Message changed to: Unrecognized options in the XQuery namespace now raise an error, fixes K-OptionDeclarationProlog-1b For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs3-2013-04-03T04-03-48.436Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Validation queue job bugs3-2013-04-03T04-03-48.436Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
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. -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
