From 7e2965f53b0f48b94d03ccace652839f65eaf2b1 Mon Sep 17 00:00:00 2001
From: Vadym Slizov <z7zmey@gmail.com>
Date: Fri, 20 Nov 2020 22:57:27 +0200
Subject: [PATCH] [refactoring] update ast structure of "Argument" and
 "ArgumentList" nodes

---
 internal/php5/php5.go         | Bin 288363 -> 288783 bytes
 internal/php5/php5.y          | 120 +++++++++++++++++-----------------
 internal/php7/php7.go         | Bin 239265 -> 239825 bytes
 internal/php7/php7.y          |  73 ++++++++++-----------
 pkg/ast/node.go               |  11 ++--
 pkg/ast/visitor/dump.go       |  10 ---
 pkg/printer/pretty_printer.go |   4 +-
 pkg/printer/printer.go        |   4 +-
 8 files changed, 106 insertions(+), 116 deletions(-)

diff --git a/internal/php5/php5.go b/internal/php5/php5.go
index 199faecd90d1e29eefba5daee8ffbce002b0b852..1e89fea02c196214cf799a1f33cd76dc8a4b1093 100644
GIT binary patch
delta 14364
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
YQ}_wmBVBQ6K&o>h-~vtg%iP5O1L@%PPXGV_

delta 12594
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
Qqq11akX<e5&@?alzeuAw^#A|>

diff --git a/internal/php5/php5.y b/internal/php5/php5.y
index 0e7e6fa..f905e1d 100644
--- a/internal/php5/php5.y
+++ b/internal/php5/php5.y
@@ -242,7 +242,7 @@ import (
 %type <node> static_scalar_value static_operation static_var_list global_var_list
 %type <node> ctor_arguments function_call_parameter_list echo_expr_list
 %type <node> trait_adaptations unset_variables declare_list
-%type <node> switch_case_list
+%type <node> switch_case_list non_empty_function_call_parameter_list
 %type <node> method_body
 %type <node> foreach_statement for_statement while_statement
 %type <node> foreach_variable foreach_optional_arg
@@ -258,7 +258,7 @@ import (
 %type <list> for_expr case_list catch_statement additional_catches
 %type <list> non_empty_additional_catches parameter_list non_empty_parameter_list class_statement_list
 %type <list> class_statement_list variable_modifiers method_modifiers class_variable_declaration
-%type <list> interface_list non_empty_function_call_parameter_list trait_list trait_adaptation_list non_empty_trait_adaptation_list
+%type <list> interface_list trait_list trait_adaptation_list non_empty_trait_adaptation_list
 %type <list> trait_reference_list non_empty_member_modifiers backticks_expr static_array_pair_list non_empty_static_array_pair_list
 
 %type <list> chaining_dereference chaining_instance_call chaining_method_or_property instance_call variable_property
@@ -2170,38 +2170,40 @@ optional_class_type:
 function_call_parameter_list:
         '(' ')'
             {
-                $$ = &ast.ArgumentList{ast.Node{}, nil}
-
-                // save position
-                $$.GetNode().Position = position.NewTokensPosition($1, $2)
-
-                // save comments
-                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $2.SkippedTokens)
+                $$ = &ast.ArgumentList{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $2),
+                    },
+                    OpenParenthesisTkn: $1,
+                    CloseParenthesisTkn: $2,
+                }
             }
     |   '(' non_empty_function_call_parameter_list ')'
             {
-                $$ = &ast.ArgumentList{ast.Node{}, $2}
+                argumentList := $2.(*ast.ArgumentList)
+                argumentList.Position = position.NewTokensPosition($1, $3)
+                argumentList.OpenParenthesisTkn = $1
+                argumentList.CloseParenthesisTkn = $3
 
-                // save position
-                $$.GetNode().Position = position.NewTokensPosition($1, $3)
-
-                // save comments
-                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.SkippedTokens)
+                $$ = argumentList
             }
     |   '(' yield_expr ')'
             {
-                arg := &ast.Argument{ast.Node{}, false, false, $2}
-                $$ = &ast.ArgumentList{ast.Node{}, []ast.Vertex{arg}}
-
-                // save position
-                arg.GetNode().Position = position.NewNodePosition($2)
-                $$.GetNode().Position = position.NewTokensPosition($1, $3)
-
-                // save comments
-                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.SkippedTokens)
+                $$ = &ast.ArgumentList{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $3),
+                    },
+                    OpenParenthesisTkn: $1,
+                    Arguments: []ast.Vertex{
+                        &ast.Argument{
+                            Node: ast.Node{
+                                Position: position.NewNodePosition($2),
+                            },
+                            Expr: $2,
+                        },
+                    },
+                    CloseParenthesisTkn: $3,
+                }
             }
 ;
 
