From: Jürg Billeter <j@bitron.ch>
Date: Sat, 9 Jan 2010 11:34:53 +0000 (+0100)
Subject: Support multiple variable declarators in for initializer
X-Git-Tag: 0.7.10~114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=02fb161cb286a82ae1d7dc983067b0052c2ad05b;p=thirdparty%2Fvala.git

Support multiple variable declarators in for initializer

Fixes bug 601350.
---

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index ea5df106c..6542bfe4e 100644
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -1634,18 +1634,12 @@ public class Vala.Parser : CodeVisitor {
 				do {
 					initializer_list.add (parse_statement_expression ());
 				} while (accept (TokenType.COMMA));
+				expect (TokenType.SEMICOLON);
 			} else {
+				// variable declaration in initializer
 				block = new Block (get_src (begin));
-				DataType variable_type;
-				if (accept (TokenType.VAR)) {
-					variable_type = null;
-				} else {
-					variable_type = parse_type ();
-				}
-				var local = parse_local_variable (variable_type);
-				block.add_statement (new DeclarationStatement (local, local.source_reference));
+				parse_local_variable_declarations (block);
 			}
-			expect (TokenType.SEMICOLON);
 		}
 		Expression condition = null;
 		if (current () != TokenType.SEMICOLON) {