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

#26 replace TrimLeft by TrimLeftFunc

Browse Source
This commit is contained in:
z7zmey
2018-06-10 14:53:10 +03:00
parent 339c7e5296
commit 43451a070f
6 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
php7/parser.go
View File

@@ -102,3 +102,7 @@ func lastNode(nn []node.Node) node.Node {
func firstNode(nn []node.Node) node.Node {
return nn[0]
}
func isDollar(r rune) bool {
return r == '$'
}

28
php7/php7.go
View File

@@ -3489,7 +3489,7 @@ yydefault:
yyDollar = yyS[yypt-9 : yypt+1]
//line php7/php7.y:1089
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[5].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[5].token.Value, isDollar))
variable := expr.NewVariable(identifier)
catch := stmt.NewCatch(yyDollar[4].list, variable, yyDollar[8].list)
yyVAL.list = append(yyDollar[1].list, catch)
@@ -4166,7 +4166,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
//line php7/php7.y:1694
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[4].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[4].token.Value, isDollar))
variable := expr.NewVariable(identifier)
yyVAL.node = node.NewParameter(yyDollar[1].node, variable, nil, yyDollar[2].token != nil, yyDollar[3].token != nil)
@@ -4196,7 +4196,7 @@ yydefault:
yyDollar = yyS[yypt-6 : yypt+1]
//line php7/php7.y:1722
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[4].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[4].token.Value, isDollar))
variable := expr.NewVariable(identifier)
yyVAL.node = node.NewParameter(yyDollar[1].node, variable, yyDollar[6].node, yyDollar[2].token != nil, yyDollar[3].token != nil)
@@ -4403,7 +4403,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php7/php7.y:1902
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[1].token.Value, isDollar))
variable := expr.NewVariable(identifier)
yyVAL.node = stmt.NewStaticVar(variable, nil)
@@ -4419,7 +4419,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line php7/php7.y:1916
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[1].token.Value, isDollar))
variable := expr.NewVariable(identifier)
yyVAL.node = stmt.NewStaticVar(variable, yyDollar[3].node)
@@ -4859,7 +4859,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:2303
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[1].token.Value, isDollar))
variable := expr.NewVariable(identifier)
yyVAL.node = stmt.NewProperty(variable, nil, yyDollar[2].str)
@@ -4875,7 +4875,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
//line php7/php7.y:2317
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[1].token.Value, isDollar))
variable := expr.NewVariable(identifier)
yyVAL.node = stmt.NewProperty(variable, yyDollar[3].node, yyDollar[4].str)
@@ -6023,7 +6023,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php7/php7.y:3288
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[1].token.Value, isDollar))
yyVAL.node = expr.NewVariable(identifier)
// save position
@@ -6037,7 +6037,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:3300
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[2].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[2].token.Value, isDollar))
variable := expr.NewVariable(identifier)
yyVAL.node = expr.NewReference(variable)
@@ -6596,7 +6596,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php7/php7.y:3746
{
name := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
name := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[1].token.Value, isDollar))
yyVAL.node = expr.NewVariable(name)
// save position
@@ -6942,7 +6942,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php7/php7.y:4042
{
name := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
name := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[1].token.Value, isDollar))
yyVAL.node = expr.NewVariable(name)
// save position
@@ -6956,7 +6956,7 @@ yydefault:
yyDollar = yyS[yypt-4 : yypt+1]
//line php7/php7.y:4054
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[1].token.Value, isDollar))
variable := expr.NewVariable(identifier)
yyVAL.node = expr.NewArrayDimFetch(variable, yyDollar[3].node)
@@ -6974,7 +6974,7 @@ yydefault:
yyDollar = yyS[yypt-3 : yypt+1]
//line php7/php7.y:4070
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[1].token.Value, isDollar))
variable := expr.NewVariable(identifier)
fetch := node.NewIdentifier(yyDollar[3].token.Value)
yyVAL.node = expr.NewPropertyFetch(variable, fetch)
@@ -7109,7 +7109,7 @@ yydefault:
yyDollar = yyS[yypt-1 : yypt+1]
//line php7/php7.y:4192
{
identifier := node.NewIdentifier(strings.TrimLeft(yyDollar[1].token.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc(yyDollar[1].token.Value, isDollar))
yyVAL.node = expr.NewVariable(identifier)
// save position

28
php7/php7.y
View File

@@ -1087,7 +1087,7 @@ catch_list:
{ $$ = []node.Node{} }
| catch_list T_CATCH '(' catch_name_list T_VARIABLE ')' '{' inner_statement_list '}'
{
identifier := node.NewIdentifier(strings.TrimLeft($5.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($5.Value, isDollar))
variable := expr.NewVariable(identifier)
catch := stmt.NewCatch($4, variable, $8)
$$ = append($1, catch)
@@ -1692,7 +1692,7 @@ non_empty_parameter_list:
parameter:
optional_type is_reference is_variadic T_VARIABLE
{
identifier := node.NewIdentifier(strings.TrimLeft($4.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($4.Value, isDollar))
variable := expr.NewVariable(identifier)
$$ = node.NewParameter($1, variable, nil, $2 != nil, $3 != nil)
@@ -1720,7 +1720,7 @@ parameter:
}
| optional_type is_reference is_variadic T_VARIABLE '=' expr
{
identifier := node.NewIdentifier(strings.TrimLeft($4.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($4.Value, isDollar))
variable := expr.NewVariable(identifier)
$$ = node.NewParameter($1, variable, $6, $2 != nil, $3 != nil)
@@ -1900,7 +1900,7 @@ static_var_list:
static_var:
T_VARIABLE
{
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($1.Value, isDollar))
variable := expr.NewVariable(identifier)
$$ = stmt.NewStaticVar(variable, nil)
@@ -1914,7 +1914,7 @@ static_var:
}
| T_VARIABLE '=' expr
{
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($1.Value, isDollar))
variable := expr.NewVariable(identifier)
$$ = stmt.NewStaticVar(variable, $3)
@@ -2301,7 +2301,7 @@ property_list:
property:
T_VARIABLE backup_doc_comment
{
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($1.Value, isDollar))
variable := expr.NewVariable(identifier)
$$ = stmt.NewProperty(variable, nil, $2)
@@ -2315,7 +2315,7 @@ property:
}
| T_VARIABLE '=' expr backup_doc_comment
{
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($1.Value, isDollar))
variable := expr.NewVariable(identifier)
$$ = stmt.NewProperty(variable, $3, $4)
@@ -3286,7 +3286,7 @@ lexical_var_list:
lexical_var:
T_VARIABLE
{
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($1.Value, isDollar))
$$ = expr.NewVariable(identifier)
// save position
@@ -3298,7 +3298,7 @@ lexical_var:
}
| '&' T_VARIABLE
{
identifier := node.NewIdentifier(strings.TrimLeft($2.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($2.Value, isDollar))
variable := expr.NewVariable(identifier)
$$ = expr.NewReference(variable)
@@ -3744,7 +3744,7 @@ variable:
simple_variable:
T_VARIABLE
{
name := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
name := node.NewIdentifier(strings.TrimLeftFunc($1.Value, isDollar))
$$ = expr.NewVariable(name)
// save position
@@ -4040,7 +4040,7 @@ encaps_list:
encaps_var:
T_VARIABLE
{
name := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
name := node.NewIdentifier(strings.TrimLeftFunc($1.Value, isDollar))
$$ = expr.NewVariable(name)
// save position
@@ -4052,7 +4052,7 @@ encaps_var:
}
| T_VARIABLE '[' encaps_var_offset ']'
{
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($1.Value, isDollar))
variable := expr.NewVariable(identifier)
$$ = expr.NewArrayDimFetch(variable, $3)
@@ -4068,7 +4068,7 @@ encaps_var:
}
| T_VARIABLE T_OBJECT_OPERATOR T_STRING
{
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($1.Value, isDollar))
variable := expr.NewVariable(identifier)
fetch := node.NewIdentifier($3.Value)
$$ = expr.NewPropertyFetch(variable, fetch)
@@ -4190,7 +4190,7 @@ encaps_var_offset:
}
| T_VARIABLE
{
identifier := node.NewIdentifier(strings.TrimLeft($1.Value, "$"))
identifier := node.NewIdentifier(strings.TrimLeftFunc($1.Value, isDollar))
$$ = expr.NewVariable(identifier)
// save position