maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#38 fix saving positions for php5 ArrayDimFetch, PropertyFetch and MethodCall nodes

Browse Source
This commit is contained in:
z7zmey 2018-06-10 10:01:25 +03:00
parent d21a0a3dc9
commit d13681c042
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
php5/php5.go
View File

@ -7387,17 +7387,17 @@ yydefault:
switch nn := n.(type) { switch nn := n.(type) {
case *expr.ArrayDimFetch: case *expr.ArrayDimFetch:
nn.Variable = yyVAL.node nn.Variable = yyVAL.node
yylex.(*Parser).positions.AddPosition(yyVAL.node, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn))
yyVAL.node = nn yyVAL.node = nn
case *expr.PropertyFetch: case *expr.PropertyFetch:
nn.Variable = yyVAL.node nn.Variable = yyVAL.node
yylex.(*Parser).positions.AddPosition(yyVAL.node, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn))
yyVAL.node = nn yyVAL.node = nn
case *expr.MethodCall: case *expr.MethodCall:
nn.Variable = yyVAL.node nn.Variable = yyVAL.node
yylex.(*Parser).positions.AddPosition(yyVAL.node, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn))
yyVAL.node = nn yyVAL.node = nn
} }
} }
@ -7406,17 +7406,17 @@ yydefault:
switch nn := n.(type) { switch nn := n.(type) {
case *expr.ArrayDimFetch: case *expr.ArrayDimFetch:
nn.Variable = yyVAL.node nn.Variable = yyVAL.node
yylex.(*Parser).positions.AddPosition(yyVAL.node, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn))
yyVAL.node = nn yyVAL.node = nn
case *expr.PropertyFetch: case *expr.PropertyFetch:
nn.Variable = yyVAL.node nn.Variable = yyVAL.node
yylex.(*Parser).positions.AddPosition(yyVAL.node, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn))
yyVAL.node = nn yyVAL.node = nn
case *expr.MethodCall: case *expr.MethodCall:
nn.Variable = yyVAL.node nn.Variable = yyVAL.node
yylex.(*Parser).positions.AddPosition(yyVAL.node, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition(yyVAL.node, nn))
yyVAL.node = nn yyVAL.node = nn
} }
} }

12
php5/php5.y
View File

@ -4624,17 +4624,17 @@ variable:
switch nn := n.(type) { switch nn := n.(type) {
case *expr.ArrayDimFetch: case *expr.ArrayDimFetch:
nn.Variable = $$ nn.Variable = $$
yylex.(*Parser).positions.AddPosition($$, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn))
$$ = nn $$ = nn
case *expr.PropertyFetch: case *expr.PropertyFetch:
nn.Variable = $$ nn.Variable = $$
yylex.(*Parser).positions.AddPosition($$, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn))
$$ = nn $$ = nn
case *expr.MethodCall: case *expr.MethodCall:
nn.Variable = $$ nn.Variable = $$
yylex.(*Parser).positions.AddPosition($$, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn))
$$ = nn $$ = nn
} }
} }
@ -4643,17 +4643,17 @@ variable:
switch nn := n.(type) { switch nn := n.(type) {
case *expr.ArrayDimFetch: case *expr.ArrayDimFetch:
nn.Variable = $$ nn.Variable = $$
yylex.(*Parser).positions.AddPosition($$, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn))
$$ = nn $$ = nn
case *expr.PropertyFetch: case *expr.PropertyFetch:
nn.Variable = $$ nn.Variable = $$
yylex.(*Parser).positions.AddPosition($$, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn))
$$ = nn $$ = nn
case *expr.MethodCall: case *expr.MethodCall:
nn.Variable = $$ nn.Variable = $$
yylex.(*Parser).positions.AddPosition($$, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn)) yylex.(*Parser).positions.AddPosition(nn, yylex.(*Parser).positionBuilder.NewNodesPosition($$, nn))
$$ = nn $$ = nn
} }
} }