[vala/0.40] parser: Don't include member-initializer in src-ref of object-creation-expr
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/0.40] parser: Don't include member-initializer in src-ref of object-creation-expr
- Date: Tue, 9 Apr 2019 13:48:56 +0000 (UTC)
commit cdd802af894db6e328d82e0b31e90204986dec7a
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Fri Mar 8 21:57:24 2019 +0100
parser: Don't include member-initializer in src-ref of object-creation-expr
vala/valaparser.vala | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 577111110..86423bc80 100644
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -782,6 +782,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) {
@@ -789,7 +791,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);
@@ -799,7 +801,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);
}
@@ -893,9 +895,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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]