[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-12-09T00-34-01.746Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-12-09T00-34-01.746Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The attempt to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job bug-fixing-2011-12-09T00-07-22.351Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-12-09T00-07-22.351Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve looks good. -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Cezar Andrei (cezar-andrei) Related bugs: Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX" https://bugs.launchpad.net/zorba/+bug/867133 For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 exclude .bzr dir from source packages -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/85047 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'CPackSourceConfig.cmake.in' --- CPackSourceConfig.cmake.in 2009-10-30 16:24:51 + +++ CPackSourceConfig.cmake.in 2011-12-08 23:07:26 + @@ -19,7 +19,7 @@ SET(CPACK_CMAKE_GENERATOR "Unix Makefiles") SET(CPACK_GENERATOR "TGZ;TZ") -SET(CPACK_IGNORE_FILES "test/coverity/;dist/;_CPack_Packages/;build/;build./;CVS/;/\\.svn/;\\.swp$;\\.#;/#") +SET(CPACK_IGNORE_FILES "test/coverity/;dist/;_CPack_Packages/;build/;build./;CVS/;/\\.svn/;\\.swp$;\\.#;/#;\\.bzr/") SET(CPACK_INSTALLED_DIRECTORIES "@CMAKE_SOURCE_DIR@;/") SET(CPACK_INSTALL_CMAKE_PROJECTS "") SET(CPACK_MODULE_PATH "") -- 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/84817 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/84817 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-12-07T18-19-15.253Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/84817 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-12-07T18-19-15.253Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/84817 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/84817 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/84817 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/84817 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/84817 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Juan Zacarias (juan457) Matthias Brantner (matthias-brantner) Related bugs: Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX" https://bugs.launchpad.net/zorba/+bug/867133 For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/84817 fix windows build -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/84817 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/api/serialization/serializer.cpp' --- src/api/serialization/serializer.cpp 2011-11-30 18:27:04 + +++ src/api/serialization/serializer.cpp 2011-12-07 18:07:13 + @@ -1709,7 +1709,7 @@ is.clear(); // clear eofbit if (item->isSeekable()) { -if (pos != 0 && pos != -1) +if (pos) { is.exceptions(is.exceptions() | std::ios::failbit); is.seekg(pos, std::ios::beg); -- 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-11-29T22-12-35.046Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-11-29T22-12-35.046Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve I have approved the fix. I would have a small suggestion that in principle should not hinder the commit: maybe the annot-unknown-02.xq and annot-unknown-04.xq tests should be deleted since they serve no purpose now. -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve Testing both cases: known and unknown annotations. It works like a charm. Good job! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-11-28T20-49-20.043Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-11-28T20-49-20.043Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Commit Message changed to: Do not raise warnings for unknown annotations in unknown namespaces For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) William Candillon (wcandillon) Related bugs: Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX" https://bugs.launchpad.net/zorba/+bug/867133 For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 - Do not raise warnings for unknown annotations in unknown namespaces - Improved error message for wrong annotations -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83686 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2011-11-23 22:25:05 + +++ ChangeLog 2011-11-28 20:47:26 + @@ -38,6 +38,7 @@ * Fixed bug #3290122 (ZDST0003 needs collection name) * Fixed bug #3406272 (merging of adjacent text nodes must be done after all updates have been applied). + * Don't raise warnings for unknown annotations. * Fixed bug #3409344 (during detach, if the node being detached is the root of its tree, it should be detached from the tree as well; otherwise memory corruption will occur) === modified file 'doc/cxx/examples/errors.cpp' --- doc/cxx/examples/errors.cpp 2011-08-11 05:11:12 + +++ doc/cxx/examples/errors.cpp 2011-11-28 20:47:26 + @@ -139,12 +139,12 @@ // make sure that the warning zwarn::ZWST0002 is turned // into an error StaticContext_t lCtx = aZorba->createStaticContext(); -lCtx->declareOption(lQName, "ZWST0002"); +lCtx->declareOption(lQName, "ZWST0003"); std::ostringstream s; -s << "declare namespace unknown = 'unknown-annotation';" << std::endl - << "declare %unknown:test variable $var := 3;" << std::endl - << "$var" << std::endl; +s << "declare namespace z = 'http://www.zorba-xquery.com/annotations';" << std::endl + << "declare %z:sequential function local:foo() { 1 };" << std::endl + << "local:foo()" << std::endl; XQuery_t lQuery = aZorba->compileQuery(s.str(), lCtx); std::cout << lQuery << std::endl; === modified file 'src/compiler/translator/translator.cpp' --- src/compiler/translator/translator.cpp 2011-11-24 10:18:51 + +++ src/compiler/translator/translator.cpp 2011-11-28 20:47:26 + @@ -3811,24 +3811,10 @@ if (AnnotationInternal::lookup(lExpandedQName) == AnnotationInternal::zann_end) { RAISE_ERROR(err::XQST0045, loc, - ERROR_PARAMS( "%" + (lExpandedQName->getPrefix().empty() ? - "\'" + lExpandedQName->getNamespace() + "\'" - : lExpandedQName->getPrefix()) -+ ":" + lExpandedQName->getLocalName())); + ERROR_PARAMS( "%" + ("\"" + lExpandedQName->getNamespace() + "\"" ++ ":" + lExpandedQName->getLocalName(; } } - else - { -// annotation in unknown namespace -- generate a warning -theCCB->theXQueryDiagnostics->add_warning( - NEW_XQUERY_WARNING( -zwarn::ZWST0002_UNKNOWN_ANNOTATION, -WARN_PARAMS( "%" + (lExpandedQName->getPrefix().empty() ? - "\'" + lExpandedQName->getNamespace() + "\'" - : lExpandedQName->getPrefix()) - + ":" + lExpandedQName->getLocalName()), -WARN_LOC(loc))); - } std::vector > lLiterals; === modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-02.spec' --- test/rbkt/Queries/zorba/annotations/annot-unknown-02.spec 2011-07-12 23:32:16 + +++ test/rbkt/Queries/zorba/annotations/annot-unknown-02.spec 2011-11-28 20:47:26 + @@ -1,1 +1,1 @@ -Error: http://www.zorba-xquery.com/warnings:ZWST0002 +Error: http://www.zorba-xquery.com/warnings:ZWST0003 === modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-02.xq' --- test/rbkt/Queries/zorba/annotations/annot-unknown-02.xq 2011-07-12 23:32:16 + +++ test/rbkt/Queries/zorba/annotations/annot-unknown-02.xq 2011-11-28 20:47:26 + @@ -1,7 +1,11 @@ -declare namespace unknown = "unknown-annotation"; +declare namespace zann = "http://www.zorba-xquery.com/annotations";; declare namespace zwarn = "http://www.zorba-xquery.com/options/warnings";; -declare option zwarn:error "ZWST0002"; - -declare %unknown:test variable $var := 3; - -$var +declare option zwarn:error "ZWST0003"; + +declare %zann:sequential function local:foo() +{ + 1 +}; + +local:foo() + === modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-04.spec' --- test/rbkt/Queries/zorba/annotations/annot-unknown-04.spec 2011-07-12 23:32:16 + +++ test/rbkt/Queries/zorba/annotations/annot-unknown-04.spec 2011-11-28 20:47:26 + @@ -1,2 +1,2 @@ -Error: http://www.zorba-xquery.com/warnings:ZWST0002 +Error: http://www.zorba-xquery.com/warnings:ZWST0003 === modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-04.xq' --- test/rbkt/Queries/zorba/annotations/annot-unknown-04.xq 2011-07-12 23:32:16 + ++
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The attempt to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job bug-fixing-2011-11-28T20-13-15.46Z is finished. The final status was: 3 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-11-28T20-13-15.46Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Commit Message changed to: Do not raise warnings for unknown annotations in unknown namespaces For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) William Candillon (wcandillon) Related bugs: Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX" https://bugs.launchpad.net/zorba/+bug/867133 For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 - Do not raise warnings for unknown annotations in unknown namespaces - Improved error message for wrong annotations -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83681 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2011-11-23 22:25:05 + +++ ChangeLog 2011-11-28 20:12:16 + @@ -38,6 +38,7 @@ * Fixed bug #3290122 (ZDST0003 needs collection name) * Fixed bug #3406272 (merging of adjacent text nodes must be done after all updates have been applied). + * Don't raise warnings for unknown annotations. * Fixed bug #3409344 (during detach, if the node being detached is the root of its tree, it should be detached from the tree as well; otherwise memory corruption will occur) === modified file 'src/compiler/translator/translator.cpp' --- src/compiler/translator/translator.cpp 2011-11-24 10:18:51 + +++ src/compiler/translator/translator.cpp 2011-11-28 20:12:16 + @@ -3811,24 +3811,10 @@ if (AnnotationInternal::lookup(lExpandedQName) == AnnotationInternal::zann_end) { RAISE_ERROR(err::XQST0045, loc, - ERROR_PARAMS( "%" + (lExpandedQName->getPrefix().empty() ? - "\'" + lExpandedQName->getNamespace() + "\'" - : lExpandedQName->getPrefix()) -+ ":" + lExpandedQName->getLocalName())); + ERROR_PARAMS( "%" + ("\"" + lExpandedQName->getNamespace() + "\"" ++ ":" + lExpandedQName->getLocalName(; } } - else - { -// annotation in unknown namespace -- generate a warning -theCCB->theXQueryDiagnostics->add_warning( - NEW_XQUERY_WARNING( -zwarn::ZWST0002_UNKNOWN_ANNOTATION, -WARN_PARAMS( "%" + (lExpandedQName->getPrefix().empty() ? - "\'" + lExpandedQName->getNamespace() + "\'" - : lExpandedQName->getPrefix()) - + ":" + lExpandedQName->getLocalName()), -WARN_LOC(loc))); - } std::vector > lLiterals; -- 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83677 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83677 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83677 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83677 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83677 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83677 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Commit Message changed to: do not raise warnings for unknown annotations in unknown namespaces For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83677 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83677 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) William Candillon (wcandillon) Related bugs: Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX" https://bugs.launchpad.net/zorba/+bug/867133 For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83677 - Do not raise warnings for unknown annotations in unknown namespaces - Improved error message for wrong annotations -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/83677 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2011-11-23 22:25:05 + +++ ChangeLog 2011-11-28 19:43:26 + @@ -38,6 +38,7 @@ * Fixed bug #3290122 (ZDST0003 needs collection name) * Fixed bug #3406272 (merging of adjacent text nodes must be done after all updates have been applied). + * Don't raise warnings for unknown annotations. * Fixed bug #3409344 (during detach, if the node being detached is the root of its tree, it should be detached from the tree as well; otherwise memory corruption will occur) === modified file 'src/compiler/translator/translator.cpp' --- src/compiler/translator/translator.cpp 2011-11-24 10:18:51 + +++ src/compiler/translator/translator.cpp 2011-11-28 19:43:26 + @@ -3811,24 +3811,10 @@ if (AnnotationInternal::lookup(lExpandedQName) == AnnotationInternal::zann_end) { RAISE_ERROR(err::XQST0045, loc, - ERROR_PARAMS( "%" + (lExpandedQName->getPrefix().empty() ? - "\'" + lExpandedQName->getNamespace() + "\'" - : lExpandedQName->getPrefix()) -+ ":" + lExpandedQName->getLocalName())); + ERROR_PARAMS( "%" + ("\"" + lExpandedQName->getNamespace() + "\"" ++ ":" + lExpandedQName->getLocalName(; } } - else - { -// annotation in unknown namespace -- generate a warning -theCCB->theXQueryDiagnostics->add_warning( - NEW_XQUERY_WARNING( -zwarn::ZWST0002_UNKNOWN_ANNOTATION, -WARN_PARAMS( "%" + (lExpandedQName->getPrefix().empty() ? - "\'" + lExpandedQName->getNamespace() + "\'" - : lExpandedQName->getPrefix()) - + ":" + lExpandedQName->getLocalName()), -WARN_LOC(loc))); - } std::vector > lLiterals; -- 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-11-23T08-54-04.911Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-11-23T08-54-04.911Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The attempt to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job bug-fixing-2011-11-21T22-47-44.727Z is finished. The final status was: 3 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-11-21T22-47-44.727Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
1. is done 2. because fn:trace was constant folded and the print happened at compile time -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Commit Message changed to: - fixed DynamicLoader memory leak - StaticContext::getAuditEvent const - added iterator.h include to zorba.h - fn:trace should not be constant folded and propagate the return type of its first argument For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Markos Zaharioudakis (markos-za) Related bugs: Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX" https://bugs.launchpad.net/zorba/+bug/867133 For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 - fixed DynamicLoader memory leak - StaticContext::getAuditEvent const - added iterator.h include to zorba.h - fn:trace should not be constant folded and propagate the return type of its first argument -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82561 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2011-11-16 04:00:29 + +++ ChangeLog 2011-11-17 16:49:37 + @@ -29,6 +29,7 @@ corruption will occur) * Fixed bug # (Should not destroy the parent of a node that is being detached before the detach is done). + * Added const qualifier to StaticContext::getAuditEvent() * Fixed bug #3408181 (available-collection() returns undeclared collections) * Fixed bug #859465 (Fatal error if a PUL contains two deactivate IC primitives) * Fixed bug #859467 (Fatal error if a PUL contains two activate Foreign Key primitives) === modified file 'include/zorba/static_context.h' --- include/zorba/static_context.h 2011-11-15 08:23:20 + +++ include/zorba/static_context.h 2011-11-17 16:49:37 + @@ -586,7 +586,7 @@ * @return the audit event */ virtual audit::Event* - getAuditEvent() = 0; + getAuditEvent() const = 0; /** \brief Returns the QName of all external variables within the === modified file 'include/zorba/zorba.h' --- include/zorba/zorba.h 2011-06-17 03:47:29 + +++ include/zorba/zorba.h 2011-11-17 16:49:37 + @@ -33,6 +33,7 @@ #include #include #include +#include namespace zorba { === modified file 'src/api/staticcontextimpl.cpp' --- src/api/staticcontextimpl.cpp 2011-11-15 08:23:20 + +++ src/api/staticcontextimpl.cpp 2011-11-17 16:49:37 + @@ -1424,7 +1424,7 @@ audit::Event* -StaticContextImpl::getAuditEvent() +StaticContextImpl::getAuditEvent() const { return theCtx->get_audit_event(); } === modified file 'src/api/staticcontextimpl.h' --- src/api/staticcontextimpl.h 2011-11-15 08:23:20 + +++ src/api/staticcontextimpl.h 2011-11-17 16:49:37 + @@ -246,7 +246,7 @@ setAuditEvent(audit::Event* anEvent); virtual audit::Event* - getAuditEvent(); + getAuditEvent() const; virtual void getExternalVariables(Iterator_t& aVarsIter) const; === modified file 'src/context/dynamic_loader.cpp' --- src/context/dynamic_loader.cpp 2011-10-19 16:19:45 + +++ src/context/dynamic_loader.cpp 2011-11-17 16:49:37 + @@ -191,14 +191,6 @@ } -DynamicLoader& -DynamicLoader::getInstance() -{ - static DynamicLoader singleton; - return singleton; -} - - DynamicLoader::~DynamicLoader() { for (LibrarySet_t::const_iterator lIter = theLibraries.begin(); @@ -265,7 +257,7 @@ if (modfile->good()) { -ExternalModule* lModule = getInstance().loadModule(potentialModuleFile); +ExternalModule* lModule = loadModule(potentialModuleFile); if (lModule) { if (lModule->getURI().c_str() != aNsURI) === modified file 'src/context/dynamic_loader.h' --- src/context/dynamic_loader.h 2011-08-08 13:51:27 + +++ src/context/dynamic_loader.h 2011-11-17 16:49:37 + @@ -29,18 +29,17 @@ class DynamicLoader { public: - static ExternalModule* getExternalModule( + ExternalModule* getExternalModule( zstring const& aNsURI, static_context& aSctx); private: + friend class GlobalEnvironment; DynamicLoader(); ~DynamicLoader(); - static DynamicLoader& getInstance(); - ExternalModule* loadModule(const zstring& aFile) const; #ifdef WIN32 === modified file 'src/context/static_context.cpp' --- src/context/static_context.cpp 2011-11-15 08:23:20 + +++ src/context/static_context.cpp 2011-11-17 16:49:37 + @@ -207,7 +207,7 @@ if (dyn_loaded_module) { ZORBA_ASSERT(sctx); - module = DynamicLoader::getExternalModule(lURI, *sctx); + module = GENV_DYNAMIC_LOADER->getExternalModule(lURI, *sctx); // no way to get the module if (!module) @@ -2634,7 +2634,7 @@ // dynamic loader if (!found) { -lModule = DynamicLoader::getExternalModule(aURI, *this); +lModule = GENV_DYNAMIC_LOADER->getExternalModule(aURI, *this); // no way to get the module if (!lModule) @@ -3400,7 +3400,7 @@ /***//** / -audit::Event* static_context::get_audit_event() +audit::Event* static_context::get_audit_event() const { const static_context* sctx = this; audit::Event* res = sc
Re: [Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
1. The preferred way to narrow the return type of fn:trace is to redefined the function::getReturnType() method inside the fn_trace class. 2. Why does fn:trace require access to the dyn ctx? -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The attempt to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message): Validation queue job bug-fixing-2011-11-17T06-10-27.946Z is finished. The final status was: 3 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-11-17T06-10-27.946Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Commit Message changed to: - fixed DynamicLoader memory leak - StaticContext::getAuditEvent const - added iterator.h include to zorba.h - fn:trace should not be constant folded and propagate the return type of its first argument For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Markos Zaharioudakis (markos-za) Related bugs: Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX" https://bugs.launchpad.net/zorba/+bug/867133 For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 - fixed DynamicLoader memory leak - StaticContext::getAuditEvent const - added iterator.h include to zorba.h - fn:trace should not be constant folded and propagate the return type of its first argument -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82495 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2011-11-16 04:00:29 + +++ ChangeLog 2011-11-17 05:31:26 + @@ -29,6 +29,7 @@ corruption will occur) * Fixed bug # (Should not destroy the parent of a node that is being detached before the detach is done). + * Added const qualifier to StaticContext::getAuditEvent() * Fixed bug #3408181 (available-collection() returns undeclared collections) * Fixed bug #859465 (Fatal error if a PUL contains two deactivate IC primitives) * Fixed bug #859467 (Fatal error if a PUL contains two activate Foreign Key primitives) === modified file 'include/zorba/static_context.h' --- include/zorba/static_context.h 2011-11-15 08:23:20 + +++ include/zorba/static_context.h 2011-11-17 05:31:26 + @@ -586,7 +586,7 @@ * @return the audit event */ virtual audit::Event* - getAuditEvent() = 0; + getAuditEvent() const = 0; /** \brief Returns the QName of all external variables within the === modified file 'include/zorba/zorba.h' --- include/zorba/zorba.h 2011-06-17 03:47:29 + +++ include/zorba/zorba.h 2011-11-17 05:31:26 + @@ -33,6 +33,7 @@ #include #include #include +#include namespace zorba { === modified file 'src/api/staticcontextimpl.cpp' --- src/api/staticcontextimpl.cpp 2011-11-15 08:23:20 + +++ src/api/staticcontextimpl.cpp 2011-11-17 05:31:26 + @@ -1424,7 +1424,7 @@ audit::Event* -StaticContextImpl::getAuditEvent() +StaticContextImpl::getAuditEvent() const { return theCtx->get_audit_event(); } === modified file 'src/api/staticcontextimpl.h' --- src/api/staticcontextimpl.h 2011-11-15 08:23:20 + +++ src/api/staticcontextimpl.h 2011-11-17 05:31:26 + @@ -246,7 +246,7 @@ setAuditEvent(audit::Event* anEvent); virtual audit::Event* - getAuditEvent(); + getAuditEvent() const; virtual void getExternalVariables(Iterator_t& aVarsIter) const; === modified file 'src/compiler/expression/expr_type.cpp' --- src/compiler/expression/expr_type.cpp 2011-08-12 10:21:10 + +++ src/compiler/expression/expr_type.cpp 2011-11-17 05:31:26 + @@ -340,6 +340,11 @@ } break; } +case FunctionConsts::FN_TRACE_2: +{ + newType = e->theArgs[0]->get_return_type(); + break; +} default: break; } === modified file 'src/context/dynamic_loader.cpp' --- src/context/dynamic_loader.cpp 2011-10-19 16:19:45 + +++ src/context/dynamic_loader.cpp 2011-11-17 05:31:26 + @@ -191,14 +191,6 @@ } -DynamicLoader& -DynamicLoader::getInstance() -{ - static DynamicLoader singleton; - return singleton; -} - - DynamicLoader::~DynamicLoader() { for (LibrarySet_t::const_iterator lIter = theLibraries.begin(); @@ -265,7 +257,7 @@ if (modfile->good()) { -ExternalModule* lModule = getInstance().loadModule(potentialModuleFile); +ExternalModule* lModule = loadModule(potentialModuleFile); if (lModule) { if (lModule->getURI().c_str() != aNsURI) === modified file 'src/context/dynamic_loader.h' --- src/context/dynamic_loader.h 2011-08-08 13:51:27 + +++ src/context/dynamic_loader.h 2011-11-17 05:31:26 + @@ -29,18 +29,17 @@ class DynamicLoader { public: - static ExternalModule* getExternalModule( + ExternalModule* getExternalModule( zstring const& aNsURI, static_context& aSctx); private: + friend class GlobalEnvironment; DynamicLoader(); ~DynamicLoader(); - static DynamicLoader& getInstance(); - ExternalModule* loadModule(const zstring& aFile) const; #ifdef WIN32 === modified file 'src/context/static_context.cpp' --- src/context/static_context.cpp 2011-11-15 08:23:20 + +++ src/context/static_context.cpp 2011-11-17 05:31:26 + @@ -207,7 +207,7 @@ if (dyn_loaded_module) { ZORBA_ASSERT(sctx); - module = DynamicLoader::getExternalModule(lURI, *sctx); + module = GENV_DYNAMIC_LOADER->getExternalModule(lURI, *sctx); // no way to get the module if (!module) @@ -2634,7 +2634,7 @@ // dynamic loader if (!found) { -lModule = DynamicLoader::getExternalModule(aURI, *this); +lModule = GENV_DYNAMIC_LOADER->getExternalModule(aURI, *this); // no wa
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82492 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82492 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82492 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Markos Zaharioudakis (markos-za) Related bugs: Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX" https://bugs.launchpad.net/zorba/+bug/867133 For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82492 - fixed DynamicLoader memory leak - StaticContext::getAuditEvent const - added iterator.h include to zorba.h -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82492 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2011-11-16 04:00:29 + +++ ChangeLog 2011-11-17 05:05:28 + @@ -29,6 +29,7 @@ corruption will occur) * Fixed bug # (Should not destroy the parent of a node that is being detached before the detach is done). + * Added const qualifier to StaticContext::getAuditEvent() * Fixed bug #3408181 (available-collection() returns undeclared collections) * Fixed bug #859465 (Fatal error if a PUL contains two deactivate IC primitives) * Fixed bug #859467 (Fatal error if a PUL contains two activate Foreign Key primitives) === modified file 'include/zorba/static_context.h' --- include/zorba/static_context.h 2011-11-15 08:23:20 + +++ include/zorba/static_context.h 2011-11-17 05:05:28 + @@ -586,7 +586,7 @@ * @return the audit event */ virtual audit::Event* - getAuditEvent() = 0; + getAuditEvent() const = 0; /** \brief Returns the QName of all external variables within the === modified file 'include/zorba/zorba.h' --- include/zorba/zorba.h 2011-06-17 03:47:29 + +++ include/zorba/zorba.h 2011-11-17 05:05:28 + @@ -33,6 +33,7 @@ #include #include #include +#include namespace zorba { === modified file 'src/api/staticcontextimpl.cpp' --- src/api/staticcontextimpl.cpp 2011-11-15 08:23:20 + +++ src/api/staticcontextimpl.cpp 2011-11-17 05:05:28 + @@ -1424,7 +1424,7 @@ audit::Event* -StaticContextImpl::getAuditEvent() +StaticContextImpl::getAuditEvent() const { return theCtx->get_audit_event(); } === modified file 'src/api/staticcontextimpl.h' --- src/api/staticcontextimpl.h 2011-11-15 08:23:20 + +++ src/api/staticcontextimpl.h 2011-11-17 05:05:28 + @@ -246,7 +246,7 @@ setAuditEvent(audit::Event* anEvent); virtual audit::Event* - getAuditEvent(); + getAuditEvent() const; virtual void getExternalVariables(Iterator_t& aVarsIter) const; === modified file 'src/context/dynamic_loader.cpp' --- src/context/dynamic_loader.cpp 2011-10-19 16:19:45 + +++ src/context/dynamic_loader.cpp 2011-11-17 05:05:28 + @@ -191,14 +191,6 @@ } -DynamicLoader& -DynamicLoader::getInstance() -{ - static DynamicLoader singleton; - return singleton; -} - - DynamicLoader::~DynamicLoader() { for (LibrarySet_t::const_iterator lIter = theLibraries.begin(); @@ -265,7 +257,7 @@ if (modfile->good()) { -ExternalModule* lModule = getInstance().loadModule(potentialModuleFile); +ExternalModule* lModule = loadModule(potentialModuleFile); if (lModule) { if (lModule->getURI().c_str() != aNsURI) === modified file 'src/context/dynamic_loader.h' --- src/context/dynamic_loader.h 2011-08-08 13:51:27 + +++ src/context/dynamic_loader.h 2011-11-17 05:05:28 + @@ -29,18 +29,17 @@ class DynamicLoader { public: - static ExternalModule* getExternalModule( + ExternalModule* getExternalModule( zstring const& aNsURI, static_context& aSctx); private: + friend class GlobalEnvironment; DynamicLoader(); ~DynamicLoader(); - static DynamicLoader& getInstance(); - ExternalModule* loadModule(const zstring& aFile) const; #ifdef WIN32 === modified file 'src/context/static_context.cpp' --- src/context/static_context.cpp 2011-11-15 08:23:20 + +++ src/context/static_context.cpp 2011-11-17 05:05:28 + @@ -207,7 +207,7 @@ if (dyn_loaded_module) { ZORBA_ASSERT(sctx); - module = DynamicLoader::getExternalModule(lURI, *sctx); + module = GENV_DYNAMIC_LOADER->getExternalModule(lURI, *sctx); // no way to get the module if (!module) @@ -2634,7 +2634,7 @@ // dynamic loader if (!found) { -lModule = DynamicLoader::getExternalModule(aURI, *this); +lModule = GENV_DYNAMIC_LOADER->getExternalModule(aURI, *this); // no way to get the module if (!lModule) @@ -3400,7 +3400,7 @@ /***//** / -audit::Event* static_context::get_audit_event() +audit::Event* static_context::get_audit_event() const { const static_context* sctx = this; audit::Event* res = sctx->theAuditEvent; === modified file 'src/context/static_context.h' --- src/context/static_c
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-11-16T17-06-20.497Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-11-16T17-06-20.497Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: William Candillon (wcandillon) Markos Zaharioudakis (markos-za) Related bugs: Bug #867133 in Zorba: "SWIG PHP build failure on Mac OSX" https://bugs.launchpad.net/zorba/+bug/867133 For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 - cleanup - ChangeLog preparations for 2.1 release - fix for bug #867133 (SWIG PHP build failure on Mac OSX ). With this fix, the PHP binding for Mac is re-enabled. -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2011-11-15 08:23:20 + +++ ChangeLog 2011-11-16 04:14:32 + @@ -1,11 +1,10 @@ Zorba - The XQuery Processor -version 2.x +version 2.1 * Modified C++ API to add isSequential, getExternalVariables, and isBoundExternalVariable Functions * Custom Full-text thesaurus using Zorba URI resolver mechanism. - * Fixed bug #3401971 (node-by-reference on dynamic collections) * Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a sequence of integers) * documentation improvements @@ -17,7 +16,6 @@ * Fixed bug #3404689 (assignment problem in flwor) * Fix for bug #3404450 (testdriver_mt problem: caching and validation of docs) * Fixed installation bug to not install the .so for test modules - * Fix for running ctest on Windows * Fixed bug #3390410 (Adding a node to a collection causes out of bound in vector) * Fixed bug #3406200 (node types were not being moved to new tree during node detach) * Fixed bug #3406191 (Namespace bindings lost after update due to bug in node detach) @@ -44,7 +42,6 @@ * Fixed bug #863730 (static delete-node* functions don't raise ZDDY0012) * Implemented the probe-index-range-value for general indexes * Removed ZSTR0005 and ZSTR0006 error codes - * Fixed bug #867662 ("nullptr" warning) * Fixed bug #868258 (Assertion failure with two delete collection) * Fixed bug #871623 and #871629 (assertion failures with insertions in dynamic collections) * Fixed bug #867262 (allow reuse of iterator over ExtFuncArgItemSequence) @@ -57,6 +54,7 @@ xs:anyAtomicType or xs:untypedAtomic. * Added undo for node revalidation * Optimization for count(collection()) expressions + * Fixed bug #867133 (SWIG PHP build failure on Mac OSX) * Fixed bug #872796 (validate-in-place can interfere with other update primitives) * Fixed bug #872799 (validate-in-place can set incorrect types) * Fixed bug #855715 (Invalid escaped characters in regex not caught) @@ -67,6 +65,18 @@ * Fixed bug #872502 (validation of the JSON module xqdoc fails) * Fixed bug #867107 (xqdoc dependency to zorba is wrong) +version 2.0.3 + * Fixed bug #867662 ("nullptr" warning) + * documentation improvements + +version 2.0.2 + * Fixed bug #3401971 (node-by-reference on dynamic collections) + * documentation improvements + * installer improvements + * Fixed bug #3403291 (build for Fedora 15) + * Don't install the .so for test modules + * Fix for running ctest on Windows + version 2.0.1 * Custom Full-text stemming. === modified file 'cmake_modules/FindPHP5.cmake' --- cmake_modules/FindPHP5.cmake 2011-08-19 00:03:31 + +++ cmake_modules/FindPHP5.cmake 2011-11-16 04:14:32 + @@ -97,6 +97,11 @@ _zend_rsrc_list_get_rsrc_type _zend_wrong_param_count _zval_used_for_init +_zval_is_true +_zend_lookup_class +__object_init +__zend_hash_add_or_update +_php_strtolower ) SET(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS},-U,${symbol}") === modified file 'src/compiler/translator/translator.cpp' --- src/compiler/translator/translator.cpp 2011-11-15 08:23:20 + +++ src/compiler/translator/translator.cpp 2011-11-16 04:14:32 + @@ -2154,7 +2154,8 @@ { TRACE_VISIT(); - if (!utf8::match_whole(v.get_encoding(), "^[A-Za-z]([A-Za-z0-9._]|[-])*$")) + if (v.get_encoding().length() != 0 && + !utf8::match_whole(v.get_encoding(), "^[A-Za-z]([A-Za-z0-9._]|[-])*$")) RAISE_ERROR(err::XQST0087, loc, ERROR_PARAMS(v.get_encoding())); std::string versionStr = v.get_version().str(); === modified file 'src/store/naive/nsbindings.h' --- src/store/naive/nsbindings.h 2011-06-14 17:26:33 + +++ src/store/naive/nsbindings.h 2011-11-16 04:14:32 + @@ -18,8 +18,9 @@ #include +#include "zorbatypes/rchandle.h" #include "zorbamisc/config/platform.h" -#include "store/api/item.h" +#include "store/api/shared_types.h" namespace zorba { namespace simplestore { === modified file 'src/store/naive/pul_primitives.h' --- src/store/naive/pul_primitives.h 2011-10-13 19:44:33 + +++ src/store/naive/pul_primitives.h 2011-11-16 04:14:32 + @@ -29,7 +29,11 @@ #include "store/api/index.h" // for index spec obj #in
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/82347 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-10-26T23-30-08.102Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-10-26T23-30-08.102Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Commit Message changed to: improved error message if the index/map function is invoked with the wrong number of parameters For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) Matthias Brantner (matthias-brantner) For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 improved error message -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80512 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/compiler/translator/translator.cpp' --- src/compiler/translator/translator.cpp 2011-10-18 21:29:50 + +++ src/compiler/translator/translator.cpp 2011-10-26 21:37:31 + @@ -1305,11 +1305,25 @@ if (qname != NULL) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname->getStringValue())); + ERROR_PARAMS( +qname->getStringValue(), +"index", +n-1, +"multiple of 6" + ) + ); } else { - RAISE_ERROR_NO_PARAMS(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc); + RAISE_ERROR( + zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, + ERROR_PARAMS( +"anonymous", +"index", +n-1, +"multiple of 6" + ) + ); } } === modified file 'src/diagnostics/diagnostic_en.xml' --- src/diagnostics/diagnostic_en.xml 2011-10-17 21:17:05 + +++ src/diagnostics/diagnostic_en.xml 2011-10-26 21:37:31 + @@ -1966,7 +1966,7 @@ - ${"1": }invalid number of arguments in probe + "$1": invalid number of arguments to $2 operation; given $3 expected $4 === modified file 'src/diagnostics/pregenerated/dict_en.cpp' --- src/diagnostics/pregenerated/dict_en.cpp 2011-10-20 23:05:55 + +++ src/diagnostics/pregenerated/dict_en.cpp 2011-10-26 21:37:31 + @@ -286,7 +286,7 @@ { "ZDDY0022", "\"$1\": index already exists" }, { "ZDDY0023", "\"$1\": index does not exist" }, { "ZDDY0024", "\"$1\": index uniqueness violation" }, - { "ZDDY0025", "${\"1\": }invalid number of arguments in probe" }, + { "ZDDY0025", "\"$1\": invalid number of arguments to $2 operation; given $3 expected $4" }, { "ZDDY0026", "\"$1\": index range probe not allowed" }, { "ZDDY0027", "\"$1\": index multiple creates" }, { "ZDDY0028", "\"$1\": index domain has duplicate nodes" }, === modified file 'src/runtime/indexing/index_ddl.cpp' --- src/runtime/indexing/index_ddl.cpp 2011-10-05 17:49:48 + +++ src/runtime/indexing/index_ddl.cpp 2011-10-26 21:37:31 + @@ -634,7 +634,12 @@ if (state->theIndexDecl->getKeyExpressions().size() != numChildren-1) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, -ERROR_PARAMS(qnameItem->getStringValue())); +ERROR_PARAMS( + qnameItem->getStringValue(), + "index", + numChildren-1, + state->theIndexDecl->getKeyExpressions().size()) +); } state->theIndex = (state->theIndexDecl->isTemp() ? @@ -800,7 +805,12 @@ numChildren != 2) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, -ERROR_PARAMS(qnameItem->getStringValue())); +ERROR_PARAMS( + qnameItem->getStringValue(), + "index", + numChildren-1, + state->theIndexDecl->getKeyExpressions().size()) +); } state->theIndex = (state->theIndexDecl->isTemp() ? @@ -973,13 +983,23 @@ if ((numChildren-1) % 6 != 0) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname->getStringValue())); + ERROR_PARAMS( +qname->getStringValue(), +"index", +numChildren-1, +"multiple of 6" + )); } if (indexDecl->getKeyExpressions().size() * 6 > numChildren-1) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname->getStringValue())); + ERROR_PARAMS( +qname->getStringValue(), +"index", +numChildren-1, +indexDecl->getKeyExpressions().size() * 6 + )); } state->theIndex = (indexDecl->isTemp() ? === modified file 'src/runtime/store/maps_impl.cpp' --- src/runtime/store/maps_impl.cpp 2011-08-17 23:04:48 + +++ src/runtime/store/maps_impl.cpp 2011-10-26 21:37:31 + @@ -241,7 +241,11 @@ { throw XQUERY_EXCEPTION( zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, - ERROR_PARAMS( lQName->getStringValue() ), + ERROR_PARAMS( +lQName->getStringValue(), +"map", +theChildren.size() - 1, +lSpec.getNumColumns() ), ERROR_LOC( loc ) ); } @@ -316,7 +320,11 @@ { throw XQUERY_EXCEPTION( zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, - ERROR_PARAMS( lQName->getStringValue() ), + ERROR_PARAMS( +lQName->getStringValue(), +"map", +theChildren
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Commit Message changed to: improved error message if the index/map function is invoked with the wrong number of parameters For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80508 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80508 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80508 improved error message -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80508 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/compiler/translator/translator.cpp' --- src/compiler/translator/translator.cpp 2011-10-18 21:29:50 + +++ src/compiler/translator/translator.cpp 2011-10-26 21:19:06 + @@ -1305,11 +1305,25 @@ if (qname != NULL) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname->getStringValue())); + ERROR_PARAMS( +qname->getStringValue(), +"index", +n-1, +"multiple of 6" + ) + ); } else { - RAISE_ERROR_NO_PARAMS(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc); + RAISE_ERROR( + zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, + ERROR_PARAMS( +"anonymous", +"index", +n-1, +"multiple of 6" + ) + ); } } === modified file 'src/diagnostics/diagnostic_en.xml' --- src/diagnostics/diagnostic_en.xml 2011-10-17 21:17:05 + +++ src/diagnostics/diagnostic_en.xml 2011-10-26 21:19:06 + @@ -1966,7 +1966,7 @@ - ${"1": }invalid number of arguments in probe + $1: invalid number of arguments to $2 operation; given $3 expected $4 === modified file 'src/diagnostics/pregenerated/dict_en.cpp' --- src/diagnostics/pregenerated/dict_en.cpp 2011-10-20 23:05:55 + +++ src/diagnostics/pregenerated/dict_en.cpp 2011-10-26 21:19:06 + @@ -286,7 +286,7 @@ { "ZDDY0022", "\"$1\": index already exists" }, { "ZDDY0023", "\"$1\": index does not exist" }, { "ZDDY0024", "\"$1\": index uniqueness violation" }, - { "ZDDY0025", "${\"1\": }invalid number of arguments in probe" }, + { "ZDDY0025", "$1: invalid number of arguments to $2 operation; given $3 expected $4" }, { "ZDDY0026", "\"$1\": index range probe not allowed" }, { "ZDDY0027", "\"$1\": index multiple creates" }, { "ZDDY0028", "\"$1\": index domain has duplicate nodes" }, === modified file 'src/runtime/indexing/index_ddl.cpp' --- src/runtime/indexing/index_ddl.cpp 2011-10-05 17:49:48 + +++ src/runtime/indexing/index_ddl.cpp 2011-10-26 21:19:06 + @@ -634,7 +634,12 @@ if (state->theIndexDecl->getKeyExpressions().size() != numChildren-1) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, -ERROR_PARAMS(qnameItem->getStringValue())); +ERROR_PARAMS( + qnameItem->getStringValue(), + "index", + numChildren-1, + state->theIndexDecl->getKeyExpressions().size()) +); } state->theIndex = (state->theIndexDecl->isTemp() ? @@ -800,7 +805,12 @@ numChildren != 2) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, -ERROR_PARAMS(qnameItem->getStringValue())); +ERROR_PARAMS( + qnameItem->getStringValue(), + "index", + numChildren-1, + state->theIndexDecl->getKeyExpressions().size()) +); } state->theIndex = (state->theIndexDecl->isTemp() ? @@ -973,13 +983,23 @@ if ((numChildren-1) % 6 != 0) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname->getStringValue())); + ERROR_PARAMS( +qname->getStringValue(), +"index", +numChildren-1, +"multiple of 6" + )); } if (indexDecl->getKeyExpressions().size() * 6 > numChildren-1) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname->getStringValue())); + ERROR_PARAMS( +qname->getStringValue(), +"index", +numChildren-1, +indexDecl->getKeyExpressions().size() * 6 + )); } state->theIndex = (indexDecl->isTemp() ? === modified file 'src/runtime/store/maps_impl.cpp' --- src/runtime/store/maps_impl.cpp 2011-08-17 23:04:48 + +++ src/runtime/store/maps_impl.cpp 2011-10-26 21:19:06 + @@ -241,7 +241,11 @@ { throw XQUERY_EXCEPTION( zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, - ERROR_PARAMS( lQName->getStringValue() ), + ERROR_PARAMS( +lQName->getStringValue(), +"map", +theChildren.size() - 1, +lSpec.getNumColumns() ), ERROR_LOC( loc ) ); } @@ -316,7 +320,11 @@ { throw XQUERY_EXCEPTION( zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, - ERROR_PARAMS( lQName->getStringValue() ), + ERROR_PARAMS( +lQName->getStringValue(), +"map", +theChildren.size(
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80114 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80114 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80114 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-10-21T23-03-13.511Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80114 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-10-21T23-03-13.511Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80114 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80114 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80114 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80114 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Matthias Brantner has proposed merging lp:~matthias-brantner/zorba/bug-fixing into lp:zorba. Requested reviews: Matthias Brantner (matthias-brantner) Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80114 improved error message -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/80114 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/compiler/translator/translator.cpp' --- src/compiler/translator/translator.cpp 2011-10-18 21:29:50 + +++ src/compiler/translator/translator.cpp 2011-10-21 23:02:29 + @@ -1305,11 +1305,25 @@ if (qname != NULL) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname->getStringValue())); + ERROR_PARAMS( +qname->getStringValue(), +"index", +n-1, +"multiple of 6" + ) + ); } else { - RAISE_ERROR_NO_PARAMS(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc); + RAISE_ERROR( + zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, + ERROR_PARAMS( +"anonymous", +"index", +n-1, +"multiple of 6" + ) + ); } } === modified file 'src/diagnostics/diagnostic_en.xml' --- src/diagnostics/diagnostic_en.xml 2011-10-17 21:17:05 + +++ src/diagnostics/diagnostic_en.xml 2011-10-21 23:02:29 + @@ -1966,7 +1966,7 @@ - ${"1": }invalid number of arguments in probe + ${"1": }invalid number of arguments to $2 operation; given $3 expected $4 === modified file 'src/diagnostics/pregenerated/dict_en.cpp' --- src/diagnostics/pregenerated/dict_en.cpp 2011-10-20 23:05:55 + +++ src/diagnostics/pregenerated/dict_en.cpp 2011-10-21 23:02:29 + @@ -286,7 +286,7 @@ { "ZDDY0022", "\"$1\": index already exists" }, { "ZDDY0023", "\"$1\": index does not exist" }, { "ZDDY0024", "\"$1\": index uniqueness violation" }, - { "ZDDY0025", "${\"1\": }invalid number of arguments in probe" }, + { "ZDDY0025", "${\"1\": }invalid number of arguments to $2 operation; given $3 expected $4" }, { "ZDDY0026", "\"$1\": index range probe not allowed" }, { "ZDDY0027", "\"$1\": index multiple creates" }, { "ZDDY0028", "\"$1\": index domain has duplicate nodes" }, === modified file 'src/runtime/indexing/index_ddl.cpp' --- src/runtime/indexing/index_ddl.cpp 2011-10-05 17:49:48 + +++ src/runtime/indexing/index_ddl.cpp 2011-10-21 23:02:29 + @@ -634,7 +634,12 @@ if (state->theIndexDecl->getKeyExpressions().size() != numChildren-1) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, -ERROR_PARAMS(qnameItem->getStringValue())); +ERROR_PARAMS( + qnameItem->getStringValue(), + "index", + numChildren-1, + state->theIndexDecl->getKeyExpressions().size()) +); } state->theIndex = (state->theIndexDecl->isTemp() ? @@ -800,7 +805,12 @@ numChildren != 2) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, -ERROR_PARAMS(qnameItem->getStringValue())); +ERROR_PARAMS( + qnameItem->getStringValue(), + "index", + numChildren-1, + state->theIndexDecl->getKeyExpressions().size()) +); } state->theIndex = (state->theIndexDecl->isTemp() ? @@ -973,13 +983,23 @@ if ((numChildren-1) % 6 != 0) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname->getStringValue())); + ERROR_PARAMS( +qname->getStringValue(), +"index", +numChildren-1, +"multiple of 6" + )); } if (indexDecl->getKeyExpressions().size() * 6 > numChildren-1) { RAISE_ERROR(zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, loc, - ERROR_PARAMS(qname->getStringValue())); + ERROR_PARAMS( +qname->getStringValue(), +"index", +numChildren-1, +indexDecl->getKeyExpressions().size() * 6 + )); } state->theIndex = (indexDecl->isTemp() ? === modified file 'src/runtime/store/maps_impl.cpp' --- src/runtime/store/maps_impl.cpp 2011-08-17 23:04:48 + +++ src/runtime/store/maps_impl.cpp 2011-10-21 23:02:29 + @@ -241,7 +241,11 @@ { throw XQUERY_EXCEPTION( zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, - ERROR_PARAMS( lQName->getStringValue() ), + ERROR_PARAMS( +lQName->getStringValue(), +"map", +theChildren.size() - 1, +lSpec.getNumColumns() ), ERROR_LOC( loc ) ); } @@ -316,7 +320,7 @@ { throw XQUERY_EXCEPTION( zerr::ZDDY0025_INDEX_WRONG_NUMBER_OF_PROBE_ARGS, - ERROR_PARAMS( lQName->getStringValue() ), + ERROR_PARAMS( lQName->getStringValue(), theChildren.size() - 2, lSpec.getNumColumn
[Zorba-coders] [Merge] lp:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue job bug-fixing-2011-10-18T23-00-00.712Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-10-18T23-00-00.712Z/log.html -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Review: Approve -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
The proposal to merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 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:~matthias-brantner/zorba/bug-fixing into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~matthias-brantner/zorba/bug-fixing/+merge/79743 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