Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

Proposed by Paul J. Lucas
Status: Merged
Approved by: Matthias Brantner
Approved revision: 11207
Merged at revision: 11446
Proposed branch: lp:~paul-lucas/zorba/pjl-misc
Merge into: lp:zorba
Diff against target: 12 lines (+1/-1)
1 file modified
src/compiler/parser/symbol_table.cpp (+1/-1)
To merge this branch: bzr merge lp:~paul-lucas/zorba/pjl-misc
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Paul J. Lucas Approve
Review via email: mp+163196@code.launchpad.net

Commit message

Fixed exception caught since it changed. Also fixes error code returned for some tests.

Description of the change

Fixed exception caught since it changed. Also fixes error code returned for some tests.

To post a comment you must log in.
Revision history for this message
Paul J. Lucas (paul-lucas) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) wrote :

It looks like this problem could exist all over the place. Could you please do a grep and check whether that's true?

review: Needs Information
Revision history for this message
Paul J. Lucas (paul-lucas) wrote :

I already did.

Revision history for this message
Matthias Brantner (matthias-brantner) wrote :

> I already did.
And?

Revision history for this message
Paul J. Lucas (paul-lucas) wrote :

There wasn't anything else to change. If there were, I would have changed it.

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job pjl-misc-2013-05-09T18-21-43.693Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/compiler/parser/symbol_table.cpp'
2--- src/compiler/parser/symbol_table.cpp 2013-05-09 00:21:51 +0000
3+++ src/compiler/parser/symbol_table.cpp 2013-05-09 18:05:31 +0000
4@@ -259,7 +259,7 @@
5 try {
6 return new xs_integer(text);
7 }
8- catch ( std::range_error const& ) {
9+ catch ( std::invalid_argument const& ) {
10 return NULL;
11 }
12 }

Subscribers

People subscribed via source and target branches