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

44
php5/php5.go
View File

@@ -2943,7 +2943,7 @@ yydefault:
yyDollar = yyS[yypt-9 : yypt+1]
//line php5/php5.y:806
{
identifier := node.NewIdentifier(yyDollar[4].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[4].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[4].token))
comments.AddComments(identifier, yyDollar[4].token.Comments())
@@ -2999,7 +2999,7 @@ yydefault:
yyDollar = yyS[yypt-8 : yypt+1]
//line php5/php5.y:849
{
identifier := node.NewIdentifier(yyDollar[4].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[4].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[4].token))
comments.AddComments(identifier, yyDollar[4].token.Comments())
@@ -3462,7 +3462,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
//line php5/php5.y:1223
{
identifier := node.NewIdentifier(yyDollar[4].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[4].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[4].token))
comments.AddComments(yyVAL.node, yyDollar[4].token.Comments())
@@ -3490,7 +3490,7 @@ yydefault:
yyDollar = yyS[yypt-6 : yypt+1]
//line php5/php5.y:1249
{
identifier := node.NewIdentifier(yyDollar[4].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[4].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[4].token))
comments.AddComments(identifier, yyDollar[4].token.Comments())
@@ -3624,7 +3624,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php5/php5.y:1357
{
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))
@@ -3652,7 +3652,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line php5/php5.y:1383
{
identifier := node.NewIdentifier(yyDollar[3].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[3].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[3].token))
variable := expr.NewVariable(identifier)
@@ -3671,7 +3671,7 @@ yydefault:
yyDollar = yyS[yypt-5 : yypt+1]
//line php5/php5.y:1400
{
identifier := node.NewIdentifier(yyDollar[3].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[3].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[3].token))
variable := expr.NewVariable(identifier)
@@ -3690,7 +3690,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php5/php5.y:1417
{
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)
@@ -3709,7 +3709,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line php5/php5.y:1434
{
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)
@@ -4022,7 +4022,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line php5/php5.y:1674
{
identifier := node.NewIdentifier(yyDollar[3].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[3].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[3].token))
comments.AddComments(identifier, yyDollar[3].token.Comments())
@@ -4040,7 +4040,7 @@ yydefault:
yyDollar = yyS[yypt-5 : yypt+1]
//line php5/php5.y:1690
{
identifier := node.NewIdentifier(yyDollar[3].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[3].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[3].token))
comments.AddComments(identifier, yyDollar[3].token.Comments())
@@ -4058,7 +4058,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php5/php5.y:1706
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
comments.AddComments(identifier, yyDollar[1].token.Comments())
@@ -4076,7 +4076,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line php5/php5.y:1722
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
comments.AddComments(identifier, yyDollar[1].token.Comments())
@@ -4958,7 +4958,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line php5/php5.y:2397
{
identifier := node.NewIdentifier(yyDollar[3].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[3].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[3].token))
comments.AddComments(identifier, yyDollar[3].token.Comments())
@@ -4976,7 +4976,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
//line php5/php5.y:2413
{
identifier := node.NewIdentifier(yyDollar[4].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[4].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[4].token))
comments.AddComments(identifier, yyDollar[4].token.Comments())
@@ -4994,7 +4994,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php5/php5.y:2429
{
identifier := node.NewIdentifier(yyDollar[1].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[1].token))
comments.AddComments(identifier, yyDollar[1].token.Comments())
@@ -5012,7 +5012,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php5/php5.y:2445
{
identifier := node.NewIdentifier(yyDollar[2].token.Value)
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[2].token.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition(yyDollar[2].token))
comments.AddComments(identifier, yyDollar[2].token.Comments())
@@ -6181,7 +6181,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php5/php5.y:3365
{
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))
@@ -6457,7 +6457,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php5/php5.y:3593
{
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))
@@ -6469,7 +6469,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
//line php5/php5.y:3603
{
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))
@@ -6484,7 +6484,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line php5/php5.y:3616
{
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))
@@ -6553,7 +6553,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php5/php5.y:3675
{
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))

44
php5/php5.y
View File

