From: Simon Werbeck <simon.werbeck@gmail.com>
Date: Thu, 26 Jul 2012 10:00:06 +0000 (+0200)
Subject: Allow trailing comma in initializer list
X-Git-Tag: 0.17.4~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37ac31ae036b47217bc0aae0af64a4a9b383cf73;p=thirdparty%2Fvala.git

Allow trailing comma in initializer list

Fixes bug 618858.
---

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index caecb62da..d01558b21 100644
--- 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;