[vala] Allow trailing comma in initializer list
- From: JÃrg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] Allow trailing comma in initializer list
- Date: Thu, 2 Aug 2012 12:58:21 +0000 (UTC)
commit 37ac31ae036b47217bc0aae0af64a4a9b383cf73
Author: Simon Werbeck <simon werbeck gmail com>
Date: Thu Jul 26 12:00:06 2012 +0200
Allow trailing comma in initializer list
Fixes bug 618858.
vala/valaparser.vala | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index caecb62..d01558b 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]