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

[refactoring] update "ParserBrackets" nodes

Browse Source
This commit is contained in:
Vadym Slizov 2020-12-04 12:58:56 +02:00
parent ea3c5298e2
commit af968a7c3b
No known key found for this signature in database
GPG Key ID: AEA2A9388EF42A4A
2 changed files with 41 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
internal/php5/php5.y
View File

@ -3691,11 +3691,14 @@ expr_without_variable:
}
| '(' new_expr ')' instance_call
{
$$ = $2
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.SkippedTokens, $$.GetNode().Tokens[token.Start]...))
yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.SkippedTokens...))
$$ = &ast.ParserBrackets{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
OpenBracketTkn: $1,
Child: $2,
CloseBracketTkn: $3,
}
for _, n := range($4) {
switch nn := n.(type) {
@ -4405,8 +4408,7 @@ dynamic_class_name_reference:
{
$$ = $1
// save comments
yylex.(*Parser).setFreeFloating($3[0], token.Var, $2.SkippedTokens)
$3[0].(*ast.ExprPropertyFetch).ObjectOperatorTkn = $2
for _, n := range($3) {
switch nn := n.(type) {
@ -4482,10 +4484,6 @@ exit_expr:
OpenBracketTkn: $1,
CloseBracketTkn: $2,
}
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, $2.SkippedTokens)
}
| parenthesis_expr
{
@ -5141,11 +5139,14 @@ static_operation:
}
| '(' static_scalar_value ')'
{
$$ = $2
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.SkippedTokens, $$.GetNode().Tokens[token.Start]...))
yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.SkippedTokens...))
$$ = &ast.ParserBrackets{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
OpenBracketTkn: $1,
Child: $2,
CloseBracketTkn: $3,
}
}
;
@ -5373,10 +5374,6 @@ parenthesis_expr:
Child: $2,
CloseBracketTkn: $3,
}
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.SkippedTokens)
}
| '(' yield_expr ')'
{
@ -5388,10 +5385,6 @@ parenthesis_expr:
Child: $2,
CloseBracketTkn: $3,
}
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.SkippedTokens)
}
;
@ -5872,14 +5865,14 @@ variable_name:
}
| '{' expr '}'
{
$$ = $2
// save position
$$.GetNode().Position = position.NewTokensPosition($1, $3)
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.SkippedTokens, $$.GetNode().Tokens[token.Start]...))
yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.SkippedTokens...))
$$ = &ast.ParserBrackets{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
OpenBracketTkn: $1,
Child: $2,
CloseBracketTkn: $3,
}
}
;

42
internal/php7/php7.y
View File

@ -3371,10 +3371,6 @@ expr_without_variable:
Child: $2,
CloseBracketTkn: $3,
}
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.SkippedTokens)
}
| new_expr
{
@ -3835,10 +3831,6 @@ exit_expr:
Child: $2,
CloseBracketTkn: $3,
}
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.SkippedTokens)
}
;
@ -4166,10 +4158,6 @@ dereferencable:
Child: $2,
CloseBracketTkn: $3,
}
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.SkippedTokens)
}
| dereferencable_scalar
{
@ -4192,10 +4180,6 @@ callable_expr:
Child: $2,
CloseBracketTkn: $3,
}
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloatingTokens($$, token.End, $3.SkippedTokens)
}
| dereferencable_scalar
{
@ -4434,11 +4418,14 @@ member_name:
}
| '{' expr '}'
{
$$ = $2;
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.SkippedTokens, $$.GetNode().Tokens[token.Start]...))
yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.SkippedTokens...))
$$ = &ast.ParserBrackets{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
OpenBracketTkn: $1,
Child: $2,
CloseBracketTkn: $3,
}
}
| simple_variable
{
@ -4459,11 +4446,14 @@ property_name:
}
| '{' expr '}'
{
$$ = $2;
// save comments
yylex.(*Parser).setFreeFloatingTokens($$, token.Start, append($1.SkippedTokens, $$.GetNode().Tokens[token.Start]...))
yylex.(*Parser).setFreeFloatingTokens($$, token.End, append($$.GetNode().Tokens[token.End], $3.SkippedTokens...))
$$ = &ast.ParserBrackets{
Node: ast.Node{
Position: position.NewTokensPosition($1, $3),
},
OpenBracketTkn: $1,
Child: $2,
CloseBracketTkn: $3,
}
}
| simple_variable
{