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

trim $ from variable name identifier

Browse Source
This commit is contained in:
z7zmey
2018-03-18 16:50:19 +02:00
parent 7e6f7e7267
commit 643027db9a
58 changed files with 1107 additions and 1107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
php7/php7.go
View File

@@ -3089,7 +3089,7 @@ yydefault:
yyDollar = yyS[yypt-9 : yypt+1]
//line php7/php7.y:691
{
identifier := node.NewIdentifier(yyDollar[5].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[5].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[5].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[5].token))
@@ -3534,7 +3534,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
//line php7/php7.y:1012
{
identifier := node.NewIdentifier(yyDollar[4].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[4].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[4].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[4].token))
@@ -3564,7 +3564,7 @@ yydefault:
yyDollar = yyS[yypt-6 : yypt+1]
//line php7/php7.y:1040
{
identifier := node.NewIdentifier(yyDollar[4].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[4].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[4].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[4].token))
@@ -3724,7 +3724,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php7/php7.y:1146
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[1].token))
@@ -3739,7 +3739,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line php7/php7.y:1159
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[1].token))
@@ -4049,7 +4049,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:1377
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[1].token))
@@ -4064,7 +4064,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
//line php7/php7.y:1390
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[1].token))
@@ -4848,7 +4848,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php7/php7.y:1958
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[1].token))
@@ -4863,7 +4863,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:1971
{
identifier := node.NewIdentifier(yyDollar[2].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[2].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[2].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[2].token))
@@ -5288,7 +5288,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php7/php7.y:2249
{
name := node.NewIdentifier(yyDollar[1].token.Value)
name := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(name, positionBuilder.NewTokenPosition(yyDollar[1].token))
yyVAL.node = expr.NewVariable(name)
positions.AddPosition(yyVAL.node, positionBuilder.NewTokenPosition(yyDollar[1].token))
@@ -5540,7 +5540,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php7/php7.y:2435
{
name := node.NewIdentifier(yyDollar[1].token.Value)
name := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(name, positionBuilder.NewTokenPosition(yyDollar[1].token))
yyVAL.node = expr.NewVariable(name)
positions.AddPosition(yyVAL.node, positionBuilder.NewTokenPosition(yyDollar[1].token))
@@ -5552,7 +5552,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
//line php7/php7.y:2445
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[1].token))
@@ -5567,7 +5567,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line php7/php7.y:2458
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition(yyDollar[1].token))
@@ -5668,7 +5668,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php7/php7.y:2543
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
yyVAL.node = expr.NewVariable(identifier)
positions.AddPosition(yyVAL.node, positionBuilder.NewTokenPosition(yyDollar[1].token))

28
php7/php7.y
View File

@@ -689,7 +689,7 @@ catch_list:
/* empty */ { $$ = []node.Node{} }
| catch_list T_CATCH '(' catch_name_list T_VARIABLE ')' '{' inner_statement_list '}'
{
identifier := node.NewIdentifier($5.Value)
identifier := node.NewIdentifier(strings.TrimLeft($5.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($5))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($5))
@@ -1010,7 +1010,7 @@ non_empty_parameter_list:
parameter:
optional_type is_reference is_variadic T_VARIABLE
{
identifier := node.NewIdentifier($4.Value)
identifier := node.NewIdentifier(strings.TrimLeft($4.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($4))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($4))
@@ -1038,7 +1038,7 @@ parameter:
}
| optional_type is_reference is_variadic T_VARIABLE '=' expr
{
identifier := node.NewIdentifier($4.Value)
identifier := node.NewIdentifier(strings.TrimLeft($4.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($4))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($4))
@@ -1144,7 +1144,7 @@ static_var_list:
static_var:
T_VARIABLE
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($1))
@@ -1157,7 +1157,7 @@ static_var:
}
| T_VARIABLE '=' expr
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($1))
@@ -1375,7 +1375,7 @@ property_list:
property:
T_VARIABLE backup_doc_comment
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($1))
@@ -1388,7 +1388,7 @@ property:
}
| T_VARIABLE '=' expr backup_doc_comment
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($1))
@@ -1956,7 +1956,7 @@ lexical_var_list:
lexical_var:
T_VARIABLE
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($1))
@@ -1969,7 +1969,7 @@ lexical_var:
}
| '&' T_VARIABLE
{
identifier := node.NewIdentifier($2.Value)
identifier := node.NewIdentifier(strings.TrimLeft($2.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($2))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($2))
@@ -2248,7 +2248,7 @@ variable:
simple_variable:
T_VARIABLE
{
name := node.NewIdentifier($1.Value)
name := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(name, positionBuilder.NewTokenPosition($1))
$$ = expr.NewVariable(name)
positions.AddPosition($$, positionBuilder.NewTokenPosition($1))
@@ -2434,7 +2434,7 @@ encaps_list:
encaps_var:
T_VARIABLE
{
name := node.NewIdentifier($1.Value)
name := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(name, positionBuilder.NewTokenPosition($1))
$$ = expr.NewVariable(name)
positions.AddPosition($$, positionBuilder.NewTokenPosition($1))
@@ -2444,7 +2444,7 @@ encaps_var:
}
| T_VARIABLE '[' encaps_var_offset ']'
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($1))
@@ -2457,7 +2457,7 @@ encaps_var:
}
| T_VARIABLE T_OBJECT_OPERATOR T_STRING
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
variable := expr.NewVariable(identifier)
positions.AddPosition(variable, positionBuilder.NewTokenPosition($1))
@@ -2542,7 +2542,7 @@ encaps_var_offset:
}
| T_VARIABLE
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
$$ = expr.NewVariable(identifier)
positions.AddPosition($$, positionBuilder.NewTokenPosition($1))

568
php7/php7_test.go
View File

File diff suppressed because it is too large Load Diff