← Back to team overview

zorba-coders team mailing list archive

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

 

Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.

Commit message:
I forgot to commit this file before the previous merge.

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

Requested reviews:
  Paul J. Lucas (paul-lucas)

For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/164062

I forgot to commit this file before the previous merge.

Better string-to-integer conversion exception catching -- fixes 3 FOTS tests.
-- 
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/164062
Your team Zorba Coders is subscribed to branch lp:zorba.
=== 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:05:33 +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;
   }
 }


Follow ups