vala r1359 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Sat May 10 22:27:38 2008
New Revision: 1359
URL: http://svn.gnome.org/viewvc/vala?rev=1359&view=rev

Log:
2008-05-11  Juerg Billeter  <j bitron ch>

	* vala/valaparser.vala: fix crash on invalid code, fixes bug 531034


Modified:
   trunk/ChangeLog
   trunk/vala/valaparser.vala

Modified: trunk/vala/valaparser.vala
==============================================================================
--- trunk/vala/valaparser.vala	(original)
+++ trunk/vala/valaparser.vala	Sat May 10 22:27:38 2008
@@ -1181,7 +1181,8 @@
 					stmt = parse_expression_statement ();
 					break;
 				default:
-					if (is_expression ()) {
+					bool is_expr = is_expression ();
+					if (is_expr) {
 						stmt = parse_expression_statement ();
 					} else {
 						is_decl = true;
@@ -1431,7 +1432,9 @@
 				is_expr = true;
 				break;
 			default:
-				is_expr = is_expression ();
+				// workaround for current limitation of exception handling
+				bool local_is_expr = is_expression ();
+				is_expr = local_is_expr;
 				break;
 			}