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

[refactoring] update ast structure of "Yield", "YieldFrom" and "Cast" nodes

Browse Source
This commit is contained in:
Vadym Slizov
2020-12-04 09:42:45 +02:00
parent 01d695c416
commit 5a6418e853
5 changed files with 1076 additions and 1092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1151
internal/php7/php7.go generated
View File

File diff suppressed because it is too large Load Diff

163
internal/php7/php7.y
View File

@@ -3455,80 +3455,73 @@ expr_without_variable:
}
| T_INT_CAST expr
{
$$ = &ast.ExprCastInt{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokenNodePosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.Cast, $1.SkippedTokens)
$$ = &ast.ExprCastInt{
Node: ast.Node{
Position: position.NewTokenNodePosition($1, $2),
},
CastTkn: $1,
Expr: $2,
}
}
| T_DOUBLE_CAST expr
{
$$ = &ast.ExprCastDouble{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokenNodePosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.Cast, $1.SkippedTokens)
$$ = &ast.ExprCastDouble{
Node: ast.Node{
Position: position.NewTokenNodePosition($1, $2),
},
CastTkn: $1,
Expr: $2,
}
}
| T_STRING_CAST expr
{
$$ = &ast.ExprCastString{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokenNodePosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.Cast, $1.SkippedTokens)
$$ = &ast.ExprCastString{
Node: ast.Node{
Position: position.NewTokenNodePosition($1, $2),
},
CastTkn: $1,
Expr: $2,
}
}
| T_ARRAY_CAST expr
{
$$ = &ast.ExprCastArray{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokenNodePosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.Cast, $1.SkippedTokens)
$$ = &ast.ExprCastArray{
Node: ast.Node{
Position: position.NewTokenNodePosition($1, $2),
},
CastTkn: $1,
Expr: $2,
}
}
| T_OBJECT_CAST expr
{
$$ = &ast.ExprCastObject{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokenNodePosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.Cast, $1.SkippedTokens)
$$ = &ast.ExprCastObject{
Node: ast.Node{
Position: position.NewTokenNodePosition($1, $2),
},
CastTkn: $1,
Expr: $2,
}
}
| T_BOOL_CAST expr
{
$$ = &ast.ExprCastBool{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokenNodePosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.Cast, $1.SkippedTokens)
$$ = &ast.ExprCastBool{
Node: ast.Node{
Position: position.NewTokenNodePosition($1, $2),
},
CastTkn: $1,
Expr: $2,
}
}
| T_UNSET_CAST expr
{
$$ = &ast.ExprCastUnset{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokenNodePosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setToken($$, token.Cast, $1.SkippedTokens)
$$ = &ast.ExprCastUnset{
Node: ast.Node{
Position: position.NewTokenNodePosition($1, $2),
},
CastTkn: $1,
Expr: $2,
}
}
| T_EXIT exit_expr
{
@@ -3584,44 +3577,44 @@ expr_without_variable:
}
| T_YIELD
{
$$ = &ast.ExprYield{ast.Node{}, nil, nil}
// save position
$$.GetNode().Position = position.NewTokenPosition($1)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
$$ = &ast.ExprYield{
Node: ast.Node{
Position: position.NewTokenPosition($1),
},
YieldTkn: $1,
}
}
| T_YIELD expr
{
$$ = &ast.ExprYield{ast.Node{}, nil, $2}
// save position
$$.GetNode().Position = position.NewTokenNodePosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
$$ = &ast.ExprYield{
Node: ast.Node{
Position: position.NewTokenNodePosition($1, $2),
},
YieldTkn: $1,
Value: $2,
}
}
| T_YIELD expr T_DOUBLE_ARROW expr
{
$$ = &ast.ExprYield{ast.Node{}, $2, $4}
// save position
$$.GetNode().Position = position.NewTokenNodePosition($1, $4)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
yylex.(*Parser).setFreeFloating($$, token.Expr, $3.SkippedTokens)
$$ = &ast.ExprYield{
Node: ast.Node{
Position: position.NewTokenNodePosition($1, $4),
},
YieldTkn: $1,
Key: $2,
DoubleArrowTkn: $3,
Value: $4,
}
}
| T_YIELD_FROM expr
{
$$ = &ast.ExprYieldFrom{ast.Node{}, $2}
// save position
$$.GetNode().Position = position.NewTokenNodePosition($1, $2)
// save comments
yylex.(*Parser).setFreeFloating($$, token.Start, $1.SkippedTokens)
$$ = &ast.ExprYieldFrom{
Node: ast.Node{
Position: position.NewTokenNodePosition($1, $2),
},
YieldFromTkn: $1,
Expr: $2,
}
}
| inline_function
{