@@ -2209,57 +2211,57 @@ function_call_parameter_list:
 non_empty_function_call_parameter_list:
         function_call_parameter
             {
-                $$ = []ast.Vertex{$1}
+                $$ = &ast.ArgumentList{
+                    Arguments: []ast.Vertex{$1},
+                }
             }
     |   non_empty_function_call_parameter_list ',' function_call_parameter
             {
-                $$ = append($1, $3)
+                $1.(*ast.ArgumentList).SeparatorTkns = append($1.(*ast.ArgumentList).SeparatorTkns, $2)
+                $1.(*ast.ArgumentList).Arguments = append($1.(*ast.ArgumentList).Arguments, $3)
 
-                // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.SkippedTokens)
+                $$ = $1
             }
 ;
 
 function_call_parameter:
         expr_without_variable
             {
-                $$ = &ast.Argument{ast.Node{}, false, false, $1}
-
-                // save position
-                $$.GetNode().Position = position.NewNodePosition($1)
-
-                // save comments
-                yylex.(*Parser).MoveFreeFloating($1, $$)
+                $$ = &ast.Argument{
+                    Node: ast.Node{
+                        Position: position.NewNodePosition($1),
+                    },
+                    Expr: $1,
+                }
             }
     |   variable
             {
-                $$ = &ast.Argument{ast.Node{}, false, false, $1}
-
-                // save position
-                $$.GetNode().Position = position.NewNodePosition($1)
-
-                // save comments
-                yylex.(*Parser).MoveFreeFloating($1, $$)
+                $$ = &ast.Argument{
+                    Node: ast.Node{
+                        Position: position.NewNodePosition($1),
+                    },
+                    Expr: $1,
+                }
             }
     |   '&' w_variable
             {
-                $$ = &ast.Argument{ast.Node{}, false, true, $2}
-
-                // save position
-                $$.GetNode().Position = position.NewNodePosition($2)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
+                $$ = &ast.Argument{
+                    Node: ast.Node{
+                        Position: position.NewTokenNodePosition($1, $2),
+                    },
+                    AmpersandTkn: $1,
+                    Expr:         $2,
+                }
             }
     |   T_ELLIPSIS expr
             {
-                $$ = &ast.Argument{ast.Node{}, true, false, $2}
-
-                // save position
-                $$.GetNode().Position = position.NewTokenNodePosition($1, $2)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
+                $$ = &ast.Argument{
+                    Node: ast.Node{
+                        Position: position.NewTokenNodePosition($1, $2),
+                    },
+                    VariadicTkn: $1,
+                    Expr:        $2,
+                }
             }
 ;
 
diff --git a/internal/php7/php7.go b/internal/php7/php7.go
index 62c54a9db833c3a233ea77f83e09ff033627c32d..a66ce9259d8c3eaa4ac90001eed929d29f88aa41 100644
GIT binary patch
delta 12237
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

