[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1111786 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-786 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Validation queue job bug-786-2013-02-09T01-38-50.87Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-786-2013-02-09T01-38-50.87Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-786 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Review: Needs Fixing The code is good. However, the documentation of the variables should be added to doc/zorba/errors_warnings.dox (there is already a section that describes other available variables). -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
I think we can make this a separate item. On Feb 7, 2013, at 6:35 AM, Paul J. Lucas wrote: > Do I have to add the file-name to streamable strings for this? > -- > https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 > You are reviewing the proposed merge of lp:~zorba-coders/zorba/bug-786 > into lp:zorba. -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Do I have to add the file-name to streamable strings for this? -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Review: Needs Fixing There are no tests -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-786 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve. -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Validation queue job bug-786-2013-02-07T04-42-25.453Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-786-2013-02-07T04-42-25.453Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-786 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-786 into lp:zorba has been updated. Description changed to: Added $zerr:data-uri, $zerr:data-line-number, and $zerr:data-column-number. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-786 into lp:zorba has been updated. Commit Message changed to: Added $zerr:data-uri, $zerr:data-line-number, and $zerr:data-column-number. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-1111786 into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/bug-786 into lp:zorba. Commit message: Added $zerr:data-module, $zerr:data-line-number, and $zerr:data-column-number. Requested reviews: Paul J. Lucas (paul-lucas) Related bugs: Bug #786 in Zorba: "xml/json parse error location in catch clause" https://bugs.launchpad.net/zorba/+bug/786 For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Added $zerr:data-module, $zerr:data-line-number, and $zerr:data-column-number. -- https://code.launchpad.net/~zorba-coders/zorba/bug-786/+merge/147020 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'ChangeLog' --- ChangeLog 2013-02-03 17:44:39 + +++ ChangeLog 2013-02-07 04:33:25 + @@ -16,6 +16,7 @@ Bug Fixes/Other Changes: * Fixed bug #1095889 (Improve error message for xml-parsing error). + * Fixed bug #786 (xml/json parse error location in catch clause). * NaN items are considered equal to each other during grouping * Fixed bug #855481 (Too small time types on Windows). === modified file 'include/zorba/internal/diagnostic.h' --- include/zorba/internal/diagnostic.h 2013-01-24 04:23:25 + +++ include/zorba/internal/diagnostic.h 2013-02-07 04:33:25 + @@ -200,10 +200,34 @@ line_type line_end_; column_type column_end_; + friend bool operator==( location const&, location const& ); + // for plan serialization friend void serialization::operator&( serialization::Archiver&, location& ); }; +/** + * \internal + * Compares two locations for equality. + * + * @param i The first location. + * @param j The second location. + * @return Returns \c true only if the two locations are equal. + */ +bool operator==( location const &i, location const &j ); + +/** + * \internal + * Compares two locations for inequality. + * + * @param i The first location. + * @param j The second location. + * @return Returns \c true only if the two locations are not equal. + */ +inline bool operator!=( location const &i, location const &j ) { + return !(i == j); +} + /// /** === modified file 'include/zorba/xquery_exception.h' --- include/zorba/xquery_exception.h 2012-12-20 19:37:19 + +++ include/zorba/xquery_exception.h 2013-02-07 04:33:25 + @@ -138,6 +138,77 @@ return source_loc_.column_end(); } + // data file/line location // + + /** + * Checks whether the XQuery data location has been set. + * + * @return Returns \c true only if the data location has been set. + */ + bool has_data() const throw() { +return data_loc_; + } + + /** + * Sets the XQuery source-code data URI name, line, and column numbers. + * + * @param uri The source-code data URI name. Must not be null. + * @param line The source-code data URI line number. + * @param column The source-code data URI column number. + * @param line_end The source-code data URI end line number. + * @param column_end The source-code data URI end column number. + */ + void set_data( char const *uri, + line_type line, + column_type column = 0, + line_type line_end = 0, + column_type column_end = 0 ); + + /** + * Gets the data URI containing the error. + * + * @return Returns said URI or the empty string if unset. + */ + char const* data_uri() const throw() { +return data_loc_.file(); + } + + /** + * Gets the data line number containing the error. + * + * @return Returns said line number or 0 if unset. + */ + line_type data_line() const throw() { +return data_loc_.line(); + } + + /** + * Gets the data column number containing the error. + * + * @return Returns said column number or 0 if unset. + */ + column_type data_column() const throw() { +return data_loc_.column(); + } + + /** + * Gets the data end line number containing the error. + * + * @return Returns said line number or 0 if unset. + */ + line_type data_line_end() const throw() { +return data_loc_.line_end(); + } + + /** + * Gets the data end column number containing the error. + * + * @return Returns said column number or 0 if unset. + */ + column_type data_column_end() const throw() { +return data_loc_.column_end(); + } + // "applied at" file/line location // /** @@ -287,6 +358,7 @@ line_type raise_line, char const *message ); location source_loc_; + location data_loc_; location applied_loc_; XQueryStackTrace query_trace_; @@ -305,6 +377,9 @@ friend void set_applied( ZorbaException&, char const*, line_type, column_type, line_type, column_type, bool ); + friend void set_data( ZorbaException&, char const*, line_type, column_type, +line_type, column