[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fixes_FOTS_driver_29_MAR-2013-04-02T08-36-45.465Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver_29_MAR/+merge/156109 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR 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 fixes_FOTS_driver_29_MAR-2013-04-02T08-36-45.465Z is finished. The final status was: 2 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver_29_MAR/+merge/156109 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver_29_MAR/+merge/156109 -- https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver_29_MAR/+merge/156109 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1133260 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1133260 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1133260 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1133260 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1133260-2013-04-02T16-20-51.449Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1133260 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1133260 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 bug-1133260-2013-04-02T16-20-51.449Z is finished. The final status was: 2 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1133260 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1133260 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1133260 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1133260 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver_29_MAR/+merge/156109 -- https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver_29_MAR/+merge/156109 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1133260 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1133260-2013-04-02T17-41-53.452Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1133260 into lp:zorba
Validation queue job bug-1133260-2013-04-02T17-41-53.452Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1133260 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1133260 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1133260/+merge/155878 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fixes_FOTS_driver_29_MAR-2013-04-02T18-06-54.471Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver_29_MAR/+merge/156109 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR into lp:zorba
Validation queue job fixes_FOTS_driver_29_MAR-2013-04-02T18-06-54.471Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver_29_MAR/+merge/156109 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fixes_FOTS_driver_29_MAR into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver_29_MAR/+merge/156109 -- https://code.launchpad.net/~zorba-coders/zorba/fixes_FOTS_driver_29_MAR/+merge/156109 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:~zorba-coders/zorba/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1147563-2013-04-02T21-06-57.343Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 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:~zorba-coders/zorba/bug1147563 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1147563 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 bug1147563-2013-04-02T21-06-57.343Z 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/~zorba-coders/zorba/bug1147563/+merge/153485 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 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
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs2 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs2 into lp:zorba.
Commit message:
Fixed the duration arithemtic bug.
Added missing testcases for HoF bugs.
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/156698
Fixed the duration arithemtic bug.
Added missing testcases for HoF bugs.
--
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156698
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 21:40:33 +
@@ -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 21:40:33 +
@@ -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 21:40:33 +
@@ -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 21:40:33 +
@@ -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) {\
+
[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/156698 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156698 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/156698 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/156698 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156698 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-02T21-42-03.655Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156698 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
BTW: You don't have to keep creating new merge proposals every time you want to merge even when there are errors or merge conflicts. This way, you don't need to seek our approval multiple times. A single merge proposal is all you need. -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156698 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/156698 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs3 into lp:zorba.
Commit message:
Unrecognized options in the XQuery namespace now raise an error, fixes
K-OptionDeclarationProlog-1b
Requested reviews:
Nicolae Brinza (nbrinza)
Chris Hillery (ceejatec)
Related bugs:
Bug #1114228 in Zorba: prod-OptionDecl failure
https://bugs.launchpad.net/zorba/+bug/1114228
For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703
Unrecognized options in the XQuery namespace now raise an error, fixes
K-OptionDeclarationProlog-1b
--
https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-04-01 02:48:23 +
+++ ChangeLog 2013-04-02 21:49:23 +
@@ -36,6 +36,7 @@
* Extented index join rule to general flwor expressions.
Bug Fixes/Other Changes:
+ * Fixed bug #1114228 (unrecognized options in the XQuery namespace now raise an error)
* Fixed bug #1124273 (xqdoc crash because of annotation literals)
* Fixed bug #867027 (XQST0059 error messages inconsistent)
* Fixed bug #1095889 (Improve error message for xml-parsing error).
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-03-28 05:32:59 +
+++ include/zorba/pregenerated/diagnostic_list.h 2013-04-02 21:49:23 +
@@ -158,6 +158,8 @@
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0111;
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0123;
+
extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0002;
extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0050;
=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq 2013-03-28 05:32:59 +
+++ modules/w3c/pregenerated/xqt-errors.xq 2013-04-02 21:49:23 +
@@ -674,6 +674,14 @@
(:~
:
+ : It is a static error if the name of a feature in require-feature is not recognized by the implementation.
+ :
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0123 as xs:QName := fn:QName($err:NS, err:XQST0123);
+
+(:~
+ :
: It is a dynamic error if evaluation of an expression relies on some part
: of the dynamic context that has not been assigned a value.
:
=== modified file 'src/compiler/parser/xquery_scanner.l'
--- src/compiler/parser/xquery_scanner.l 2013-03-18 18:10:14 +
+++ src/compiler/parser/xquery_scanner.l 2013-04-02 21:49:23 +
@@ -295,7 +295,9 @@
|
| Entity definitions
|__*/
-CharRef #([0-9]+|x([0-9]|[a-f]|[A-F])+);
+ // CharRef #([0-9]+|x([0-9]|[a-f]|[A-F])+);
+
+CharRef #([1-9][0-9]*|x(([1-9]|[a-f]|[A-F])([0-9]|[a-f]|[A-F])*));
PredefinedEntityRef (lt|gt|amp|quot|apos|nbsp);
Ref {CharRef}|{PredefinedEntityRef}
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-03-27 12:40:41 +
+++ src/compiler/translator/translator.cpp 2013-04-02 21:49:23 +
@@ -3525,7 +3525,7 @@
{
theSctx-expand_qname(
qnameItem,
- static_context::XQUERY_OPTION_NS,
+ static_context::XQUERY_NS,
,
lQName-get_localname(),
lQName-get_location());
@@ -3539,6 +3539,14 @@
}
}
+ if (qnameItem-getNamespace() == static_context::XQUERY_NS
+
+ qnameItem-getLocalName() != require-feature
+
+ qnameItem-getLocalName() != prohibit-feature)
+ {
+RAISE_ERROR(err::XQST0123, loc, ERROR_PARAMS(ZED(UnrecognizedXQueryOption), qnameItem-getLocalName()));
+ }
if (qnameItem-getNamespace() == static_context::ZORBA_OPTION_FEATURE_NS
value == http-uri-resolution)
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2013-03-22 00:49:51 +
+++ src/context/static_context.cpp 2013-04-02 21:49:23 +
@@ -512,6 +512,10 @@
http://www.zorba-xquery.com/options/optimizer;;
const char*
+static_context::XQUERY_NS =
+http://www.w3.org/2012/xquery;;
+
+const char*
static_context::XQUERY_OPTION_NS =
http://www.w3.org/2011/xquery-options;;
=== modified file 'src/context/static_context.h'
--- src/context/static_context.h 2013-03-22 00:49:51 +
+++ src/context/static_context.h 2013-04-02 21:49:23 +
@@ -567,7 +567,8 @@
static const char* ZORBA_OPTION_WARN_NS;
static const char* ZORBA_OPTION_FEATURE_NS;
static const char* ZORBA_OPTION_OPTIM_NS;
- static const char* XQUERY_OPTION_NS;
+ static const char* XQUERY_NS; // http://www.w3.org/2012/xquery
+ static const char* XQUERY_OPTION_NS; // http://www.w3.org/2011/xquery-options
static const char* ZORBA_VERSIONING_NS;
protected:
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-04-01 02:22:49 +
+++
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/update_format_integer_settings into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/update_format_integer_settings/+merge/156702 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Commit Message changed to: Unrecognized options in the XQuery namespace now raise an error, fixes K-OptionDeclarationProlog-1b For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update_format_integer_settings into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/update_format_integer_settings into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update_format_integer_settings/+merge/156702 -- https://code.launchpad.net/~zorba-coders/zorba/update_format_integer_settings/+merge/156702 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1130998 into lp:zorba
You will also have to update jsoniq_scanner.l file with the changes that you did, but be careful not to change anything else. Do not copy over the entire file, just the changes. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700 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/156698 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156698 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-02T21-42-03.655Z is finished. The final status was: 5 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/156698 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs3-2013-04-02T22-04-43.127Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The attempt to merge lp:~nbrinza/zorba/bugs3 into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job bugs3-2013-04-02T22-04-43.127Z is finished. The final status was: 13 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update_format_integer_settings into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/update_format_integer_settings-2013-04-02T22-33-40.069Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/update_format_integer_settings/+merge/156702 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update_format_integer_settings into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/update_format_integer_settings into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/update_format_integer_settings/+merge/156702 -- https://code.launchpad.net/~zorba-coders/zorba/update_format_integer_settings/+merge/156702 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/fix_bug_1028879
into lp:zorba.
Commit message:
Corrected signature for fn:collection.
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #1028879 in Zorba: fn:collection(()) bug
https://bugs.launchpad.net/zorba/+bug/1028879
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718
Corrected signature for fn:collection.
--
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/functions/pregenerated/func_collections.cpp'
--- src/functions/pregenerated/func_collections.cpp 2013-03-05 23:11:50 +
+++ src/functions/pregenerated/func_collections.cpp 2013-04-02 22:57:25 +
@@ -320,7 +320,7 @@
{
DECL_WITH_KIND(sctx, fn_collection,
(createQName(http://www.w3.org/2005/xpath-functions,,collection;),
-GENV_TYPESYSTEM.STRING_TYPE_ONE,
+GENV_TYPESYSTEM.STRING_TYPE_QUESTION,
GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR),
FunctionConsts::FN_COLLECTION_1);
=== modified file 'src/runtime/spec/collections/collections.xml'
--- src/runtime/spec/collections/collections.xml 2013-03-24 20:40:03 +
+++ src/runtime/spec/collections/collections.xml 2013-04-02 22:57:25 +
@@ -212,7 +212,7 @@
/zorba:signature
zorba:signature localname=collection prefix=fn
-zorba:paramxs:string/zorba:param
+zorba:paramxs:string?/zorba:param
zorba:outputnode()*/zorba:output
/zorba:signature
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/update_format_integer_settings into lp:zorba
Validation queue job update_format_integer_settings-2013-04-02T22-33-40.069Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/update_format_integer_settings/+merge/156702 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1156249-minusZero 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 bug1156249-minusZero-2013-04-02T22-56-38.875Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1028879-2013-04-02T23-08-39.715Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/update_format_integer_settings into lp:zorba
Review: Needs Fixing Why is calendar CB set to true? Zorba doesn't support that calendar. Right now, we support only AD and ISO. -- https://code.launchpad.net/~zorba-coders/zorba/update_format_integer_settings/+merge/156702 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
Validation queue job fix_bug_1028879-2013-04-02T23-08-39.715Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 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/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1130998 into lp:zorba
I followed Nicolae's suggestions but still I get the same problems. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1130998 into lp:zorba
Have you merged the trunk? That's the more likely cause of merge conflicts. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1156249-minusZero-2013-04-02T23-51-42.258Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/update_format_integer_settings into lp:zorba
Why is calendar CB set to true? Zorba doesn't support that calendar. Right now, we support only AD and ISO. Fixed: please note that there are 2 additional failures because the test cases are wrong in FOTS: https://www.w3.org/Bugs/Public/show_bug.cgi?id=21558 -- https://code.launchpad.net/~zorba-coders/zorba/update_format_integer_settings/+merge/156702 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1156249-minusZero 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 bug1156249-minusZero-2013-04-02T23-51-42.258Z is finished. The final status was: 5 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1156249-minusZero into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 -- https://code.launchpad.net/~zorba-coders/zorba/bug1156249-minusZero/+merge/155599 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1130998 into lp:zorba
Review: Needs Fixing
Unfortunately this fix isn't in the right place. By changing the CharRef
regexp, you've broken some valid XML character references like #032;. Also,
the error message for #0; is not very good.
Nicolae - can you help point us in the right direction here? There is already
code in xquery_scanner.l and jsoniq_scanner.l that verifies character
references in string literals:
{StringLiteral} { if (checkXmlRefs(yylval-err, yytext, yyleng,
this, yylloc)) return token::UNRECOGNIZED; TRY_STRING_LITERAL(STRING_LITERAL,
yytext, yyleng); }
However, same check also needs to be done anywhere else that may have character
references, including element content and attribute values. But we don't know
enough about flex/bison to understand how to get this done.
If possible I'd still like Luis to do the actual change, if only to help spread
some knowledge about the lexer/parser to other team members. But if you could
briefly describe what kind of change needs to happen, we'd appreciate it!
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1130998/+merge/156700
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-xqdoc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-xqdoc into lp:zorba has been updated. Commit Message changed to: New and improved XQDoc. Each module is completely decoupled from one to another and therefore more reusable. This will enable more people like 28msec to reuse this components and improve their maturity. As an example, the HTML generation, the navigation generation, and the batch processing are completely decoupled. Moreover, the schema and example resolution now is more modular for the Zorba and 28msec website. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-xqdoc-2013-04-03T02-21-16.393Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/xpath_doc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/156726 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/new-xqdoc. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xpath_doc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xpath_doc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/156726 -- https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/156726 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/new-xqdoc. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/new-xqdoc 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 new-xqdoc-2013-04-03T02-21-16.393Z is finished. The final status was: 5 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-xqdoc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/xpath_doc into lp:zorba
The prerequisite lp:~zorba-coders/zorba/new-xqdoc has not yet been merged into lp:zorba. -- https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/156726 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/new-xqdoc. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xpath_doc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xpath_doc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/156726 -- https://code.launchpad.net/~zorba-coders/zorba/xpath_doc/+merge/156726 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/new-xqdoc. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-xqdoc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/new-xqdoc-2013-04-03T03-03-11.265Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
Validation queue job new-xqdoc-2013-04-03T03-03-11.265Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc 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, 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-xqdoc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/127663 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/156731 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/156698 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156698 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/156698 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/156698 -- https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156698 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_bug_1028879-2013-04-03T03-38-37.387Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-xqdoc into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/new-xqdoc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/156731 -- https://code.launchpad.net/~zorba-coders/zorba/new-xqdoc/+merge/156731 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:
Fixed the duration arithemtic bug.
Added missing testcases for HoF bugs.
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/156732
Fixed the duration arithemtic bug.
Added missing testcases for HoF bugs.
--
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/156732
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-03 03:40:32 +
@@ -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-03 03:40:32 +
@@ -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-03 03:40:32 +
@@ -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-03 03:40:32 +
@@ -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) {\
+
[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/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
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/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156703 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
Validation queue job fix_bug_1028879-2013-04-03T03-38-37.387Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix_bug_1028879 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1028879/+merge/156718 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs3 into lp:zorba.
Commit message:
Unrecognized options in the XQuery namespace now raise an error, fixes
K-OptionDeclarationProlog-1b
Requested reviews:
Nicolae Brinza (nbrinza)
Chris Hillery (ceejatec)
Related bugs:
Bug #1114228 in Zorba: prod-OptionDecl failure
https://bugs.launchpad.net/zorba/+bug/1114228
For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734
Unrecognized options in the XQuery namespace now raise an error, fixes
K-OptionDeclarationProlog-1b
--
https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-04-01 02:48:23 +
+++ ChangeLog 2013-04-03 04:02:29 +
@@ -36,6 +36,7 @@
* Extented index join rule to general flwor expressions.
Bug Fixes/Other Changes:
+ * Fixed bug #1114228 (unrecognized options in the XQuery namespace now raise an error)
* Fixed bug #1124273 (xqdoc crash because of annotation literals)
* Fixed bug #867027 (XQST0059 error messages inconsistent)
* Fixed bug #1095889 (Improve error message for xml-parsing error).
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2013-03-28 05:32:59 +
+++ include/zorba/pregenerated/diagnostic_list.h 2013-04-03 04:02:29 +
@@ -158,6 +158,8 @@
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0111;
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0123;
+
extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0002;
extern ZORBA_DLL_PUBLIC XQueryErrorCode XPDY0050;
=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq 2013-03-28 05:32:59 +
+++ modules/w3c/pregenerated/xqt-errors.xq 2013-04-03 04:02:29 +
@@ -674,6 +674,14 @@
(:~
:
+ : It is a static error if the name of a feature in require-feature is not recognized by the implementation.
+ :
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0123 as xs:QName := fn:QName($err:NS, err:XQST0123);
+
+(:~
+ :
: It is a dynamic error if evaluation of an expression relies on some part
: of the dynamic context that has not been assigned a value.
:
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2013-03-27 12:40:41 +
+++ src/compiler/translator/translator.cpp 2013-04-03 04:02:29 +
@@ -3525,7 +3525,7 @@
{
theSctx-expand_qname(
qnameItem,
- static_context::XQUERY_OPTION_NS,
+ static_context::XQUERY_NS,
,
lQName-get_localname(),
lQName-get_location());
@@ -3539,6 +3539,14 @@
}
}
+ if (qnameItem-getNamespace() == static_context::XQUERY_NS
+
+ qnameItem-getLocalName() != require-feature
+
+ qnameItem-getLocalName() != prohibit-feature)
+ {
+RAISE_ERROR(err::XQST0123, loc, ERROR_PARAMS(ZED(UnrecognizedXQueryOption), qnameItem-getLocalName()));
+ }
if (qnameItem-getNamespace() == static_context::ZORBA_OPTION_FEATURE_NS
value == http-uri-resolution)
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2013-03-22 00:49:51 +
+++ src/context/static_context.cpp 2013-04-03 04:02:29 +
@@ -512,6 +512,10 @@
http://www.zorba-xquery.com/options/optimizer;;
const char*
+static_context::XQUERY_NS =
+http://www.w3.org/2012/xquery;;
+
+const char*
static_context::XQUERY_OPTION_NS =
http://www.w3.org/2011/xquery-options;;
=== modified file 'src/context/static_context.h'
--- src/context/static_context.h 2013-03-22 00:49:51 +
+++ src/context/static_context.h 2013-04-03 04:02:29 +
@@ -567,7 +567,8 @@
static const char* ZORBA_OPTION_WARN_NS;
static const char* ZORBA_OPTION_FEATURE_NS;
static const char* ZORBA_OPTION_OPTIM_NS;
- static const char* XQUERY_OPTION_NS;
+ static const char* XQUERY_NS; // http://www.w3.org/2012/xquery
+ static const char* XQUERY_OPTION_NS; // http://www.w3.org/2011/xquery-options
static const char* ZORBA_VERSIONING_NS;
protected:
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2013-04-01 02:22:49 +
+++ src/diagnostics/diagnostic_en.xml 2013-04-03 04:02:29 +
@@ -814,6 +814,13 @@
value$1/value
/diagnostic
+diagnostic code=XQST0123
+ comment
+ It is a static error if the name of a feature in require-feature is not recognized by the implementation.
+ /comment
+ value$1/value
+/diagnostic
+
diagnostic code=XPDY0002
comment
It is a dynamic error if evaluation of an expression relies on some part
@@ -5007,6 +5014,10 @@
value$5: duplicate attribute enumeration value token/value
/entry
+entry key=UnrecognizedXQueryOption
+ value$2: unrecognized
[Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
The proposal to merge lp:~nbrinza/zorba/bugs3 into lp:zorba has been updated. Commit Message changed to: Unrecognized options in the XQuery namespace now raise an error, fixes K-OptionDeclarationProlog-1b For more details, see: https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/bugs3 into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/bugs3/+merge/156734 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