delta 10554
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
JLyxKG{{h?$=F<QG

diff --git a/internal/php7/php7.y b/internal/php7/php7.y
index 586a9aa..b246064 100644
--- a/internal/php7/php7.y
+++ b/internal/php7/php7.y
@@ -250,7 +250,7 @@ import (
 %type <node> variable_class_name dereferencable_scalar constant dereferencable
 %type <node> callable_expr callable_variable static_member new_variable
 %type <node> encaps_var encaps_var_offset echo_expr_list catch_name_list
-%type <node> if_stmt const_list
+%type <node> if_stmt const_list non_empty_argument_list
 %type <node> alt_if_stmt
 %type <node> if_stmt_without_else
 %type <node> class_const_decl
@@ -280,7 +280,7 @@ import (
 %type <list> unprefixed_use_declarations inline_use_declarations property_list
 %type <list> case_list trait_adaptation_list
 %type <list> use_declarations lexical_var_list isset_variables non_empty_array_pair_list
-%type <list> array_pair_list non_empty_argument_list top_statement_list
+%type <list> array_pair_list top_statement_list
 %type <list> inner_statement_list parameter_list non_empty_parameter_list class_statement_list
 %type <list> method_modifiers variable_modifiers
 %type <list> non_empty_member_modifiers name_list class_modifiers
@@ -2030,66 +2030,61 @@ return_type:
 argument_list:
         '(' ')'
             {
-                $$ = &ast.ArgumentList{ast.Node{}, nil}
-
-                // save position
-                $$.GetNode().Position = position.NewTokensPosition($1, $2)
-
-                // save comments
-                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
-                yylex.(*Parser).setFreeFloatingTokens($$, token.End, $2.SkippedTokens)
+                $$ = &ast.ArgumentList{
+                    Node: ast.Node{
+                        Position: position.NewTokensPosition($1, $2),
+                    },
+                    OpenParenthesisTkn: $1,
+                    CloseParenthesisTkn: $2,
+                }
             }
     |   '(' non_empty_argument_list possible_comma ')'
             {
-                $$ = &ast.ArgumentList{ast.Node{}, $2}
+                argumentList := $2.(*ast.ArgumentList)
+                argumentList.Position = position.NewTokensPosition($1, $4)
+                argumentList.OpenParenthesisTkn = $1
+                argumentList.SeparatorTkns = append(argumentList.SeparatorTkns, $3)
+                argumentList.CloseParenthesisTkn = $4
 
-                // save position
-                $$.GetNode().Position = position.NewTokensPosition($1, $4)
-
-                // save comments
-                yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
-                if $3 != nil {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($3.SkippedTokens, $4.SkippedTokens...))
-                } else {
-                    yylex.(*Parser).setFreeFloatingTokens($$, token.End, $4.SkippedTokens)
-                }
+                $$ = argumentList
             }
 ;
 
 non_empty_argument_list:
         argument
             {
-                $$ = []ast.Vertex{$1}
+                $$ = &ast.ArgumentList{
+                    Arguments: []ast.Vertex{$1},
+                }
             }
     |   non_empty_argument_list ',' argument
             {
-                $$ = append($1, $3)
+                $1.(*ast.ArgumentList).SeparatorTkns = append($1.(*ast.ArgumentList).SeparatorTkns, $2)
+                $1.(*ast.ArgumentList).Arguments = append($1.(*ast.ArgumentList).Arguments, $3)
 
-                // save comments
-                yylex.(*Parser).setFreeFloating(lastNode($1), token.End, $2.SkippedTokens)
+                $$ = $1
             }
 ;
 
 argument:
         expr
             {
-                $$ = &ast.Argument{ast.Node{}, false, false, $1}
-
-                // save position
-                $$.GetNode().Position = position.NewNodePosition($1)
-
-                // save comments
-                yylex.(*Parser).MoveFreeFloating($1, $$)
+                $$ = &ast.Argument{
+                    Node: ast.Node{
+                        Position: position.NewNodePosition($1),
+                    },
+                    Expr:        $1,
+                }
             }
     |   T_ELLIPSIS expr
             {
-                $$ = &ast.Argument{ast.Node{}, true, false, $2}
-
-                // save position
-                $$.GetNode().Position = position.NewTokenNodePosition($1, $2)
-
-                // save comments
-                yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
+                $$ = &ast.Argument{
+                    Node: ast.Node{
+                        Position: position.NewTokenNodePosition($1, $2),
+                    },
+                    VariadicTkn: $1,
+                    Expr:        $2,
+                }
             }
 ;
 
diff --git a/pkg/ast/node.go b/pkg/ast/node.go
index 8d4b885..9cc59f4 100644
--- a/pkg/ast/node.go
+++ b/pkg/ast/node.go
@@ -90,7 +90,10 @@ func (n *Identifier) Accept(v NodeVisitor) {
 // ArgumentList node
 type ArgumentList struct {
 	Node
-	Arguments []Vertex
+	OpenParenthesisTkn  *token.Token
+	Arguments           []Vertex
+	SeparatorTkns       []*token.Token
+	CloseParenthesisTkn *token.Token
 }
 
 func (n *ArgumentList) Accept(v NodeVisitor) {
@@ -100,9 +103,9 @@ func (n *ArgumentList) Accept(v NodeVisitor) {
 // Argument node
 type Argument struct {
 	Node
-	Variadic    bool
-	IsReference bool
-	Expr        Vertex
+	VariadicTkn  *token.Token
+	AmpersandTkn *token.Token
+	Expr         Vertex
 }
 
 func (n *Argument) Accept(v NodeVisitor) {
diff --git a/pkg/ast/visitor/dump.go b/pkg/ast/visitor/dump.go
index d8160c1..7e11d72 100644
--- a/pkg/ast/visitor/dump.go
+++ b/pkg/ast/visitor/dump.go
@@ -240,16 +240,6 @@ func (v *Dump) Argument(n *ast.Argument) {
 	v.printIndentIfNotSingle(v.indent - 1)
 	v.print("&ast.Argument{\n")
 	v.printNode(n.GetNode())
-
-	if n.Variadic {
-		v.printIndent(v.indent)
-		v.print("Variadic: true,\n")
-	}
-
-	if n.IsReference {
-		v.printIndent(v.indent)
-		v.print("IsReference: true,\n")
-	}
 }
 
 func (v *Dump) StmtBreak(n *ast.StmtBreak) {
diff --git a/pkg/printer/pretty_printer.go b/pkg/printer/pretty_printer.go
index 67d4571..6caa793 100644
--- a/pkg/printer/pretty_printer.go
+++ b/pkg/printer/pretty_printer.go
@@ -465,11 +465,11 @@ func (p *PrettyPrinter) printNodeNullable(n ast.Vertex) {
 func (p *PrettyPrinter) printNodeArgument(n ast.Vertex) {
 	nn := n.(*ast.Argument)
 
-	if nn.IsReference {
+	if nn.AmpersandTkn != nil {
 		io.WriteString(p.w, "&")
 	}
 
-	if nn.Variadic {
+	if nn.VariadicTkn != nil {
 		io.WriteString(p.w, "...")
 	}
 
diff --git a/pkg/printer/printer.go b/pkg/printer/printer.go
index 2dd68a4..7f5fae5 100644
--- a/pkg/printer/printer.go
+++ b/pkg/printer/printer.go
@@ -561,12 +561,12 @@ func (p *Printer) printNodeArgument(n ast.Vertex) {
 	nn := n.(*ast.Argument)
 	p.printFreeFloating(nn, token.Start)
 
-	if nn.IsReference {
+	if nn.AmpersandTkn != nil {
 		p.write([]byte("&"))
 	}
 	p.printFreeFloating(nn, token.Ampersand)
 
-	if nn.Variadic {
+	if nn.VariadicTkn != nil {
 		p.write([]byte("..."))
 	}