From: Jürg Billeter <j@bitron.ch>
Date: Sat, 13 Mar 2010 19:23:19 +0000 (+0100)
Subject: dova: Do not support array or object member initializers
X-Git-Tag: 0.8.0~197
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c34a4b26ee9c6b7736948407685d54fc527e8ca5;p=thirdparty%2Fvala.git

dova: Do not support array or object member initializers
---

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index c900b7196..2f0348450 100644
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -550,7 +550,11 @@ public class Vala.Parser : CodeVisitor {
 			expr = parse_literal ();
 			break;
 		case TokenType.OPEN_BRACE:
-			expr = parse_initializer ();
+			if (context.profile == Profile.DOVA) {
+				expr = parse_simple_name ();
+			} else {
+				expr = parse_initializer ();
+			}
 			break;
 		case TokenType.OPEN_PARENS:
 			expr = parse_tuple ();
@@ -830,7 +834,7 @@ public class Vala.Parser : CodeVisitor {
 		} while (accept (TokenType.OPEN_BRACKET));
 
 		InitializerList initializer = null;
-		if (current () == TokenType.OPEN_BRACE) {
+		if (context.profile != Profile.DOVA && current () == TokenType.OPEN_BRACE) {
 			initializer = parse_initializer ();
 		}
 		var expr = new ArrayCreationExpression (element_type, size_specifier_list.size, initializer, get_src (begin));
@@ -844,7 +848,7 @@ public class Vala.Parser : CodeVisitor {
 
 	List<MemberInitializer> parse_object_initializer () throws ParseError {
 		var list = new ArrayList<MemberInitializer> ();
-		if (accept (TokenType.OPEN_BRACE)) {
+		if (context.profile != Profile.DOVA && accept (TokenType.OPEN_BRACE)) {
 			do {
 				list.add (parse_member_initializer ());
 			} while (accept (TokenType.COMMA));