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

[Paul J. Lucas]

I forgot to commit this file before the previous merge.

Better string-to-integer conversion exception catching -- fixes 3 FOTS tests.

I forgot to commit this file before the previous merge.

Better string-to-integer conversion exception catching -- fixes 3 FOTS tests.

[lp:~paul-lucas/zorba/pjl-misc]

11217. By Paul J. Lucas on 2013-05-16

Merge from trunk.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-05-16T17-01-49.255Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-05-16T17-01-49.255Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/parser/symbol_table.cpp'
--- src/compiler/parser/symbol_table.cpp	2013-05-15 23:22:01 +0000
+++ src/compiler/parser/symbol_table.cpp	2013-05-16 02:09:27 +0000
@@ -267,7 +267,7 @@
   try {
     return new xs_double(text);
   }
-  catch ( std::range_error const& ) {
+  catch ( std::exception const& ) {
     return NULL;
   }
 }
@@ -277,7 +277,7 @@
   try {
     return new xs_integer(text);
   }
-  catch ( std::invalid_argument const& ) {
+  catch ( std::exception const& ) {
     return NULL;
   }
 }