From c32f5bd29b7b7b4e5769d8109dd3f6c8c0cb4d3e Mon Sep 17 00:00:00 2001 From: Vadym Slizov Date: Fri, 11 Dec 2020 17:34:29 +0200 Subject: [PATCH] [refactoring] remove Alt flags --- internal/php5/php5.go | Bin 264908 -> 264694 bytes internal/php5/php5.y | 17 ++++------------- internal/php7/php7.go | Bin 219381 -> 219167 bytes internal/php7/php7.y | 17 ++++------------- pkg/ast/node.go | 8 -------- 5 files changed, 8 insertions(+), 34 deletions(-) diff --git a/internal/php5/php5.go b/internal/php5/php5.go index 6dd0b6554b8c461c03ad75f9c75fb816d7f5ef68..0d1325e150b05928ca6e0a2a4e5c9e9c74a6ba29 100644 GIT binary patch delta 8283 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 T!fo?QYGaT6fg{wUxh3@fV-^*m delta 8461 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 MC*=#?Qb=h$xCy0*D1% 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 diff --git a/internal/php7/php7.y b/internal/php7/php7.y index b69d0a3..4b5c149 100644 --- a/internal/php7/php7.y +++ b/internal/php7/php7.y @@ -459,10 +459,10 @@ top_statement: { $$ = &ast.StmtNamespace{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), - NsTkn: $1, - OpenCurlyBracketTkn: $2, - Stmts: $3, - CloseCurlyBracket: $4, + NsTkn: $1, + OpenCurlyBracketTkn: $2, + Stmts: $3, + CloseCurlyBracketTkn: $4, } } | T_USE mixed_group_use_declaration ';' @@ -1382,7 +1382,6 @@ for_statement: { $$ = &ast.StmtFor{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), - Alt: true, ColonTkn: $1, Stmt: &ast.StmtStmtList{ Position: yylex.(*Parser).builder.NewNodeListPosition($2), @@ -1406,7 +1405,6 @@ foreach_statement: { $$ = &ast.StmtForeach{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), - Alt: true, ColonTkn: $1, Stmt: &ast.StmtStmtList{ Position: yylex.(*Parser).builder.NewNodeListPosition($2), @@ -1430,7 +1428,6 @@ declare_statement: { $$ = &ast.StmtDeclare{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), - Alt: true, ColonTkn: $1, Stmt: &ast.StmtStmtList{ Position: yylex.(*Parser).builder.NewNodeListPosition($2), @@ -1466,7 +1463,6 @@ switch_case_list: { $$ = &ast.StmtSwitch{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), - Alt: true, ColonTkn: $1, CaseList: $2, EndSwitchTkn: $3, @@ -1477,7 +1473,6 @@ switch_case_list: { $$ = &ast.StmtSwitch{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $5), - Alt: true, ColonTkn: $1, CaseSeparatorTkn: $2, CaseList: $3, @@ -1536,7 +1531,6 @@ while_statement: { $$ = &ast.StmtWhile{ Position: yylex.(*Parser).builder.NewTokensPosition($1, $4), - Alt: true, ColonTkn: $1, Stmt: &ast.StmtStmtList{ Position: yylex.(*Parser).builder.NewNodeListPosition($2), @@ -1601,7 +1595,6 @@ alt_if_stmt_without_else: { $$ = &ast.StmtIf{ Position: yylex.(*Parser).builder.NewTokenNodeListPosition($1, $6), - Alt: true, IfTkn: $1, OpenParenthesisTkn: $2, Cond: $3, @@ -1617,7 +1610,6 @@ alt_if_stmt_without_else: { $1.(*ast.StmtIf).ElseIf = append($1.(*ast.StmtIf).ElseIf, &ast.StmtElseIf{ Position: yylex.(*Parser).builder.NewTokenNodeListPosition($2, $7), - Alt: true, ElseIfTkn: $2, OpenParenthesisTkn: $3, Cond: $4, @@ -1646,7 +1638,6 @@ alt_if_stmt: { $1.(*ast.StmtIf).Else = &ast.StmtElse{ Position: yylex.(*Parser).builder.NewTokenNodeListPosition($2, $4), - Alt: true, ElseTkn: $2, ColonTkn: $3, Stmt: &ast.StmtStmtList{ diff --git a/pkg/ast/node.go b/pkg/ast/node.go index 7ba8fc6..7497f9a 100644 --- a/pkg/ast/node.go +++ b/pkg/ast/node.go @@ -398,7 +398,6 @@ func (n *StmtContinue) GetPosition() *position.Position { // StmtDeclare node type StmtDeclare struct { Position *position.Position - Alt bool DeclareTkn *token.Token OpenParenthesisTkn *token.Token Consts []Vertex @@ -474,7 +473,6 @@ func (n *StmtEcho) GetPosition() *position.Position { // StmtElse node type StmtElse struct { Position *position.Position - Alt bool ElseTkn *token.Token ColonTkn *token.Token Stmt Vertex @@ -491,7 +489,6 @@ func (n *StmtElse) GetPosition() *position.Position { // StmtElseIf node type StmtElseIf struct { Position *position.Position - Alt bool ElseIfTkn *token.Token OpenParenthesisTkn *token.Token Cond Vertex @@ -543,7 +540,6 @@ func (n *StmtFinally) GetPosition() *position.Position { // StmtFor node type StmtFor struct { Position *position.Position - Alt bool ForTkn *token.Token OpenParenthesisTkn *token.Token Init []Vertex @@ -572,7 +568,6 @@ func (n *StmtFor) GetPosition() *position.Position { // StmtForeach node type StmtForeach struct { Position *position.Position - Alt bool ForeachTkn *token.Token OpenParenthesisTkn *token.Token Expr Vertex @@ -673,7 +668,6 @@ func (n *StmtHaltCompiler) GetPosition() *position.Position { // StmtIf node type StmtIf struct { Position *position.Position - Alt bool IfTkn *token.Token OpenParenthesisTkn *token.Token Cond Vertex @@ -894,7 +888,6 @@ func (n *StmtStmtList) GetPosition() *position.Position { // StmtSwitch node type StmtSwitch struct { Position *position.Position - Alt bool SwitchTkn *token.Token OpenParenthesisTkn *token.Token Cond Vertex @@ -1137,7 +1130,6 @@ func (n *StmtUseDeclaration) GetPosition() *position.Position { // StmtWhile node type StmtWhile struct { Position *position.Position - Alt bool WhileTkn *token.Token OpenParenthesisTkn *token.Token Cond Vertex