@@ -804,7 +804,7 @@ catch_statement:
{ $$ = []node.Node{} }
| T_CATCH '(' fully_qualified_class_name T_VARIABLE ')' '{' inner_statement_list '}' additional_catches
{
identifier := node.NewIdentifier($4.Value)
identifier := node.NewIdentifier(strings.TrimLeft($4.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($4))
comments.AddComments(identifier, $4.Comments())
@@ -847,7 +847,7 @@ non_empty_additional_catches:
additional_catch:
T_CATCH '(' fully_qualified_class_name T_VARIABLE ')' '{' inner_statement_list '}'
{
identifier := node.NewIdentifier($4.Value)
identifier := node.NewIdentifier(strings.TrimLeft($4.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($4))
comments.AddComments(identifier, $4.Comments())
@@ -1221,7 +1221,7 @@ non_empty_parameter_list:
parameter:
optional_class_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))
comments.AddComments($$, $4.Comments())
@@ -1247,7 +1247,7 @@ parameter:
}
| optional_class_type is_reference is_variadic T_VARIABLE '=' static_scalar
{
identifier := node.NewIdentifier($4.Value)
identifier := node.NewIdentifier(strings.TrimLeft($4.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($4))
comments.AddComments(identifier, $4.Comments())
@@ -1355,7 +1355,7 @@ global_var_list:
global_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))
@@ -1381,7 +1381,7 @@ global_var:
static_var_list:
static_var_list ',' T_VARIABLE
{
identifier := node.NewIdentifier($3.Value)
identifier := node.NewIdentifier(strings.TrimLeft($3.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($3))
variable := expr.NewVariable(identifier)
@@ -1398,7 +1398,7 @@ static_var_list:
}
| static_var_list ',' T_VARIABLE '=' static_scalar
{
identifier := node.NewIdentifier($3.Value)
identifier := node.NewIdentifier(strings.TrimLeft($3.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($3))
variable := expr.NewVariable(identifier)
@@ -1415,7 +1415,7 @@ static_var_list:
}
| T_VARIABLE
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
variable := expr.NewVariable(identifier)
@@ -1432,7 +1432,7 @@ static_var_list:
}
| T_VARIABLE '=' static_scalar
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
variable := expr.NewVariable(identifier)
@@ -1672,7 +1672,7 @@ member_modifier:
class_variable_declaration:
class_variable_declaration ',' T_VARIABLE
{
identifier := node.NewIdentifier($3.Value)
identifier := node.NewIdentifier(strings.TrimLeft($3.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($3))
comments.AddComments(identifier, $3.Comments())
@@ -1688,7 +1688,7 @@ class_variable_declaration:
}
| class_variable_declaration ',' T_VARIABLE '=' static_scalar
{
identifier := node.NewIdentifier($3.Value)
identifier := node.NewIdentifier(strings.TrimLeft($3.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($3))
comments.AddComments(identifier, $3.Comments())
@@ -1704,7 +1704,7 @@ class_variable_declaration:
}
| T_VARIABLE
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
comments.AddComments(identifier, $1.Comments())
@@ -1720,7 +1720,7 @@ class_variable_declaration:
}
| T_VARIABLE '=' static_scalar
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
comments.AddComments(identifier, $1.Comments())
@@ -2395,7 +2395,7 @@ lexical_vars:
lexical_var_list:
lexical_var_list ',' T_VARIABLE
{
identifier := node.NewIdentifier($3.Value)
identifier := node.NewIdentifier(strings.TrimLeft($3.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($3))
comments.AddComments(identifier, $3.Comments())
@@ -2411,7 +2411,7 @@ lexical_var_list:
}
| lexical_var_list ',' '&' T_VARIABLE
{
identifier := node.NewIdentifier($4.Value)
identifier := node.NewIdentifier(strings.TrimLeft($4.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($4))
comments.AddComments(identifier, $4.Comments())
@@ -2427,7 +2427,7 @@ lexical_var_list:
}
| T_VARIABLE
{
identifier := node.NewIdentifier($1.Value)
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($1))
comments.AddComments(identifier, $1.Comments())
@@ -2443,7 +2443,7 @@ lexical_var_list:
}
| '&' T_VARIABLE
{
identifier := node.NewIdentifier($2.Value)
identifier := node.NewIdentifier(strings.TrimLeft($2.Value, "$"))
positions.AddPosition(identifier, positionBuilder.NewTokenPosition($2))
comments.AddComments(identifier, $2.Comments())
@@ -3364,7 +3364,7 @@ reference_variable:
compound_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))
@@ -3592,7 +3592,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))
@@ -3602,7 +3602,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))
@@ -3615,7 +3615,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))
@@ -3674,7 +3674,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))

654
php5/php5_test.go
View File

File diff suppressed because it is too large Load Diff