improve error reporting for foreach statements

2007-08-30  Juerg Billeter  <j@bitron.ch>

	* vala/valasemanticanalyzer.vala: improve error reporting for foreach
	  statements

svn path=/trunk/; revision=542

diff --git a/ChangeLog b/ChangeLog
index 5950ebd..5241b65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-08-30  Jürg Billeter  <j@bitron.ch>
 
+       * vala/valasemanticanalyzer.vala: improve error reporting for foreach
+         statements
+
+2007-08-30  Jürg Billeter  <j@bitron.ch>
+
        * vapi/Makefile.am, vapi/clutter-0.4.deps, vapi/clutter-0.4.vala,
          vapi/packages/clutter-0.4/: remove clutter bindings, will be moved
          to clutter svn

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index cadc9ea..3752e02 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -846,6 +846,12 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
        }
 
        public override void visit_end_foreach_statement (ForeachStatement! stmt) {
+               if (stmt.collection.error) {
+                       // ignore inner error
+                       stmt.error = true;
+                       return;
+               }
+
                stmt.collection_variable_declarator = new VariableDeclarator ("%s_collection".printf (stmt.variable_name));
                stmt.collection_variable_declarator.type_reference = stmt.collection.static_type.copy ();
                stmt.collection_variable_declarator.type_reference.transfers_ownership = false;