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

[refactoring] update ast structure of "Root" and "Class" nodes

Browse Source
This commit is contained in:
Vadym Slizov
2020-12-04 11:02:38 +02:00
parent d19b3f609e
commit df1626b7dc
11 changed files with 1098 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1053
internal/php5/php5.go generated
View File

File diff suppressed because it is too large Load Diff

11
internal/php5/php5.y
View File

@@ -267,10 +267,13 @@ import (
start:
top_statement_list
{
yylex.(*Parser).rootNode = &ast.Root{ast.Node{}, $1}
yylex.(*Parser).rootNode.GetNode().Position = position.NewNodeListPosition($1)
yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.SkippedTokens)
yylex.(*Parser).rootNode = &ast.Root{
Node: ast.Node{
Position: position.NewNodeListPosition($1),
},
Stmts: $1,
EndTkn: yylex.(*Parser).currentToken,
}
}
;

1015
internal/php7/php7.go generated
View File

File diff suppressed because it is too large Load Diff

29
internal/php7/php7.y
View File

@@ -288,12 +288,13 @@ import (
start:
top_statement_list
{
yylex.(*Parser).rootNode = &ast.Root{ast.Node{}, $1}
// save position
yylex.(*Parser).rootNode.GetNode().Position = position.NewNodeListPosition($1)
yylex.(*Parser).setFreeFloating(yylex.(*Parser).rootNode, token.End, yylex.(*Parser).currentToken.SkippedTokens)
yylex.(*Parser).rootNode = &ast.Root{
Node: ast.Node{
Position: position.NewNodeListPosition($1),
},
Stmts: $1,
EndTkn: yylex.(*Parser).currentToken,
}
}
;
@@ -2754,13 +2755,15 @@ anonymous_class:
Node: ast.Node{
Position: position.NewTokensPosition($1, $8),
},
ClassTkn: $1,
ArgumentList: $2,
Extends: $3,
Implements: $4,
OpenCurlyBracket: $6,
Stmts: $7,
CloseCurlyBracket: $8,
ClassTkn: $1,
OpenParenthesisTkn: $2.(*ast.ArgumentList).OpenParenthesisTkn,
Arguments: $2.(*ast.ArgumentList).Arguments,
CloseParenthesisTkn: $2.(*ast.ArgumentList).OpenParenthesisTkn,
Extends: $3,
Implements: $4,
OpenCurlyBracket: $6,
Stmts: $7,
CloseCurlyBracket: $8,
}
}
;