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

internal: fixed parsing of expression new

Browse Source 
1. Now, for the expression 'new A' the correct
values EndLine, EndPos, and not -1 will be set;
2. Also, for expressions from php5 '$a = &new Foo',
the condition for parsing is fixed when it is necessary
to set the Args values and the initialization of the
NewTkn field is added, in the case when this condition
is false.

## Problem description

The reason why the positions after parsing became
incorrect is that the check that is responsible for
separating expressions like 'new A' and 'new A (args)'
relied on comparison with nil, however, when the parser
was updated, 'ctor_arguments' began to return not nil,
but &ArgumentList{}, so the condition was always true,
and in this case, when calculating the position, the
second argument of the 'NewTokenNodePosition' function
was nil, which is why -1 was returned there.

For the second, the reasons are similar. In addition,
there was a mistake in the number that needs to be
checked. In the expression:

'variable' '=' '&' T_NEW class_name_reference ctor_arguments'

it is necessary to check not 3, but 6 elements for nil.
This commit is contained in:
i582 2021-02-04 07:12:56 +03:00
parent 4d6130d98d
commit 61523ab396
6 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/php5/parser_test.go
View File

@ -38822,9 +38822,9 @@ func TestExprNew(t *testing.T) {
Expr: &ast.ExprNew{
Position: &position.Position{
StartLine: 1,
EndLine: -1,
EndLine: 1,
StartPos: 3,
EndPos: -1,
EndPos: 10,
},
NewTkn: &token.Token{
ID: token.T_NEW,
@ -43954,9 +43954,9 @@ func TestExprAssign(t *testing.T) {
Expr: &ast.ExprAssignReference{
Position: &position.Position{
StartLine: 4,
EndLine: -1,
EndLine: 4,
StartPos: 28,
EndPos: -1,
EndPos: 41,
},
Var: &ast.ExprVariable{
Position: &position.Position{
@ -44032,9 +44032,9 @@ func TestExprAssign(t *testing.T) {
Expr: &ast.ExprNew{
Position: &position.Position{
StartLine: 4,
EndLine: -1,
EndLine: 4,
StartPos: 34,
EndPos: -1,
EndPos: 41,
},
NewTkn: &token.Token{
ID: token.T_NEW,

5
internal/php5/php5.go generated
View File

@ -4981,6 +4981,7 @@ yydefault:
} else {
yyVAL.node = &ast.ExprNew{
Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node),
NewTkn: yyDollar[1].token,
Class: yyDollar[2].node,
}
}
@ -5031,7 +5032,7 @@ yydefault:
// line internal/php5/php5.y:2797
{
var _new *ast.ExprNew
if yyDollar[3].token != nil {
if yyDollar[6].token != nil {
_new = &ast.ExprNew{
Position: yylex.(*Parser).builder.NewTokenNodePosition(yyDollar[4].token, yyDollar[6].node),
NewTkn: yyDollar[4].token,
@ -6401,7 +6402,7 @@ yydefault:
yyDollar = yyS[yypt-0 : yypt+1]
// line internal/php5/php5.y:3986
{
yyVAL.node = &ArgumentList{}
yyVAL.node = nil
}
case 352:
yyDollar = yyS[yypt-1 : yypt+1]

5
internal/php5/php5.y
View File

@ -2751,6 +2751,7 @@ new_expr:
} else {
$$ = &ast.ExprNew{
Position: yylex.(*Parser).builder.NewTokenNodePosition($1, $2),
NewTkn: $1,
Class: $2,
}
}
@ -2796,7 +2797,7 @@ expr_without_variable:
| variable '=' '&' T_NEW class_name_reference ctor_arguments
{
var _new *ast.ExprNew
if $3 != nil {
if $6 != nil {
_new = &ast.ExprNew{
Position: yylex.(*Parser).builder.NewTokenNodePosition($4, $6),
NewTkn: $4,
@ -3984,7 +3985,7 @@ backticks_expr:
ctor_arguments:
/* empty */
{
$$ = &ArgumentList{}
$$ = nil
}
| function_call_parameter_list
{

12
internal/php7/parser_test.go
View File

@ -43581,9 +43581,9 @@ func TestExprNew(t *testing.T) {
Expr: &ast.ExprNew{
Position: &position.Position{
StartLine: 1,
EndLine: -1,
EndLine: 1,
StartPos: 3,
EndPos: -1,
EndPos: 10,
},
NewTkn: &token.Token{
ID: token.T_NEW,
@ -49806,9 +49806,9 @@ func TestExprAssign_Assign(t *testing.T) {
Expr: &ast.ExprAssignReference{
Position: &position.Position{
StartLine: 4,
EndLine: -1,
EndLine: 4,
StartPos: 28,
EndPos: -1,
EndPos: 41,
},
Var: &ast.ExprVariable{
Position: &position.Position{
@ -49884,9 +49884,9 @@ func TestExprAssign_Assign(t *testing.T) {
Expr: &ast.ExprNew{
Position: &position.Position{
StartLine: 4,
EndLine: -1,
EndLine: 4,
StartPos: 34,
EndPos: -1,
EndPos: 41,
},
NewTkn: &token.Token{
ID: token.T_NEW,

2
internal/php7/php7.go generated
View File

@ -6091,7 +6091,7 @@ yydefault:
yyDollar = yyS[yypt-0 : yypt+1]
// line internal/php7/php7.y:3492
{
yyVAL.node = &ArgumentList{}
yyVAL.node = nil
}
case 398:
yyDollar = yyS[yypt-1 : yypt+1]

2
internal/php7/php7.y
View File

@ -3490,7 +3490,7 @@ backticks_expr:
ctor_arguments:
/* empty */
{
$$ = &ArgumentList{}
$$ = nil
}
| argument_list
{