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 0d07ece1578c3a8ce9a4e848fa9c2c43849ebf2e..735017cb04d95dd9d4c5ec198e9d29230d5dd99f 100644 (file)
--- 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 28cf08949dd5ca37d23d9dcbea8758b087d1b1ae..8a6de4ea524b40d18fb59f0596572cab6cf442ba 100644 (file)
--- 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);
        }