[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Validation queue job bug-955135-2012-04-11T06-30-00.884Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-955135-2012-04-11T06-30-00.884Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Validation queue job bug-955135-2012-04-10T16-09-12.965Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-955135-2012-04-10T16-09-12.965Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Commit Message changed to: fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions) fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-955135 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Ghislain Fourny (gislenius)
Related bugs:
Bug #955135 in Zorba: "err:XQDY0044 not caught by try-catch expressions."
https://bugs.launchpad.net/zorba/+bug/955135
Bug #955170 in Zorba: "Catch clause with URILiteral-based wilcard NameTest"
https://bugs.launchpad.net/zorba/+bug/955170
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354
fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
--
https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/99354
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-03-26 02:37:23 +
+++ ChangeLog 2012-03-26 15:35:22 +
@@ -1,8 +1,19 @@
Zorba - The XQuery Processor
version 2.5
+
+New Features:
+
+Optimization:
+
+Bug Fixes/Other Changes
* Fixed bug in window iterator
+<<< TREE
* Fixed bug #872234 (prevent a rewritting to take place in case of sequential expr)
+===
+ * Fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
+ * Fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
+>>> MERGE-SOURCE
version 2.2
@@ -46,11 +57,11 @@
of the annotations map in expressions.
Bug Fixes/Other Changes:
- * Fixed bug #923015 (clone() not implemented for full-text expressions)
- * Fixed bug #917923 (bug in copying outer var values into the eval dynamic context)
- * Fixed bug #867509 (Can not handle largest xs:unsignedLong values)
- * Fixed bug #924063 (sentence is incorrectly incremented when token characters end without sentence terminator)
- * Fixed bug #909126 (bug in cloning of var_expr)
+ * Fixed bug 923015 (clone() not implemented for full-text expressions)
+ * Fixed bug 917923 (bug in copying outer var values into the eval dynamic context)
+ * Fixed bug 867509 (Can not handle largest xs:unsignedLong values)
+ * Fixed bug 924063 (sentence is incorrectly incremented when token characters end without sentence terminator)
+ * Fixed bug 909126 (bug in cloning of var_expr)
* Fixed bug in destruction of exit_catcher_expr
* Fixed bug #867024 (error messages)
* Fixed bug #957580 (stream read failure in StringToCodepointsIteartor)
=== modified file 'bin/debugger/main.cpp'
--- bin/debugger/main.cpp 2012-03-23 17:32:07 +
+++ bin/debugger/main.cpp 2012-03-26 15:35:22 +
@@ -18,6 +18,8 @@
# include
# include
# include
+#else
+#include
#endif
#include
=== modified file 'bin/debugger/process_listener.cpp'
--- bin/debugger/process_listener.cpp 2012-03-23 17:32:07 +
+++ bin/debugger/process_listener.cpp 2012-03-26 15:35:22 +
@@ -18,6 +18,10 @@
#include
+#ifndef WIN32
+#include
+#endif
+
#ifdef ZORBA_HAVE_PTHREAD_H
# include
#endif
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-03-23 17:32:07 +
+++ src/compiler/translator/translator.cpp 2012-03-26 15:35:22 +
@@ -9044,16 +9044,25 @@
case ParseConstants::wild_all:
cc->add_nametest_h(new NodeNameTest(zstring(), zstring()));
break;
-case ParseConstants::wild_elem: {
+case ParseConstants::wild_elem:
+{
// bugfix #3138633; expand the qname and use the namespace instead of the prefix
zstring localname(":wildcard");
- store::Item_t qnItem;
- theSctx->expand_qname(qnItem,
-theSctx->default_elem_type_ns(),
-wildcard->getNsOrPrefix(),
-localname,
-wildcard->get_location());
- cc->add_nametest_h(new NodeNameTest(qnItem->getNamespace(), zstring()));
+
+ if (wildcard->isEQnameMatch())
+ {
+cc->add_nametest_h(new NodeNameTest(wildcard->getNsOrPrefix(), zstring()));
+ }
+ else
+ {
+store::Item_t qnItem;
+theSctx->expand_qname(qnItem,
+ theSctx->default_elem_type_ns(),
+ wildcard->getNsOrPrefix(),
+ localname,
+ wildcard->get_location());
+cc->add_nametest_h(new NodeNameTest(qnItem->getNamespace(), zstring()));
+ }
break;
}
case ParseConstants::wild_prefix:
=== modified file 'src/runtime/core/constructors.cpp'
--- src/runtime/core/constructors.cpp 2012-03-23 17:32:07 +
+++ src/runtime/core/constructors.cpp 2012-03-26 15:35:22 +
@@ -543,22 +543,22 @@
BinaryBaseIterator(sctx, loc, qnameIte, valueIte),
theQName(qname),
theIsId(false),
- theIsRoot(isRoot)
+ theIsRoot(isRoot),
+ theRaiseXQDY0074(false),
+ theRaiseXQDY00
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-955135 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Validation queue job bug-955135-2012-03-14T20-36-07.983Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-955135-2012-03-14T20-36-07.983Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job bug-955135-2012-03-14T18-58-04.285Z is finished. The final status was: 447 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-955135-2012-03-14T18-58-04.285Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job bug-955135-2012-03-14T18-00-12.523Z is finished. The final status was: 455 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-955135-2012-03-14T18-00-12.523Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-955135 into lp:zorba has been updated. Commit Message changed to: fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions) fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476 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:~zorba-coders/zorba/bug-955135 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-955135 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Ghislain Fourny (gislenius)
Related bugs:
Bug #955135 in Zorba: "err:XQDY0044 not caught by try-catch expressions."
https://bugs.launchpad.net/zorba/+bug/955135
Bug #955170 in Zorba: "Catch clause with URILiteral-based wilcard NameTest"
https://bugs.launchpad.net/zorba/+bug/955170
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476
fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
--
https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97476
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-03-12 20:01:39 +
+++ ChangeLog 2012-03-14 17:59:22 +
@@ -39,6 +39,8 @@
of the annotations map in expressions.
Bug Fixes/Other Changes:
+ * Fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
+ * Fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
* Fixed bug 923015 (clone() not implemented for full-text expressions)
* Fixed bug 917923 (bug in copying outer var values into the eval dynamic context)
* Fixed bug 867509 (Can not handle largest xs:unsignedLong values)
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-03-07 14:22:29 +
+++ src/compiler/translator/translator.cpp 2012-03-14 17:59:22 +
@@ -9044,16 +9044,25 @@
case ParseConstants::wild_all:
cc->add_nametest_h(new NodeNameTest(zstring(), zstring()));
break;
-case ParseConstants::wild_elem: {
+case ParseConstants::wild_elem:
+{
// bugfix #3138633; expand the qname and use the namespace instead of the prefix
zstring localname(":wildcard");
- store::Item_t qnItem;
- theSctx->expand_qname(qnItem,
-theSctx->default_elem_type_ns(),
-wildcard->getNsOrPrefix(),
-localname,
-wildcard->get_location());
- cc->add_nametest_h(new NodeNameTest(qnItem->getNamespace(), zstring()));
+
+ if (wildcard->isEQnameMatch())
+ {
+cc->add_nametest_h(new NodeNameTest(wildcard->getNsOrPrefix(), zstring()));
+ }
+ else
+ {
+store::Item_t qnItem;
+theSctx->expand_qname(qnItem,
+ theSctx->default_elem_type_ns(),
+ wildcard->getNsOrPrefix(),
+ localname,
+ wildcard->get_location());
+cc->add_nametest_h(new NodeNameTest(qnItem->getNamespace(), zstring()));
+ }
break;
}
case ParseConstants::wild_prefix:
=== modified file 'src/runtime/core/constructors.cpp'
--- src/runtime/core/constructors.cpp 2012-02-15 10:25:02 +
+++ src/runtime/core/constructors.cpp 2012-03-14 17:59:22 +
@@ -543,22 +543,22 @@
BinaryBaseIterator(sctx, loc, qnameIte, valueIte),
theQName(qname),
theIsId(false),
- theIsRoot(isRoot)
+ theIsRoot(isRoot),
+ theRaiseXQDY0074(false),
+ theRaiseXQDY0044(false)
{
- if (theQName != NULL)
+ if (theQName)
{
if (theQName->getLocalName().empty())
{
- RAISE_ERROR(err::XQDY0074, loc,
- ERROR_PARAMS("", ZED(NoEmptyLocalname)));
+ theRaiseXQDY0074 = true;
}
if (ZSTREQ(theQName->getNamespace(), "http://www.w3.org/2000/xmlns/";) ||
(theQName->getNamespace().empty() &&
ZSTREQ(theQName->getLocalName(), "xmlns")))
{
- RAISE_ERROR(err::XQDY0044, loc,
- ERROR_PARAMS(theQName->getStringValue()));
+ theRaiseXQDY0044 = true;
}
if ((ZSTREQ(theQName->getNamespace(), "http://www.w3.org/XML/1998/namespace";) &&
@@ -567,8 +567,7 @@
(ZSTREQ(theQName->getPrefix(), "xml") &&
!ZSTREQ(theQName->getNamespace(), "http://www.w3.org/XML/1998/namespace";)))
{
- RAISE_ERROR(err::XQDY0044, loc,
- ERROR_PARAMS(theQName->getStringValue()));
+ theRaiseXQDY0044 = true;
}
if ((ZSTREQ(theQName->getNamespace(), "http://www.w3.org/2000/xmlns/";) &&
@@ -577,11 +576,7 @@
(ZSTREQ(theQName->getPrefix(), "xmlns") &&
!ZSTREQ(theQName->getNamespace(), "http://www.w3.org/2000/xmlns/";)))
{
- throw XQUERY_EXCEPTION(
-err::XQDY0044,
-ERROR_PARAMS( theQName->getStringValue() ),
-ERROR_LOC( loc )
- );
+ theRaiseXQDY0044 = true;
}
if (ZSTREQ(theQName->getPrefix(), "xml") &&
@@ -616,6 +611,24 @@
PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
+ if (theQName != NULL)
+ {
+// need to raise those er
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-955135 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-955135 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Ghislain Fourny (gislenius)
Related bugs:
Bug #955135 in Zorba: "err:XQDY0044 not caught by try-catch expressions."
https://bugs.launchpad.net/zorba/+bug/955135
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97470
fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
--
https://code.launchpad.net/~zorba-coders/zorba/bug-955135/+merge/97470
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-03-12 20:01:39 +
+++ ChangeLog 2012-03-14 17:27:29 +
@@ -39,6 +39,7 @@
of the annotations map in expressions.
Bug Fixes/Other Changes:
+ * Fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
* Fixed bug 923015 (clone() not implemented for full-text expressions)
* Fixed bug 917923 (bug in copying outer var values into the eval dynamic context)
* Fixed bug 867509 (Can not handle largest xs:unsignedLong values)
=== modified file 'src/runtime/core/constructors.cpp'
--- src/runtime/core/constructors.cpp 2012-02-15 10:25:02 +
+++ src/runtime/core/constructors.cpp 2012-03-14 17:27:29 +
@@ -545,6 +545,40 @@
theIsId(false),
theIsRoot(isRoot)
{
+ if (theQName)
+ {
+if (ZSTREQ(theQName->getPrefix(), "xml") &&
+ZSTREQ(theQName->getLocalName(), "id"))
+ theIsId = true;
+ }
+}
+
+
+void AttributeIterator::serialize(::zorba::serialization::Archiver& ar)
+{
+ serialize_baseclass(ar,
+ (BinaryBaseIterator*)this);
+
+ ar & theQName;
+ ar & theIsId;
+ ar & theIsRoot;
+}
+
+
+bool AttributeIterator::nextImpl(store::Item_t& result, PlanState& planState) const
+{
+ store::Item_t qname;
+ store::Item_t typeName = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
+ store::Item_t valueItem;
+ zstring lexicalValue;
+ store::Item_t typedValue;
+ store::Item* parent;
+ bool isId = theIsId;
+ std::stack& path = planState.theNodeConstuctionPath;
+
+ PlanIteratorState* state;
+ DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
+
if (theQName != NULL)
{
if (theQName->getLocalName().empty())
@@ -583,38 +617,7 @@
ERROR_LOC( loc )
);
}
-
-if (ZSTREQ(theQName->getPrefix(), "xml") &&
-ZSTREQ(theQName->getLocalName(), "id"))
- theIsId = true;
}
-}
-
-
-void AttributeIterator::serialize(::zorba::serialization::Archiver& ar)
-{
- serialize_baseclass(ar,
- (BinaryBaseIterator*)this);
-
- ar & theQName;
- ar & theIsId;
- ar & theIsRoot;
-}
-
-
-bool AttributeIterator::nextImpl(store::Item_t& result, PlanState& planState) const
-{
- store::Item_t qname;
- store::Item_t typeName = GENV_TYPESYSTEM.XS_UNTYPED_ATOMIC_QNAME;
- store::Item_t valueItem;
- zstring lexicalValue;
- store::Item_t typedValue;
- store::Item* parent;
- bool isId = theIsId;
- std::stack& path = planState.theNodeConstuctionPath;
-
- PlanIteratorState* state;
- DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
if (theChild0 != NULL)
{
=== added file 'test/rbkt/ExpQueryResults/zorba/trycatch/trycatch12.xml.res'
--- test/rbkt/ExpQueryResults/zorba/trycatch/trycatch12.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/trycatch/trycatch12.xml.res 2012-03-14 17:27:29 +
@@ -0,0 +1,1 @@
+Invalid attribute.
=== added file 'test/rbkt/Queries/zorba/trycatch/trycatch12.xq'
--- test/rbkt/Queries/zorba/trycatch/trycatch12.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/trycatch/trycatch12.xq 2012-03-14 17:27:29 +
@@ -0,0 +1,1 @@
+try { attribute xmlns {} } catch *:XQDY0044 { "Invalid attribute." }
--
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
