From: Jürg Billeter <j@bitron.ch>
Date: Sat, 25 Oct 2008 15:06:24 +0000 (+0000)
Subject: Fix support for arrays of nullable types, fixes bug 555050
X-Git-Tag: VALA_0_5_1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82f257019ed81deeddaab27df869716a0f651bf8;p=thirdparty%2Fvala.git

Fix support for arrays of nullable types, fixes bug 555050

2008-10-25  Jürg Billeter  <j@bitron.ch>

	* vala/valaparser.vala:

	Fix support for arrays of nullable types, fixes bug 555050

svn path=/trunk/; revision=1921
---

diff --git a/ChangeLog b/ChangeLog
index 0d07ece15..735017cb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-25  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valaparser.vala:
+
+	Fix support for arrays of nullable types, fixes bug 555050
+
 2008-10-25  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valasemanticanalyzer.vala:
diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 28cf08949..8a6de4ea5 100644
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -338,6 +338,7 @@ public class Vala.Parser : CodeVisitor {
 		skip_type_argument_list ();
 		while (accept (TokenType.STAR)) {
 		}
+		accept (TokenType.INTERR);
 		while (accept (TokenType.OPEN_BRACKET)) {
 			do {
 				if (current () != TokenType.COMMA && current () != TokenType.CLOSE_BRACKET) {
@@ -345,9 +346,9 @@ public class Vala.Parser : CodeVisitor {
 				}
 			} while (accept (TokenType.COMMA));
 			expect (TokenType.CLOSE_BRACKET);
+			accept (TokenType.INTERR);
 		}
 		accept (TokenType.OP_NEG);
-		accept (TokenType.INTERR);
 		accept (TokenType.HASH);
 	}