Skip to content

Commit 0f2341b

Browse files
committed
refactoring: update ast structure of "MethodCall" and "PropertyFetch" nodes
1 parent 2c09138 commit 0f2341b

File tree

9 files changed

+330
-172
lines changed

9 files changed

+330
-172
lines changed

internal/php5/php5.go

Lines changed: 100 additions & 90 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/php5/php5.y

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4709,7 +4709,9 @@ variable:
47094709
)
47104710
$3 = append($3, $4[1:len($4)]...)
47114711
case *ast.ExprPropertyFetch:
4712+
$4[0].(*ast.ExprMethodCall).OpenCurlyBracketTkn = l.OpenCurlyBracketTkn
47124713
$4[0].(*ast.ExprMethodCall).Method = l.Property
4714+
$4[0].(*ast.ExprMethodCall).CloseCurlyBracketTkn = l.CloseCurlyBracketTkn
47134715
$4[0].(*ast.ExprMethodCall).ObjectOperatorTkn = l.ObjectOperatorTkn
47144716
$3 = append($3[:len($3)-1], $4...)
47154717
}
@@ -4801,7 +4803,9 @@ variable_property:
48014803
)
48024804
$2 = append($2, $3[1:len($3)]...)
48034805
case *ast.ExprPropertyFetch:
4806+
$3[0].(*ast.ExprMethodCall).OpenCurlyBracketTkn = l.OpenCurlyBracketTkn
48044807
$3[0].(*ast.ExprMethodCall).Method = l.Property
4808+
$3[0].(*ast.ExprMethodCall).CloseCurlyBracketTkn = l.CloseCurlyBracketTkn
48054809
$3[0].(*ast.ExprMethodCall).ObjectOperatorTkn = l.ObjectOperatorTkn
48064810
$2 = append($2[:len($2)-1], $3...)
48074811
}
@@ -5078,12 +5082,18 @@ object_dim_list:
50785082
}
50795083
| variable_name
50805084
{
5081-
$$ = []ast.Vertex{
5082-
&ast.ExprPropertyFetch{
5083-
Position: yylex.(*Parser).builder.NewNodePosition($1),
5084-
Property: $1,
5085-
},
5085+
property := &ast.ExprPropertyFetch{
5086+
Position: yylex.(*Parser).builder.NewNodePosition($1),
5087+
Property: $1,
5088+
}
5089+
5090+
if brackets, ok := $1.(*ast.ParserBrackets); ok {
5091+
property.OpenCurlyBracketTkn = brackets.OpenBracketTkn
5092+
property.Property = brackets.Child
5093+
property.CloseCurlyBracketTkn = brackets.CloseBracketTkn
50865094
}
5095+
5096+
$$ = []ast.Vertex{ property }
50875097
}
50885098
;
50895099

0 commit comments

Comments
 (0)