From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Fri, 8 Mar 2019 20:57:24 +0000 (+0100)
Subject: parser: Don't include member-initializer in src-ref of object-creation-expr
X-Git-Tag: 0.42.7~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2ff66c15d3faf7b65990bac92b471039680891b;p=thirdparty%2Fvala.git

parser: Don't include member-initializer in src-ref of object-creation-expr
---

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 41e6e7da8..67544a9b5 100644
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -783,6 +783,8 @@ public class Vala.Parser : CodeVisitor {
 		expect (TokenType.OPEN_PARENS);
 		var arg_list = parse_argument_list ();
 		expect (TokenType.CLOSE_PARENS);
+		var src = get_src (begin);
+
 		var init_list = parse_object_initializer ();
 
 		if (init_list.size > 0 && inner is MemberAccess) {
@@ -790,7 +792,7 @@ public class Vala.Parser : CodeVisitor {
 			var member = (MemberAccess) inner;
 			member.creation_member = true;
 
-			var expr = new ObjectCreationExpression (member, get_src (begin));
+			var expr = new ObjectCreationExpression (member, src);
 			expr.struct_creation = true;
 			foreach (Expression arg in arg_list) {
 				expr.add_argument (arg);
@@ -800,7 +802,7 @@ public class Vala.Parser : CodeVisitor {
 			}
 			return expr;
 		} else {
-			var expr = new MethodCall (inner, get_src (begin));
+			var expr = new MethodCall (inner, src);
 			foreach (Expression arg in arg_list) {
 				expr.add_argument (arg);
 			}
@@ -894,9 +896,11 @@ public class Vala.Parser : CodeVisitor {
 		member.creation_member = true;
 		var arg_list = parse_argument_list ();
 		expect (TokenType.CLOSE_PARENS);
+		var src = get_src (begin);
+
 		var init_list = parse_object_initializer ();
 
-		var expr = new ObjectCreationExpression (member, get_src (begin));
+		var expr = new ObjectCreationExpression (member, src);
 		foreach (Expression arg in arg_list) {
 			expr.add_argument (arg);
 		}