From 61523ab39605b52689ffa2f6d37081b7f6e52514 Mon Sep 17 00:00:00 2001
From: i582 <i58215@voenmeh.ru>
Date: Thu, 4 Feb 2021 07:12:56 +0300
Subject: [PATCH] internal: fixed parsing of expression new

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.
---
 internal/php5/parser_test.go |  12 ++++++------
 internal/php5/php5.go        | Bin 265200 -> 265222 bytes
 internal/php5/php5.y         |   5 +++--
 internal/php7/parser_test.go |  12 ++++++------
 internal/php7/php7.go        | Bin 221316 -> 221304 bytes
 internal/php7/php7.y         |   2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/internal/php5/parser_test.go b/internal/php5/parser_test.go
index a8a9bd5..bceac81 100644
--- a/internal/php5/parser_test.go
+++ b/internal/php5/parser_test.go
@@ -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,
diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index b213c534b1e0b358971a8c5125a8c1b77da0c2fb..4c564f9eaff15e73f7dd3675d3066e2fc5daa138 100644
GIT binary patch
delta 68
zcmew`U7&4-Ktl`T7N)+U>9&<jT+?H!nK-A*S~K%cUr+$#)`7VD3Yd7euPb8u#L8&4
WePIRD!`0L0Gc)mRpQFMY@*DtAR2bO+

delta 53
zcmV-50LuS{m=N%n5P*aMv;vNDmzH}16PLbl0u8s&asu)Nmv{UD7Pr`V0?ezIj0pk`
L0e!cpBm-aPV3!su

diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index 41ef5e4..782337f 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -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
             {
diff --git a/internal/php7/parser_test.go b/internal/php7/parser_test.go
index 3df90af..6d09d67 100644
--- a/internal/php7/parser_test.go
+++ b/internal/php7/parser_test.go
@@ -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,
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index eeb759574cf32c77b3edf87fadfc79894a42f52e..18eef9db06ae845f433144ec831cbd898dc7b982 100644
GIT binary patch
delta 24
gcmZoU$ot~}Z$k^?7N*39(+})t<lA2TkcqP%0FN6A*8l(j

delta 35
rcmexyfVbr!Z$k^?7N*39{A!Lx>7}`;c_luX#U<6X+fyDgiPQrC4{r{#

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index fceb827..928b3d1 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -3490,7 +3490,7 @@ backticks_expr:
 ctor_arguments:
         /* empty */
             {
-                $$ = &ArgumentList{}
+                $$ = nil
             }
     |   argument_list
             {