vala r1246 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Wed Apr 16 17:24:46 2008
New Revision: 1246
URL: http://svn.gnome.org/viewvc/vala?rev=1246&view=rev

Log:
2008-04-16  Juerg Billeter  <j bitron ch>

	* vala/valaparser.vala: improve error handling, fixes bug 528431


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

Modified: trunk/vala/valaparser.vala
==============================================================================
--- trunk/vala/valaparser.vala	(original)
+++ trunk/vala/valaparser.vala	Wed Apr 16 17:24:46 2008
@@ -468,6 +468,11 @@
 				found = false;
 				break;
 			}
+
+			if (expr == null) {
+				// workaround for current limitation of exception handling
+				throw new ParseError.SYNTAX ("syntax error in primary expression");
+			}
 		}
 
 		return expr;
@@ -1074,6 +1079,10 @@
 				next ();
 				var rhs = parse_expression ();
 				expr = context.create_assignment (expr, rhs, operator, get_src (begin));
+				if (expr == null) {
+					// workaround for current limitation of exception handling
+					throw new ParseError.SYNTAX ("syntax error in assignment");
+				}
 			} else if (current () == TokenType.OP_GT) { // >>=
 				char* first_gt_pos = tokens[index].begin.pos;
 				next ();
@@ -1082,6 +1091,10 @@
 					next ();
 					var rhs = parse_expression ();
 					expr = context.create_assignment (expr, rhs, AssignmentOperator.SHIFT_RIGHT, get_src (begin));
+					if (expr == null) {
+						// workaround for current limitation of exception handling
+						throw new ParseError.SYNTAX ("syntax error in assignment");
+					}
 				} else {
 					prev ();
 					break;