Allow trailing comma in initializer list

Fixes bug 618858.

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index caecb62dab5d3d92d1ed3218a20cf15caeaf0102..d01558b212bb023be3cd6998cc27c065fd5db934 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -2615,11 +2615,13 @@ public class Vala.Parser : CodeVisitor {
                var begin = get_location ();
                expect (TokenType.OPEN_BRACE);
                var initializer = new InitializerList (get_src (begin));
-               if (current () != TokenType.CLOSE_BRACE) {
-                       do {
-                               var init = parse_argument ();
-                               initializer.append (init);
-                       } while (accept (TokenType.COMMA));
+               while (current () != TokenType.CLOSE_BRACE) {
+                       var init = parse_argument ();
+                       initializer.append (init);
+
+                       if (!accept (TokenType.COMMA)) {
+                               break;
+                       }
                }
                expect (TokenType.CLOSE_BRACE);
                return initializer;