[vala] Support multiple variable declarators in for initializer
- From: Jürg Billeter <juergbi src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [vala] Support multiple variable declarators in for initializer
- Date: Sat, 9 Jan 2010 11:36:02 +0000 (UTC)
commit 02fb161cb286a82ae1d7dc983067b0052c2ad05b
Author: Jürg Billeter <j bitron ch>
Date: Sat Jan 9 12:34:53 2010 +0100
Support multiple variable declarators in for initializer
Fixes bug 601350.
vala/valaparser.vala | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index ea5df10..6542bfe 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) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]