[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs2 into lp:zorba. Commit message: Added W3C bug reference in disputed bugs Requested reviews: Nicolae Brinza (nbrinza) Sorin Marian Nasoi (sorin.marian.nasoi) Related bugs: Bug #898792 in Zorba: xs:QName fails for non-literal input https://bugs.launchpad.net/zorba/+bug/898792 Bug #931501 in Zorba: improve error message for fn:format-number https://bugs.launchpad.net/zorba/+bug/931501 Bug #1123836 in Zorba: arithmetic operators on durations, dates and times failures (at least 46) https://bugs.launchpad.net/zorba/+bug/1123836 Bug #1147507 in Zorba: casting to date and time types (at least 16 failures) https://bugs.launchpad.net/zorba/+bug/1147507 Bug #1154367 in Zorba: yearMonthDuration arithmetic bug https://bugs.launchpad.net/zorba/+bug/1154367 For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160440 Added W3C bug reference in disputed bugs -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160440 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'test/fots/CMakeLists.txt' --- test/fots/CMakeLists.txt 2013-04-23 13:55:03 + +++ test/fots/CMakeLists.txt 2013-04-23 17:11:26 + @@ -325,22 +325,22 @@ EXPECTED_FOTS_FAILURE (prod-FunctionCall function-call-reserved-function-names-014 0) EXPECTED_FOTS_FAILURE (prod-FunctionCall function-call-reserved-function-names-015 0) EXPECTED_FOTS_FAILURE (prod-FunctionCall function-call-reserved-function-names-016 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-001 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-003 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-005 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-007 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-009 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-012 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-013 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-015 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-017 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-019 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-021 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-023 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-025 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-027 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-001 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-003 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-005 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-007 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-009 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-012 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-013 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-015 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-017 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-019 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-021 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-023 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-025 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-027 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 21568) +EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 21568) EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0) EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof131 0) EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof139 1160559) -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160440 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Needs Fixing The disputed test cases have to be logged as: EXPECTED_FOTS_FAILURE (DISPUTED TEST_SET_NAME TEST_CASE_NAME W3C_BUG_NO) Please see: - http://bazaar.launchpad.net/~zorba-coders/zorba/trunk/view/head:/test/fots/CMakeLists.txt#L118 - https://bugs.launchpad.net/zorba/+bug/1147547/comments/5 Also this merge proposal is a fix for lp:1147547: can you please rename the branch to something unique? As you can see LP assumes that you have a branch called bugs2 that you regularly merge into the trunk. That is why the history from LP links 'bugs2' branch to every bug that was fixed from a branch with name 'bugs2'. -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160440 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
I would have corrected the changes in test/CMakeLists.txt myself if the branch owner would have been zorba-coders. Like it is now, only you can commit to this branch. -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160440 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
I've added DISPUTED to the tests. -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160440 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs2 into lp:zorba. Commit message: Added W3C bug reference in disputed bugs. Requested reviews: Nicolae Brinza (nbrinza) Sorin Marian Nasoi (sorin.marian.nasoi) Related bugs: Bug #898792 in Zorba: xs:QName fails for non-literal input https://bugs.launchpad.net/zorba/+bug/898792 Bug #931501 in Zorba: improve error message for fn:format-number https://bugs.launchpad.net/zorba/+bug/931501 Bug #1123836 in Zorba: arithmetic operators on durations, dates and times failures (at least 46) https://bugs.launchpad.net/zorba/+bug/1123836 Bug #1147507 in Zorba: casting to date and time types (at least 16 failures) https://bugs.launchpad.net/zorba/+bug/1147507 Bug #1154367 in Zorba: yearMonthDuration arithmetic bug https://bugs.launchpad.net/zorba/+bug/1154367 For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 Added W3C bug reference in disputed bugs. -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'test/fots/CMakeLists.txt' --- test/fots/CMakeLists.txt 2013-04-23 13:55:03 + +++ test/fots/CMakeLists.txt 2013-04-23 17:31:38 + @@ -325,22 +325,22 @@ EXPECTED_FOTS_FAILURE (prod-FunctionCall function-call-reserved-function-names-014 0) EXPECTED_FOTS_FAILURE (prod-FunctionCall function-call-reserved-function-names-015 0) EXPECTED_FOTS_FAILURE (prod-FunctionCall function-call-reserved-function-names-016 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-001 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-003 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-005 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-007 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-009 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-012 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-013 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-015 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-017 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-019 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-021 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-023 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-025 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-027 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-029 0) -EXPECTED_FOTS_FAILURE (prod-FunctionDecl function-decl-reserved-function-names-031 0) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-001 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-003 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-005 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-007 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-009 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-012 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-013 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-015 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-017 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-019 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-021 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-023 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-025 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-027 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-029 21568) +EXPECTED_FOTS_FAILURE (DISPUTED prod-FunctionDecl function-decl-reserved-function-names-031 21568) EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof113 0) EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof131 0) EXPECTED_FOTS_FAILURE (prod-InstanceofExpr instanceof139 1160559) -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Commit Message changed to: Added W3C bug reference in disputed bugs. For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160440 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-23T17-58-48.666Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue job bugs2-2013-04-23T17-58-48.666Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/160447 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-10T06-19-42.473Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue job bugs2-2013-04-10T06-19-42.473Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in test/fots/CMakeLists.txt -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs2 into lp:zorba.
Commit message:
More datetime/duration fixes.
Requested reviews:
Nicolae Brinza (nbrinza)
Chris Hillery (ceejatec)
Related bugs:
Bug #898792 in Zorba: xs:QName fails for non-literal input
https://bugs.launchpad.net/zorba/+bug/898792
Bug #931501 in Zorba: improve error message for fn:format-number
https://bugs.launchpad.net/zorba/+bug/931501
Bug #1123836 in Zorba: arithmetic operators on durations, dates and times
failures (at least 46)
https://bugs.launchpad.net/zorba/+bug/1123836
Bug #1154367 in Zorba: yearMonthDuration arithmetic bug
https://bugs.launchpad.net/zorba/+bug/1154367
For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752
More datetime/duration fixes.
--
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/core/arithmetic_impl.cpp'
--- src/runtime/core/arithmetic_impl.cpp 2013-04-01 21:52:20 +
+++ src/runtime/core/arithmetic_impl.cpp 2013-04-08 21:02:33 +
@@ -260,10 +260,16 @@
computestore::XS_DATETIME,store::XS_DATETIME
(result, dctx, tm, aLoc, n0, n1);
}
-else if (TypeOps::is_subtype(tm, *type1, *rtm.DURATION_TYPE_ONE ))
-{
- return Operation::template
- computestore::XS_DATETIME,store::XS_DURATION
+else if (TypeOps::is_subtype(tm, *type1, *rtm.YM_DURATION_TYPE_ONE ))
+{
+ return Operation::template
+ computestore::XS_DATETIME,store::XS_YM_DURATION
+(result, dctx, tm, aLoc, n0, n1);
+}
+else if (TypeOps::is_subtype(tm, *type1, *rtm.DT_DURATION_TYPE_ONE ))
+{
+ return Operation::template
+ computestore::XS_DATETIME,store::XS_DT_DURATION
(result, dctx, tm, aLoc, n0, n1);
}
}
@@ -275,10 +281,16 @@
computestore::XS_DATE,store::XS_DATE
(result, dctx, tm, aLoc, n0, n1);
}
-else if (TypeOps::is_subtype(tm, *type1, *rtm.DURATION_TYPE_ONE))
-{
- return Operation::template
- computestore::XS_DATE,store::XS_DURATION
+else if (TypeOps::is_subtype(tm, *type1, *rtm.YM_DURATION_TYPE_ONE))
+{
+ return Operation::template
+ computestore::XS_DATE,store::XS_YM_DURATION
+ (result, dctx, tm, aLoc, n0, n1);
+}
+else if (TypeOps::is_subtype(tm, *type1, *rtm.DT_DURATION_TYPE_ONE))
+{
+ return Operation::template
+ computestore::XS_DATE,store::XS_DT_DURATION
(result, dctx, tm, aLoc, n0, n1);
}
}
@@ -293,7 +305,7 @@
else if (TypeOps::is_subtype(tm, *type1, *rtm.DT_DURATION_TYPE_ONE))
{
return Operation::template
- computestore::XS_TIME,store::XS_DURATION
+ computestore::XS_TIME,store::XS_DT_DURATION
(result, dctx, tm, aLoc, n0, n1);
}
}
@@ -732,7 +744,10 @@
const store::Item* i0,
const store::Item* i1 )
{
- xs_decimal d = i0-getYearMonthDurationValue() / i1-getYearMonthDurationValue();
+ xs_yearMonthDuration otherYMDuration = i1-getYearMonthDurationValue();
+ if (otherYMDuration.isZero())
+throw XQUERY_EXCEPTION( err::FOAR0001, ERROR_LOC( loc ) );
+ xs_decimal d = i0-getYearMonthDurationValue() / otherYMDuration;
return GENV_ITEMFACTORY-createDecimal(result, d);
}
@@ -746,8 +761,10 @@
const store::Item* i0,
const store::Item* i1 )
{
- xs_decimal d = i0-getDayTimeDurationValue() / i1-getDayTimeDurationValue();
-
+ xs_dayTimeDuration otherDTDuration = i1-getDayTimeDurationValue();
+ if (otherDTDuration.isZero())
+ throw XQUERY_EXCEPTION( err::FOAR0001, ERROR_LOC(loc));
+ xs_decimal d = i0-getDayTimeDurationValue() / otherDTDuration;
return GENV_ITEMFACTORY-createDecimal(result, d);
}
=== modified file 'src/zorbatypes/datetime/duration.cpp'
--- src/zorbatypes/datetime/duration.cpp 2013-04-02 20:15:53 +
+++ src/zorbatypes/datetime/duration.cpp 2013-04-08 21:02:33 +
@@ -817,7 +817,9 @@
Decimal Duration::operator/(const Duration d) const
-{
+{
+ if (d.isZero())
+XQUERY_EXCEPTION(err::FOAR0001);
return Decimal( getTotalSeconds() ) / Decimal( d.getTotalSeconds() );
}
=== modified file 'test/fots/CMakeLists.txt'
--- test/fots/CMakeLists.txt 2013-04-08 19:49:28 +
+++ test/fots/CMakeLists.txt 2013-04-08 21:02:33 +
@@ -258,7 +258,6 @@
EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-053 0)
EXPECTED_FOTS_FAILURE (fn-unparsed-text-lines fn-unparsed-text-lines-054 0)
EXPECTED_FOTS_FAILURE (math-acos math-acos-003 0)
-EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes FOAR0001_9 0)
EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0046_13 0)
EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0046_14 0)
EXPECTED_FOTS_FAILURE (misc-CombinedErrorCodes XQST0085 0)
@@ -275,15 +274,6 @@
EXPECTED_FOTS_FAILURE (misc-Serialization
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs2-2013-04-08T21-02-54.335Z is finished. The final status was: 30 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-08T21-34-55.846Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue job bugs2-2013-04-08T21-34-55.846Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1, Needs Information 1, Resubmit 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/157752 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-06T08-21-50.205Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue job bugs2-2013-04-06T08-21-50.205Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-05T09-53-42.332Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs2-2013-04-05T09-53-42.332Z is finished. The final status was: 10 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-05T22-55-49.158Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs2-2013-04-05T22-55-49.158Z 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/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156732 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156732 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156732 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-03T06-44-58.934Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156732 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue job bugs2-2013-04-03T06-44-58.934Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156732 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156732 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156732 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs2 into lp:zorba.
Commit message:
date/time/durations castings now throw FODT0001 instead of FORG0001, as
required by the 3.0 spec.
Requested reviews:
Zorba Coders (zorba-coders)
Related bugs:
Bug #898792 in Zorba: xs:QName fails for non-literal input
https://bugs.launchpad.net/zorba/+bug/898792
Bug #931501 in Zorba: improve error message for fn:format-number
https://bugs.launchpad.net/zorba/+bug/931501
Bug #1154367 in Zorba: yearMonthDuration arithmetic bug
https://bugs.launchpad.net/zorba/+bug/1154367
For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766
date/time/durations castings now throw FODT0001 instead of FORG0001, as
required by the 3.0 spec.
--
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766
Your team Zorba Coders is requested to review the proposed merge of
lp:~nbrinza/zorba/bugs2 into lp:zorba.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-04-03 07:30:48 +
+++ src/diagnostics/diagnostic_en.xml 2013-04-03 08:29:30 +
@@ -1355,7 +1355,7 @@
comment
Overflow/underflow in date/time operation.
/comment
- valueoverflow/underflow in date/time operation/value
+ valueoverflow/underflow in date/time operation${: 1}/value
/diagnostic
diagnostic code=FODT0002
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2013-04-03 07:30:48 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2013-04-03 08:29:30 +
@@ -49,7 +49,7 @@
{ FODC0007, \$1\: base URI passed to fn:parse() is not a valid absolute URI },
{ FODF1280, \$1\: invalid decimal format name for fn:format-number() },
{ FODF1310, \$1\: invalid picture string for decimal/integer${: 2} },
- { FODT0001, overflow/underflow in date/time operation },
+ { FODT0001, overflow/underflow in date/time operation${: 1} },
{ FODT0002, overflow/underflow in duration operation${: 1} },
{ FODT0003, \$1\: invalid timezone value (in seconds) },
{ FOER, unidentifier error },
=== modified file 'src/types/casting.cpp'
--- src/types/casting.cpp 2013-03-26 20:23:10 +
+++ src/types/casting.cpp 2013-04-03 08:29:30 +
@@ -182,6 +182,36 @@
}
}
+void throwFODT0001Exception(const zstring str, const ErrorInfo info)
+{
+ if (info.theTargetType)
+ {
+RAISE_ERROR(err::FODT0001, info.theLoc,
+ERROR_PARAMS(ZED(FORG0001_NoCastTo_234),
+ str,
+ info.theSourceType-toSchemaString(),
+ info.theTargetType-toSchemaString()));
+ }
+ else
+ {
+TypeManager tm = GENV_TYPESYSTEM;
+
+xqtref_t sourceType =
+tm.create_builtin_atomic_type(info.theSourceTypeCode,
+ TypeConstants::QUANT_ONE);
+
+xqtref_t targetType =
+tm.create_builtin_atomic_type(info.theTargetTypeCode,
+ TypeConstants::QUANT_ONE);
+
+RAISE_ERROR(err::FODT0001, info.theLoc,
+ERROR_PARAMS(ZED(FORG0001_NoCastTo_234),
+ str,
+ sourceType-toSchemaString(),
+ targetType-toSchemaString()));
+ }
+}
+
/***
Identity casting functions: target type is the same as the source one, so no
@@ -343,7 +373,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -358,7 +388,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -373,7 +403,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -386,7 +416,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -400,7 +430,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -413,7 +443,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -426,7 +456,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -439,7 +469,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -452,7 +482,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -465,7 +495,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -478,7 +508,7 @@
return;
}
- throwFORG0001Exception(strval, errInfo);
+ throwFODT0001Exception(strval, errInfo);
}
@@ -491,7 +521,7 @@
return;
}
-
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Commit Message changed to: date/time/durations castings now throw FODT0001 instead of FORG0001, as required by the 3.0 spec. For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/bugs2 into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/bugs2 into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-03T08-29-48.728Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/bugs2 into lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs2-2013-04-03T08-29-48.728Z is finished. The final status was: 4 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Commit Message changed to: overflows in date/time casts now return FODT0001 and in durations return FODT0002. For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Description changed to: overflows in date/time casts now return FODT0001 and in durations return FODT0002. For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-03T09-35-49.921Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs2-2013-04-03T09-35-49.921Z 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/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-03T10-22-47.232Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue job bugs2-2013-04-03T10-22-47.232Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 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/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-03T10-56-48.369Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs2-2013-04-03T10-56-48.369Z is finished. The final status was: 12 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-03T11-26-47.622Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs2-2013-04-03T11-26-47.622Z is finished. The final status was: 11 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156766 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs2 into lp:zorba. Commit message: overflows in date/time casts now return FODT0001 and in durations return FODT0002. Requested reviews: Nicolae Brinza (nbrinza) Chris Hillery (ceejatec) Related bugs: Bug #898792 in Zorba: xs:QName fails for non-literal input https://bugs.launchpad.net/zorba/+bug/898792 Bug #931501 in Zorba: improve error message for fn:format-number https://bugs.launchpad.net/zorba/+bug/931501 Bug #1123836 in Zorba: arithmetic operators on durations, dates and times failures (at least 48) https://bugs.launchpad.net/zorba/+bug/1123836 Bug #1154367 in Zorba: yearMonthDuration arithmetic bug https://bugs.launchpad.net/zorba/+bug/1154367 For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 overflows in date/time casts now return FODT0001 and in durations return FODT0002. -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2013-04-02 21:46:56 + +++ ChangeLog 2013-04-03 11:52:23 + @@ -36,6 +36,7 @@ * Extented index join rule to general flwor expressions. Bug Fixes/Other Changes: + * Fixed bug #1123836 (overflows in date/time casts now return FODT0001 and in durations return FODT0002) * Fixed bug #1114228 (unrecognized options in the XQuery namespace now raise an error) * Fixed bug #1124273 (xqdoc crash because of annotation literals) * Fixed bug #867027 (XQST0059 error messages inconsistent) === modified file 'test/fots/CMakeLists.txt' --- test/fots/CMakeLists.txt 2013-04-03 09:15:15 + +++ test/fots/CMakeLists.txt 2013-04-03 11:52:23 + @@ -300,8 +300,6 @@ EXPECTED_FOTS_FAILURE (misc-Serialization K2-Serialization-11 0) EXPECTED_FOTS_FAILURE (misc-XMLEdition XML10-4ed-Excluded-char-1 0) EXPECTED_FOTS_FAILURE (misc-XMLEdition XML11-1ed-Included-char-1 0) -EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-date cbcl-add-dayTimeDuration-to-date-003 0) -EXPECTED_FOTS_FAILURE (op-add-dayTimeDuration-to-dateTime cbcl-add-dayTimeDuration-to-dateTime-003 0) EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-002 0) EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-004 0) EXPECTED_FOTS_FAILURE (op-add-dayTimeDurations cbcl-plus-006 0) @@ -313,23 +311,12 @@ EXPECTED_FOTS_FAILURE (op-date-less-than cbcl-date-ge-001 0) EXPECTED_FOTS_FAILURE (op-date-less-than cbcl-date-lt-001 0) EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration-by-dayTimeDuration cbcl-divide-dayTimeDuration-by-dayTimeDuration-001 0) -EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration-by-dayTimeDuration cbcl-divide-dayTimeDuration-by-dayTimeDuration-002 0) EXPECTED_FOTS_FAILURE (op-divide-dayTimeDuration-by-dayTimeDuration cbcl-divide-dayTimeDuration-by-dayTimeDuration-003 0) EXPECTED_FOTS_FAILURE (op-divide-yearMonthDuration-by-yearMonthDuration cbcl-divide-yearMonthDuration-by-yearMonthDuration-001 0) -EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-001 0) -EXPECTED_FOTS_FAILURE (op-subtract-dateTimes cbcl-subtract-dateTimes-002 0) -EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-001 0) -EXPECTED_FOTS_FAILURE (op-subtract-dates cbcl-subtract-dates-002 0) -EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-date cbcl-subtract-dayTimeDuration-from-date-002 0) -EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDuration-from-dateTime cbcl-subtract-dayTimeDuration-from-dateTime-002 0) -EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-subtract-dayTimeDurations-003 0) EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-minus-002 0) EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-minus-004 0) EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-minus-006 0) EXPECTED_FOTS_FAILURE (op-subtract-dayTimeDurations cbcl-minus-008 0) -EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-date cbcl-subtract-yearMonthDuration-from-date-002 0) -EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDuration-from-dateTime cbcl-subtract-yearMonthDuration-from-dateTime-002 0) -EXPECTED_FOTS_FAILURE (op-subtract-yearMonthDurations cbcl-subtract-yearMonthDurations-003 0) EXPECTED_FOTS_FAILURE (prod-AllowingEmpty outer-013 0) EXPECTED_FOTS_FAILURE (prod-Annotation annotation-3 0) EXPECTED_FOTS_FAILURE (prod-Annotation annotation-26 0) -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Commit Message changed to: overflows in date/time casts now return FODT0001 and in durations return FODT0002. For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-03T11-52-48.138Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs2-2013-04-03T11-52-48.138Z is finished. The final status was: 11 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-03T13-32-51.099Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs2-2013-04-03T13-32-51.099Z is finished. The final status was: 11 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs2-2013-04-03T15-55-50.177Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs2 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs2-2013-04-03T15-55-50.177Z is finished. The final status was: 11 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156818 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The TRY_XS_INT_CONVERT should probably be more like:
#define TRY_XS_INT_CONVERT(target, value, xs_type)
\
{
\
XS_TYPE const res( value );
\
try {
\
target = to_xs_int(res);
\
} catch (std::range_error const) {
\
throw XQUERY_EXCEPTION(err::FODT0002,
ERROR_PARAMS(res.toString())); \
}
\
}
--
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/155778
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
No, I believe the construction of res and the conversion will be useless in the most common case where the error does not happen. But I've copy pasted your suggestion anyway. -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/155778 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs2 into lp:zorba.
Requested reviews:
Nicolae Brinza (nbrinza)
Chris Hillery (ceejatec)
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #898792 in Zorba: xs:QName fails for non-literal input
https://bugs.launchpad.net/zorba/+bug/898792
Bug #931501 in Zorba: improve error message for fn:format-number
https://bugs.launchpad.net/zorba/+bug/931501
Bug #1154367 in Zorba: yearMonthDuration arithmetic bug
https://bugs.launchpad.net/zorba/+bug/1154367
For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156674
Fixed the duration arithemtic bug.
Added missing testcases for HoF bugs.
--
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156674
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-04-01 02:22:49 +
+++ src/diagnostics/diagnostic_en.xml 2013-04-02 20:21:25 +
@@ -1355,7 +1355,7 @@
comment
Overflow/underflow in duration operation.
/comment
- valueoverflow/underflow in duration operation/value
+ valueoverflow/underflow in duration operation${: 1}/value
/diagnostic
diagnostic code=FODT0003
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2013-04-01 02:22:49 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2013-04-02 20:21:25 +
@@ -50,7 +50,7 @@
{ FODF1280, \$1\: invalid decimal format name for fn:format-number() },
{ FODF1310, \$1\: invalid picture string for decimal/integer${: 2} },
{ FODT0001, overflow/underflow in date/time operation },
- { FODT0002, overflow/underflow in duration operation },
+ { FODT0002, overflow/underflow in duration operation${: 1} },
{ FODT0003, \$1\: invalid timezone value (in seconds) },
{ FOER, unidentifier error },
{ FOFD1340, \$1\: invalid picture string for date/time${: 2} },
=== modified file 'src/runtime/core/arithmetic_impl.cpp'
--- src/runtime/core/arithmetic_impl.cpp 2013-03-20 19:12:54 +
+++ src/runtime/core/arithmetic_impl.cpp 2013-04-02 20:21:25 +
@@ -596,8 +596,12 @@
throw XQUERY_EXCEPTION( err::FODT0002, ERROR_LOC( loc ) );
else if (i1-getDoubleValue().isNaN())
throw XQUERY_EXCEPTION( err::FOCA0005, ERROR_LOC( loc ) );
- else
+ else try {
d.reset(i0-getYearMonthDurationValue() * (i1-getDoubleValue()));
+ } catch (XQueryException e) {
+set_source(e, *loc);
+throw;
+ }
return GENV_ITEMFACTORY-createYearMonthDuration(result, d.get());
}
@@ -618,8 +622,12 @@
throw XQUERY_EXCEPTION( err::FODT0002, ERROR_LOC( loc ) );
else if (i1-getDoubleValue().isNaN())
throw XQUERY_EXCEPTION( err::FOCA0005, ERROR_LOC( loc ) );
- else
+ else try {
d.reset(i0-getDayTimeDurationValue() * (i1-getDoubleValue()));
+ } catch (XQueryException e) {
+set_source(e, *loc);
+throw;
+ }
return GENV_ITEMFACTORY-createDayTimeDuration(result, d.get());
}
@@ -674,8 +682,12 @@
throw XQUERY_EXCEPTION( err::FODT0002, ERROR_LOC( loc ) );
else if ( i1-getDoubleValue().isNaN() )
throw XQUERY_EXCEPTION( err::FOCA0005, ERROR_LOC( loc ) );
- else
+ else try {
d = std::auto_ptrDuration(i0-getYearMonthDurationValue() / i1-getDoubleValue());
+ } catch (XQueryException e) {
+set_source(e, *loc);
+throw;
+ }
return GENV_ITEMFACTORY-createYearMonthDuration(result, d.get());
}
@@ -700,8 +712,12 @@
throw XQUERY_EXCEPTION( err::FODT0002, ERROR_LOC( loc ) );
else if ( i1-getDoubleValue().isNaN() )
throw XQUERY_EXCEPTION( err::FOCA0005, ERROR_LOC( loc ) );
- else
+ else try {
d.reset(i0-getDayTimeDurationValue() / i1-getDoubleValue());
+ } catch (XQueryException e) {
+set_source(e, *loc);
+throw;
+ }
return GENV_ITEMFACTORY-createDayTimeDuration(result, d.get());
}
=== modified file 'src/zorbatypes/datetime/duration.cpp'
--- src/zorbatypes/datetime/duration.cpp 2013-03-11 15:00:50 +
+++ src/zorbatypes/datetime/duration.cpp 2013-04-02 20:21:25 +
@@ -41,6 +41,7 @@
0, 12, 30, 24, 60, 60, Duration::FRAC_SECONDS_UPPER_LIMIT
};
+static const long seconds_per_year = 60 * 60 * 24 * 30 * 12;
/**
Parse a 'nS' string, with fractional seconds, returns 0 on success and a
@@ -725,12 +726,24 @@
}
+#define TRY_XS_INT_CONVERT(target, value, xs_type) \
+ {\
+xs_type const res(value); \
+try { \
+ target = to_xs_int(res); \
+} catch (std::range_error const) {\
+ throw XQUERY_EXCEPTION(err::FODT0002, ERROR_PARAMS(res.toString())); \
+}
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156674 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs2 into lp:zorba has been updated. Commit Message changed to: Fixed the duration arithemtic bug. Added missing testcases for HoF bugs. For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156674 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156674 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in test/fots/CMakeLists.txt -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156674 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156674 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
