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

remove Cast prefix from node names

Browse Source
This commit is contained in:
z7zmey
2018-04-05 11:59:29 +03:00
parent 37ebee14a6
commit d19b16e161
17 changed files with 172 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
php7/php7.go
View File

@@ -4657,7 +4657,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:1827
{
yyVAL.node = cast.NewCastInt(yyDollar[2].node)
yyVAL.node = cast.NewInt(yyDollar[2].node)
positions.AddPosition(yyVAL.node, positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
comments.AddComments(yyVAL.node, yyDollar[1].token.Comments())
}
@@ -4665,7 +4665,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:1833
{
yyVAL.node = cast.NewCastDouble(yyDollar[2].node)
yyVAL.node = cast.NewDouble(yyDollar[2].node)
positions.AddPosition(yyVAL.node, positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
comments.AddComments(yyVAL.node, yyDollar[1].token.Comments())
}
@@ -4673,7 +4673,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:1839
{
yyVAL.node = cast.NewCastString(yyDollar[2].node)
yyVAL.node = cast.NewString(yyDollar[2].node)
positions.AddPosition(yyVAL.node, positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
comments.AddComments(yyVAL.node, yyDollar[1].token.Comments())
}
@@ -4681,7 +4681,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:1845
{
yyVAL.node = cast.NewCastArray(yyDollar[2].node)
yyVAL.node = cast.NewArray(yyDollar[2].node)
positions.AddPosition(yyVAL.node, positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
comments.AddComments(yyVAL.node, yyDollar[1].token.Comments())
}
@@ -4689,7 +4689,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:1851
{
yyVAL.node = cast.NewCastObject(yyDollar[2].node)
yyVAL.node = cast.NewObject(yyDollar[2].node)
positions.AddPosition(yyVAL.node, positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
comments.AddComments(yyVAL.node, yyDollar[1].token.Comments())
}
@@ -4697,7 +4697,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:1857
{
yyVAL.node = cast.NewCastBool(yyDollar[2].node)
yyVAL.node = cast.NewBool(yyDollar[2].node)
positions.AddPosition(yyVAL.node, positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
comments.AddComments(yyVAL.node, yyDollar[1].token.Comments())
}
@@ -4705,7 +4705,7 @@ yydefault:
yyDollar = yyS[yypt-2 : yypt+1]
//line php7/php7.y:1863
{
yyVAL.node = cast.NewCastUnset(yyDollar[2].node)
yyVAL.node = cast.NewUnset(yyDollar[2].node)
positions.AddPosition(yyVAL.node, positionBuilder.NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))
comments.AddComments(yyVAL.node, yyDollar[1].token.Comments())
}

14
php7/php7.y
View File

@@ -1825,43 +1825,43 @@ expr_without_variable:
| internal_functions_in_yacc { $$ = $1}
| T_INT_CAST expr
{
$$ = cast.NewCastInt($2)
$$ = cast.NewInt($2)
positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
comments.AddComments($$, $1.Comments())
}
| T_DOUBLE_CAST expr
{
$$ = cast.NewCastDouble($2)
$$ = cast.NewDouble($2)
positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
comments.AddComments($$, $1.Comments())
}
| T_STRING_CAST expr
{
$$ = cast.NewCastString($2)
$$ = cast.NewString($2)
positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
comments.AddComments($$, $1.Comments())
}
| T_ARRAY_CAST expr
{
$$ = cast.NewCastArray($2)
$$ = cast.NewArray($2)
positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
comments.AddComments($$, $1.Comments())
}
| T_OBJECT_CAST expr
{
$$ = cast.NewCastObject($2)
$$ = cast.NewObject($2)
positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
comments.AddComments($$, $1.Comments())
}
| T_BOOL_CAST expr
{
$$ = cast.NewCastBool($2)
$$ = cast.NewBool($2)
positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
comments.AddComments($$, $1.Comments())
}
| T_UNSET_CAST expr
{
$$ = cast.NewCastUnset($2)
$$ = cast.NewUnset($2)
positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
comments.AddComments($$, $1.Comments())
}

20
php7/php7_test.go
View File

@@ -2678,52 +2678,52 @@ CAD;
},
},
&stmt.Expression{
Expr: &cast.CastArray{
Expr: &cast.Array{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
&stmt.Expression{
Expr: &cast.CastBool{
Expr: &cast.Bool{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
&stmt.Expression{
Expr: &cast.CastBool{
Expr: &cast.Bool{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
&stmt.Expression{
Expr: &cast.CastDouble{
Expr: &cast.Double{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
&stmt.Expression{
Expr: &cast.CastDouble{
Expr: &cast.Double{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
&stmt.Expression{
Expr: &cast.CastInt{
Expr: &cast.Int{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
&stmt.Expression{
Expr: &cast.CastInt{
Expr: &cast.Int{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
&stmt.Expression{
Expr: &cast.CastObject{
Expr: &cast.Object{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
&stmt.Expression{
Expr: &cast.CastString{
Expr: &cast.String{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},
&stmt.Expression{
Expr: &cast.CastUnset{
Expr: &cast.Unset{
Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}},
},
},