From 643027db9ad599a0ed64adb08e466028c7d86a6a Mon Sep 17 00:00:00 2001 From: z7zmey Date: Sun, 18 Mar 2018 16:50:19 +0200 Subject: [PATCH] trim $ from variable name identifier --- node/expr/assign/t_assign_op_test.go | 62 +- node/expr/assign/t_visitor_test.go | 56 +- node/expr/binary/t_binary_op_test.go | 108 ++-- node/expr/binary/t_visitor_test.go | 108 ++-- node/expr/cast/t_cast_test.go | 20 +- node/expr/cast/t_visitor_test.go | 14 +- node/expr/t_array_dim_fetch_test.go | 4 +- node/expr/t_array_test.go | 2 +- node/expr/t_bitwise_not_test.go | 2 +- node/expr/t_boolean_not_test.go | 2 +- node/expr/t_clone_test.go | 4 +- node/expr/t_closure_test.go | 16 +- node/expr/t_empty_test.go | 2 +- node/expr/t_error_supress_test.go | 2 +- node/expr/t_eval_test.go | 2 +- node/expr/t_exit_test.go | 4 +- node/expr/t_function_call_test.go | 4 +- node/expr/t_inc_dec_test.go | 8 +- node/expr/t_include_test.go | 8 +- node/expr/t_instance_of_test.go | 6 +- node/expr/t_isset_test.go | 6 +- node/expr/t_list_test.go | 14 +- node/expr/t_method_call_test.go | 2 +- node/expr/t_new_test.go | 4 +- node/expr/t_print_test.go | 2 +- node/expr/t_property_fetch_test.go | 2 +- node/expr/t_shell_exec_test.go | 2 +- node/expr/t_short_array_test.go | 2 +- node/expr/t_short_list_test.go | 12 +- node/expr/t_static_call_test.go | 6 +- node/expr/t_static_property_fetch_test.go | 6 +- node/expr/t_ternary_test.go | 30 +- node/expr/t_unary_test.go | 4 +- node/expr/t_variable_test.go | 4 +- node/expr/t_visitor_test.go | 68 +-- node/expr/t_yield_test.go | 10 +- node/scalar/t_encapsed_test.go | 6 +- node/stmt/t_alt_if_test.go | 14 +- node/stmt/t_echo_test.go | 4 +- node/stmt/t_for_test.go | 12 +- node/stmt/t_foreach_test.go | 32 +- node/stmt/t_function_test.go | 6 +- node/stmt/t_global_test.go | 8 +- node/stmt/t_if_test.go | 20 +- node/stmt/t_property_list_test.go | 10 +- node/stmt/t_static_var_test.go | 10 +- node/stmt/t_throw_test.go | 2 +- node/stmt/t_try_catch_finnaly_test.go | 16 +- node/stmt/t_unset_test.go | 10 +- node/t_node_test.go | 74 +-- php5/php5.go | 44 +- php5/php5.y | 44 +- php5/php5_test.go | 654 +++++++++++----------- php7/php7.go | 28 +- php7/php7.y | 28 +- php7/php7_test.go | 568 +++++++++---------- visitor/dumper_test.go | 4 +- visitor/namespace_resolver_test.go | 12 +- 58 files changed, 1107 insertions(+), 1107 deletions(-) diff --git a/node/expr/assign/t_assign_op_test.go b/node/expr/assign/t_assign_op_test.go index 1156592..684b8f7 100644 --- a/node/expr/assign/t_assign_op_test.go +++ b/node/expr/assign/t_assign_op_test.go @@ -36,8 +36,8 @@ func TestAssignRef(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.AssignRef{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -57,7 +57,7 @@ func TestAssignRefNew(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.AssignRef{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expression: &expr.New{ Class: &name.Name{ Parts: []node.Node{ @@ -84,7 +84,7 @@ func TestAssignRefArgs(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.AssignRef{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expression: &expr.New{ Class: &name.Name{ Parts: []node.Node{ @@ -95,7 +95,7 @@ func TestAssignRefArgs(t *testing.T) { &node.Argument{ Variadic: false, IsReference: false, - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -118,8 +118,8 @@ func TestAssign(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.Assign{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -139,8 +139,8 @@ func TestBitwiseAnd(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.BitwiseAnd{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -160,8 +160,8 @@ func TestBitwiseOr(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.BitwiseOr{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -181,8 +181,8 @@ func TestBitwiseXor(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.BitwiseXor{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -202,8 +202,8 @@ func TestConcat(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.Concat{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -223,8 +223,8 @@ func TestDiv(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.Div{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -244,8 +244,8 @@ func TestMinus(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.Minus{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -265,8 +265,8 @@ func TestMod(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.Mod{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -286,8 +286,8 @@ func TestMul(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.Mul{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -307,8 +307,8 @@ func TestPlus(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.Plus{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -328,8 +328,8 @@ func TestPow(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.Pow{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -349,8 +349,8 @@ func TestShiftLeft(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.ShiftLeft{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -370,8 +370,8 @@ func TestShiftRight(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &assign.ShiftRight{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/node/expr/assign/t_visitor_test.go b/node/expr/assign/t_visitor_test.go index deb8d7a..cb98b17 100644 --- a/node/expr/assign/t_visitor_test.go +++ b/node/expr/assign/t_visitor_test.go @@ -20,112 +20,112 @@ var nodesToTest = []struct { }{ { &assign.AssignRef{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.Assign{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.BitwiseAnd{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.BitwiseOr{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.BitwiseXor{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.Concat{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.Div{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.Minus{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.Mod{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.Mul{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.Plus{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.Pow{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.ShiftLeft{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, }, { &assign.ShiftRight{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Variable", "Expression"}, map[string]interface{}{}, diff --git a/node/expr/binary/t_binary_op_test.go b/node/expr/binary/t_binary_op_test.go index c804b32..77c0930 100644 --- a/node/expr/binary/t_binary_op_test.go +++ b/node/expr/binary/t_binary_op_test.go @@ -34,8 +34,8 @@ func TestBitwiseAnd(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.BitwiseAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -55,8 +55,8 @@ func TestBitwiseOr(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.BitwiseOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -76,8 +76,8 @@ func TestBitwiseXor(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.BitwiseXor{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -97,8 +97,8 @@ func TestBooleanAnd(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.BooleanAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -118,8 +118,8 @@ func TestBooleanOr(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.BooleanOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -139,8 +139,8 @@ func TestCoalesce(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Coalesce{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -157,8 +157,8 @@ func TestConcat(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Concat{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -178,8 +178,8 @@ func TestDiv(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Div{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -199,8 +199,8 @@ func TestEqual(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Equal{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -220,8 +220,8 @@ func TestGreaterOrEqual(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.GreaterOrEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -241,8 +241,8 @@ func TestGreater(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Greater{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -262,8 +262,8 @@ func TestIdentical(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Identical{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -283,8 +283,8 @@ func TestLogicalAnd(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.LogicalAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -304,8 +304,8 @@ func TestLogicalOr(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.LogicalOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -325,8 +325,8 @@ func TestLogicalXor(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.LogicalXor{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -346,8 +346,8 @@ func TestMinus(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Minus{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -367,8 +367,8 @@ func TestMod(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Mod{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -388,8 +388,8 @@ func TestMul(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Mul{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -409,8 +409,8 @@ func TestNotEqual(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.NotEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -430,8 +430,8 @@ func TestNotIdentical(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.NotIdentical{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -451,8 +451,8 @@ func TestPlus(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Plus{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -472,8 +472,8 @@ func TestPow(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Pow{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -493,8 +493,8 @@ func TestShiftLeft(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.ShiftLeft{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -514,8 +514,8 @@ func TestShiftRight(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.ShiftRight{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -535,8 +535,8 @@ func TestSmallerOrEqual(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.SmallerOrEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -556,8 +556,8 @@ func TestSmaller(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Smaller{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -577,8 +577,8 @@ func TestSpaceship(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &binary.Spaceship{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/node/expr/binary/t_visitor_test.go b/node/expr/binary/t_visitor_test.go index 72749c7..868bddf 100644 --- a/node/expr/binary/t_visitor_test.go +++ b/node/expr/binary/t_visitor_test.go @@ -19,216 +19,216 @@ var nodesToTest = []struct { }{ { &binary.BitwiseAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.BitwiseOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.BitwiseXor{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.BooleanAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.BooleanOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Coalesce{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Concat{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Div{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Equal{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.GreaterOrEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Greater{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Identical{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.LogicalAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.LogicalOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.LogicalXor{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Minus{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Mod{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Mul{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.NotEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.NotIdentical{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Plus{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Pow{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.ShiftLeft{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.ShiftRight{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.SmallerOrEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Smaller{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, }, { &binary.Spaceship{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Left", "Right"}, map[string]interface{}{}, diff --git a/node/expr/cast/t_cast_test.go b/node/expr/cast/t_cast_test.go index ba64952..cdbc724 100644 --- a/node/expr/cast/t_cast_test.go +++ b/node/expr/cast/t_cast_test.go @@ -34,7 +34,7 @@ func TestCastArray(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &cast.CastArray{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -54,7 +54,7 @@ func TestCastBool(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &cast.CastBool{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -74,7 +74,7 @@ func TestCastBoolShort(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &cast.CastBool{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -94,7 +94,7 @@ func TestCastDouble(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &cast.CastDouble{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -114,7 +114,7 @@ func TestCastFloat(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &cast.CastDouble{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -134,7 +134,7 @@ func TestCastInt(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &cast.CastInt{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -154,7 +154,7 @@ func TestCastIntShort(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &cast.CastInt{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -174,7 +174,7 @@ func TestCastObject(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &cast.CastObject{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -194,7 +194,7 @@ func TestCastString(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &cast.CastString{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -214,7 +214,7 @@ func TestCastUnset(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &cast.CastUnset{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/cast/t_visitor_test.go b/node/expr/cast/t_visitor_test.go index 198f36b..06074e6 100644 --- a/node/expr/cast/t_visitor_test.go +++ b/node/expr/cast/t_visitor_test.go @@ -19,49 +19,49 @@ var nodesToTest = []struct { }{ { &cast.CastArray{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &cast.CastBool{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &cast.CastDouble{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &cast.CastInt{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &cast.CastObject{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &cast.CastString{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &cast.CastUnset{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, diff --git a/node/expr/t_array_dim_fetch_test.go b/node/expr/t_array_dim_fetch_test.go index ce58542..a170528 100644 --- a/node/expr/t_array_dim_fetch_test.go +++ b/node/expr/t_array_dim_fetch_test.go @@ -35,7 +35,7 @@ func TestArrayDimFetch(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Dim: &scalar.Lnumber{Value: "1"}, }, }, @@ -57,7 +57,7 @@ func TestArrayDimFetchNested(t *testing.T) { &stmt.Expression{ Expr: &expr.ArrayDimFetch{ Variable: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Dim: &scalar.Lnumber{Value: "1"}, }, Dim: &scalar.Lnumber{Value: "2"}, diff --git a/node/expr/t_array_test.go b/node/expr/t_array_test.go index 992752e..38ca304 100644 --- a/node/expr/t_array_test.go +++ b/node/expr/t_array_test.go @@ -74,7 +74,7 @@ func TestArrayItems(t *testing.T) { }, &expr.ArrayItem{ ByRef: true, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/node/expr/t_bitwise_not_test.go b/node/expr/t_bitwise_not_test.go index da8be71..8d9572f 100644 --- a/node/expr/t_bitwise_not_test.go +++ b/node/expr/t_bitwise_not_test.go @@ -19,7 +19,7 @@ func TestBitwiseNot(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.BitwiseNot{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_boolean_not_test.go b/node/expr/t_boolean_not_test.go index e8c0976..dfe4ad6 100644 --- a/node/expr/t_boolean_not_test.go +++ b/node/expr/t_boolean_not_test.go @@ -19,7 +19,7 @@ func TestBooleanNot(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.BooleanNot{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_clone_test.go b/node/expr/t_clone_test.go index 5f2219d..242c7a1 100644 --- a/node/expr/t_clone_test.go +++ b/node/expr/t_clone_test.go @@ -19,7 +19,7 @@ func TestCloneBrackets(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Clone{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -39,7 +39,7 @@ func TestClone(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Clone{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_closure_test.go b/node/expr/t_closure_test.go index 77254d3..af6851a 100644 --- a/node/expr/t_closure_test.go +++ b/node/expr/t_closure_test.go @@ -52,22 +52,22 @@ func TestClosureUse(t *testing.T) { &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, Uses: []node.Node{ &expr.ClosureUse{ ByRef: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, &expr.ClosureUse{ ByRef: true, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, }, }, Stmts: []node.Node{}, @@ -97,22 +97,22 @@ func TestClosureUse2(t *testing.T) { &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, Uses: []node.Node{ &expr.ClosureUse{ ByRef: true, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, &expr.ClosureUse{ ByRef: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, }, }, Stmts: []node.Node{}, diff --git a/node/expr/t_empty_test.go b/node/expr/t_empty_test.go index 372c27b..d5e89bb 100644 --- a/node/expr/t_empty_test.go +++ b/node/expr/t_empty_test.go @@ -19,7 +19,7 @@ func TestEmpty(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Empty{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_error_supress_test.go b/node/expr/t_error_supress_test.go index 594746d..1723ca1 100644 --- a/node/expr/t_error_supress_test.go +++ b/node/expr/t_error_supress_test.go @@ -19,7 +19,7 @@ func TestErrorSuppress(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.ErrorSuppress{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_eval_test.go b/node/expr/t_eval_test.go index 4db79e4..1defb53 100644 --- a/node/expr/t_eval_test.go +++ b/node/expr/t_eval_test.go @@ -19,7 +19,7 @@ func TestEval(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Eval{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_exit_test.go b/node/expr/t_exit_test.go index 9f4ee48..6f6e81d 100644 --- a/node/expr/t_exit_test.go +++ b/node/expr/t_exit_test.go @@ -37,7 +37,7 @@ func TestExitExpr(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Exit{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -75,7 +75,7 @@ func TestDieExpr(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Die{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_function_call_test.go b/node/expr/t_function_call_test.go index 1916904..7a2b9cb 100644 --- a/node/expr/t_function_call_test.go +++ b/node/expr/t_function_call_test.go @@ -104,13 +104,13 @@ func TestFunctionCallVar(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.FunctionCall{ - Function: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Function: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Arguments: []node.Node{ &node.Argument{ Variadic: false, IsReference: false, Expr: &expr.Yield{ - Value: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Value: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_inc_dec_test.go b/node/expr/t_inc_dec_test.go index 8b4dcc6..d139ecb 100644 --- a/node/expr/t_inc_dec_test.go +++ b/node/expr/t_inc_dec_test.go @@ -19,7 +19,7 @@ func TestPostDec(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.PostDec{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -39,7 +39,7 @@ func TestPostInc(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -59,7 +59,7 @@ func TestPreDec(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.PreDec{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -79,7 +79,7 @@ func TestPreInc(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.PreInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_include_test.go b/node/expr/t_include_test.go index 7527514..5ba3155 100644 --- a/node/expr/t_include_test.go +++ b/node/expr/t_include_test.go @@ -19,7 +19,7 @@ func TestInclude(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Include{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -39,7 +39,7 @@ func TestIncludeOnce(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.IncludeOnce{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -59,7 +59,7 @@ func TestRequire(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Require{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -79,7 +79,7 @@ func TestRequireOnce(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.RequireOnce{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_instance_of_test.go b/node/expr/t_instance_of_test.go index 58aca44..651fcab 100644 --- a/node/expr/t_instance_of_test.go +++ b/node/expr/t_instance_of_test.go @@ -21,7 +21,7 @@ func TestInstanceOf(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Class: &name.Name{ Parts: []node.Node{ &name.NamePart{Value: "Foo"}, @@ -46,7 +46,7 @@ func TestInstanceOfRelative(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Class: &name.Relative{ Parts: []node.Node{ &name.NamePart{Value: "Foo"}, @@ -71,7 +71,7 @@ func TestInstanceOfFullyQualified(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Class: &name.FullyQualified{ Parts: []node.Node{ &name.NamePart{Value: "Foo"}, diff --git a/node/expr/t_isset_test.go b/node/expr/t_isset_test.go index 4fe5394..38f80ff 100644 --- a/node/expr/t_isset_test.go +++ b/node/expr/t_isset_test.go @@ -20,7 +20,7 @@ func TestIsset(t *testing.T) { &stmt.Expression{ Expr: &expr.Isset{ Variables: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -42,8 +42,8 @@ func TestIssetVariables(t *testing.T) { &stmt.Expression{ Expr: &expr.Isset{ Variables: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/node/expr/t_list_test.go b/node/expr/t_list_test.go index f8a830d..7b492bb 100644 --- a/node/expr/t_list_test.go +++ b/node/expr/t_list_test.go @@ -24,7 +24,7 @@ func TestEmptyList(t *testing.T) { Variable: &expr.List{ Items: []node.Node{}, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -48,11 +48,11 @@ func TestList(t *testing.T) { Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -77,12 +77,12 @@ func TestListArrayIndex(t *testing.T) { &expr.ArrayItem{ ByRef: false, Val: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -110,14 +110,14 @@ func TestListList(t *testing.T) { Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/node/expr/t_method_call_test.go b/node/expr/t_method_call_test.go index cf25002..9d1b2a4 100644 --- a/node/expr/t_method_call_test.go +++ b/node/expr/t_method_call_test.go @@ -19,7 +19,7 @@ func TestMethodCall(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Method: &node.Identifier{Value: "foo"}, Arguments: []node.Node{}, }, diff --git a/node/expr/t_new_test.go b/node/expr/t_new_test.go index 89a6b86..000b1ea 100644 --- a/node/expr/t_new_test.go +++ b/node/expr/t_new_test.go @@ -98,8 +98,8 @@ func TestNewAnonymous(t *testing.T) { Class: &stmt.Class{ PhpDocComment: "", Args: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, Stmts: []node.Node{}, }, diff --git a/node/expr/t_print_test.go b/node/expr/t_print_test.go index 863982d..ad3fa9a 100644 --- a/node/expr/t_print_test.go +++ b/node/expr/t_print_test.go @@ -19,7 +19,7 @@ func TestPrint(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Print{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_property_fetch_test.go b/node/expr/t_property_fetch_test.go index b859727..a58ecf7 100644 --- a/node/expr/t_property_fetch_test.go +++ b/node/expr/t_property_fetch_test.go @@ -19,7 +19,7 @@ func TestPropertyFetch(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Property: &node.Identifier{Value: "foo"}, }, }, diff --git a/node/expr/t_shell_exec_test.go b/node/expr/t_shell_exec_test.go index b32d571..c414e31 100644 --- a/node/expr/t_shell_exec_test.go +++ b/node/expr/t_shell_exec_test.go @@ -23,7 +23,7 @@ func TestShellExec(t *testing.T) { Expr: &expr.ShellExec{ Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "cmd "}, - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_short_array_test.go b/node/expr/t_short_array_test.go index 0d68a19..80552ed 100644 --- a/node/expr/t_short_array_test.go +++ b/node/expr/t_short_array_test.go @@ -74,7 +74,7 @@ func TestShortArrayItems(t *testing.T) { }, &expr.ArrayItem{ ByRef: true, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/node/expr/t_short_list_test.go b/node/expr/t_short_list_test.go index 32d6b82..9ef11b9 100644 --- a/node/expr/t_short_list_test.go +++ b/node/expr/t_short_list_test.go @@ -24,11 +24,11 @@ func TestShortList(t *testing.T) { Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -50,12 +50,12 @@ func TestShortListArrayIndex(t *testing.T) { &expr.ArrayItem{ ByRef: false, Val: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -80,14 +80,14 @@ func TestShortListList(t *testing.T) { Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/node/expr/t_static_call_test.go b/node/expr/t_static_call_test.go index 1cb748f..c8c9639 100644 --- a/node/expr/t_static_call_test.go +++ b/node/expr/t_static_call_test.go @@ -104,7 +104,7 @@ func TestStaticCallVar(t *testing.T) { &name.NamePart{Value: "Foo"}, }, }, - Call: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Call: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, Arguments: []node.Node{}, }, }, @@ -125,8 +125,8 @@ func TestStaticCallVarVar(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.StaticCall{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, - Call: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, + Call: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, Arguments: []node.Node{}, }, }, diff --git a/node/expr/t_static_property_fetch_test.go b/node/expr/t_static_property_fetch_test.go index 2539570..a9e102a 100644 --- a/node/expr/t_static_property_fetch_test.go +++ b/node/expr/t_static_property_fetch_test.go @@ -25,7 +25,7 @@ func TestStaticPropertyFetch(t *testing.T) { &name.NamePart{Value: "Foo"}, }, }, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, @@ -50,7 +50,7 @@ func TestStaticPropertyFetchRelative(t *testing.T) { &name.NamePart{Value: "Foo"}, }, }, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, @@ -75,7 +75,7 @@ func TestStaticPropertyFetchFullyQualified(t *testing.T) { &name.NamePart{Value: "Foo"}, }, }, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, diff --git a/node/expr/t_ternary_test.go b/node/expr/t_ternary_test.go index dbf371a..42edee3 100644 --- a/node/expr/t_ternary_test.go +++ b/node/expr/t_ternary_test.go @@ -19,9 +19,9 @@ func TestTernary(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, }, }, @@ -41,8 +41,8 @@ func TestTernarySimple(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, }, }, @@ -62,13 +62,13 @@ func TestTernaryNestedTrue(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, IfTrue: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, }, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$e"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "e"}}, }, }, }, @@ -89,12 +89,12 @@ func TestTernaryNestedCond(t *testing.T) { &stmt.Expression{ Expr: &expr.Ternary{ Condition: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$e"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "e"}}, }, }, }, diff --git a/node/expr/t_unary_test.go b/node/expr/t_unary_test.go index 1d8c6fb..f1daee9 100644 --- a/node/expr/t_unary_test.go +++ b/node/expr/t_unary_test.go @@ -19,7 +19,7 @@ func TestUnaryMinus(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.UnaryMinus{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -39,7 +39,7 @@ func TestUnaryPlus(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.UnaryPlus{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/expr/t_variable_test.go b/node/expr/t_variable_test.go index 557906b..eb68c02 100644 --- a/node/expr/t_variable_test.go +++ b/node/expr/t_variable_test.go @@ -18,7 +18,7 @@ func TestVariable(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.Expression{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, } @@ -36,7 +36,7 @@ func TestVariableVariable(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.Expression{ - Expr: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, + Expr: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, }, }, } diff --git a/node/expr/t_visitor_test.go b/node/expr/t_visitor_test.go index 9c39154..89a9261 100644 --- a/node/expr/t_visitor_test.go +++ b/node/expr/t_visitor_test.go @@ -24,7 +24,7 @@ var nodesToTest = []struct { }{ { &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Dim: &scalar.Lnumber{Value: "1"}, }, []string{"Variable", "Dim"}, @@ -54,21 +54,21 @@ var nodesToTest = []struct { }, { &expr.BitwiseNot{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.BooleanNot{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.ClassConstFetch{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, ConstantName: &node.Identifier{Value: "foo"}, }, []string{"Class", "ConstantName"}, @@ -76,7 +76,7 @@ var nodesToTest = []struct { }, { &expr.Clone{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, @@ -84,7 +84,7 @@ var nodesToTest = []struct { { &expr.ClosureUse{ ByRef: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Variable"}, map[string]interface{}{"ByRef": false}, @@ -111,42 +111,42 @@ var nodesToTest = []struct { }, { &expr.Empty{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.ErrorSuppress{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.Eval{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.Exit{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.Die{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.FunctionCall{ - Function: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Function: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Arguments: []node.Node{&node.Argument{}}, }, []string{"Function", "Arguments"}, @@ -154,21 +154,21 @@ var nodesToTest = []struct { }, { &expr.IncludeOnce{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.Include{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Class: &name.Name{}, }, []string{"Expr", "Class"}, @@ -177,7 +177,7 @@ var nodesToTest = []struct { { &expr.Isset{ Variables: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, []string{"Variables"}, @@ -194,7 +194,7 @@ var nodesToTest = []struct { }, { &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Method: &node.Identifier{Value: "foo"}, Arguments: []node.Node{&node.Argument{}}, }, @@ -211,42 +211,42 @@ var nodesToTest = []struct { }, { &expr.PostDec{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Variable"}, map[string]interface{}{}, }, { &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Variable"}, map[string]interface{}{}, }, { &expr.PreDec{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Variable"}, map[string]interface{}{}, }, { &expr.PreInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Variable"}, map[string]interface{}{}, }, { &expr.Print{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Property: &node.Identifier{Value: "foo"}, }, []string{"Variable", "Property"}, @@ -254,14 +254,14 @@ var nodesToTest = []struct { }, { &expr.RequireOnce{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.Require{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, @@ -312,43 +312,43 @@ var nodesToTest = []struct { }, { &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, []string{"Condition", "IfTrue", "IfFalse"}, map[string]interface{}{}, }, { &expr.UnaryMinus{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.UnaryPlus{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, []string{"VarName"}, map[string]interface{}{}, }, { &expr.YieldFrom{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, []string{"Expr"}, map[string]interface{}{}, }, { &expr.Yield{ - Key: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Value: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Value: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, []string{"Key", "Value"}, map[string]interface{}{}, diff --git a/node/expr/t_yield_test.go b/node/expr/t_yield_test.go index 5baa705..4953420 100644 --- a/node/expr/t_yield_test.go +++ b/node/expr/t_yield_test.go @@ -38,7 +38,7 @@ func TestYieldVal(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Yield{ - Value: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Value: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -58,8 +58,8 @@ func TestYieldKeyVal(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Yield{ - Key: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Value: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Value: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -99,7 +99,7 @@ func TestYieldKeyExpr(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Yield{ - Key: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Value: &scalar.Lnumber{Value: "1"}, }, }, @@ -120,7 +120,7 @@ func TestYieldFrom(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.YieldFrom{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/scalar/t_encapsed_test.go b/node/scalar/t_encapsed_test.go index 2b16a37..e4ffae4 100644 --- a/node/scalar/t_encapsed_test.go +++ b/node/scalar/t_encapsed_test.go @@ -22,7 +22,7 @@ func TestSimpleVar(t *testing.T) { Expr: &scalar.Encapsed{ Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, - &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + &expr.Variable{VarName: &node.Identifier{Value: "var"}}, }, }, }, @@ -46,7 +46,7 @@ func TestSimpleVarPropertyFetch(t *testing.T) { Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Property: &node.Identifier{Value: "bar"}, }, &scalar.EncapsedStringPart{Value: "()"}, @@ -122,7 +122,7 @@ func TestCurlyOpenMethodCall(t *testing.T) { Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Method: &node.Identifier{Value: "bar"}, Arguments: []node.Node{}, }, diff --git a/node/stmt/t_alt_if_test.go b/node/stmt/t_alt_if_test.go index 4eae0a2..c0ebf88 100644 --- a/node/stmt/t_alt_if_test.go +++ b/node/stmt/t_alt_if_test.go @@ -36,7 +36,7 @@ func TestAltIf(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -59,11 +59,11 @@ func TestAltElseIf(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.AltElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -88,7 +88,7 @@ func TestAltElse(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, Else: &stmt.AltElse{ Stmt: &stmt.StmtList{Stmts: []node.Node{}}, @@ -116,15 +116,15 @@ func TestAltElseElseIf(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.AltElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.AltElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, diff --git a/node/stmt/t_echo_test.go b/node/stmt/t_echo_test.go index 8820751..f336e33 100644 --- a/node/stmt/t_echo_test.go +++ b/node/stmt/t_echo_test.go @@ -22,7 +22,7 @@ func TestSimpleEcho(t *testing.T) { &stmt.Echo{ Exprs: []node.Node{ &expr.Variable{ - VarName: &node.Identifier{Value: "$a"}, + VarName: &node.Identifier{Value: "a"}, }, &scalar.Lnumber{Value: "1"}, }, @@ -45,7 +45,7 @@ func TestEcho(t *testing.T) { &stmt.Echo{ Exprs: []node.Node{ &expr.Variable{ - VarName: &node.Identifier{Value: "$a"}, + VarName: &node.Identifier{Value: "a"}, }, }, }, diff --git a/node/stmt/t_for_test.go b/node/stmt/t_for_test.go index e32ebe5..f326c13 100644 --- a/node/stmt/t_for_test.go +++ b/node/stmt/t_for_test.go @@ -25,22 +25,22 @@ func TestFor(t *testing.T) { &stmt.For{ Init: []node.Node{ &assign.Assign{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, Expression: &scalar.Lnumber{Value: "0"}, }, }, Cond: []node.Node{ &binary.Smaller{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, Right: &scalar.Lnumber{Value: "10"}, }, }, Loop: []node.Node{ &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, }, &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, }, }, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, @@ -63,13 +63,13 @@ func TestAltFor(t *testing.T) { &stmt.AltFor{ Cond: []node.Node{ &binary.Smaller{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, Right: &scalar.Lnumber{Value: "10"}, }, }, Loop: []node.Node{ &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, }, }, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, diff --git a/node/stmt/t_foreach_test.go b/node/stmt/t_foreach_test.go index d1809bf..2e788e3 100644 --- a/node/stmt/t_foreach_test.go +++ b/node/stmt/t_foreach_test.go @@ -18,8 +18,8 @@ func TestForeach(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.Foreach{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -39,7 +39,7 @@ func TestForeachExpr(t *testing.T) { Stmts: []node.Node{ &stmt.Foreach{ Expr: &expr.ShortArray{Items: []node.Node{}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -58,8 +58,8 @@ func TestAltForeach(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.AltForeach{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -78,9 +78,9 @@ func TestForeachWithKey(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.Foreach{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -100,8 +100,8 @@ func TestForeachExprWithKey(t *testing.T) { Stmts: []node.Node{ &stmt.Foreach{ Expr: &expr.ShortArray{Items: []node.Node{}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -121,9 +121,9 @@ func TestForeachWithRef(t *testing.T) { Stmts: []node.Node{ &stmt.Foreach{ ByRef: true, - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -143,13 +143,13 @@ func TestForeachWithList(t *testing.T) { Stmts: []node.Node{ &stmt.Foreach{ ByRef: false, - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, Variable: &expr.List{ Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, }, }, }, diff --git a/node/stmt/t_function_test.go b/node/stmt/t_function_test.go index d767eac..7901423 100644 --- a/node/stmt/t_function_test.go +++ b/node/stmt/t_function_test.go @@ -72,18 +72,18 @@ func TestFunctionReturnVar(t *testing.T) { ByRef: false, Variadic: false, VariableType: &node.Identifier{Value: "array"}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &node.Parameter{ ByRef: false, Variadic: false, VariableType: &node.Identifier{Value: "callable"}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, Stmts: []node.Node{ &stmt.Return{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, diff --git a/node/stmt/t_global_test.go b/node/stmt/t_global_test.go index dcdc397..cca5422 100644 --- a/node/stmt/t_global_test.go +++ b/node/stmt/t_global_test.go @@ -19,7 +19,7 @@ func TestGlobal(t *testing.T) { Stmts: []node.Node{ &stmt.Global{ Vars: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -39,9 +39,9 @@ func TestGlobalVars(t *testing.T) { Stmts: []node.Node{ &stmt.Global{ Vars: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "c"}}}, &expr.Variable{ VarName: &expr.FunctionCall{ Function: &name.Name{ diff --git a/node/stmt/t_if_test.go b/node/stmt/t_if_test.go index ff7c158..13291da 100644 --- a/node/stmt/t_if_test.go +++ b/node/stmt/t_if_test.go @@ -18,7 +18,7 @@ func TestIf(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -38,11 +38,11 @@ func TestElseIf(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -63,7 +63,7 @@ func TestElse(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, Else: &stmt.Else{ Stmt: &stmt.StmtList{Stmts: []node.Node{}}, @@ -85,15 +85,15 @@ func TestElseElseIf(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -117,17 +117,17 @@ func TestElseIfElseIfElse(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, Else: &stmt.Else{ Stmt: &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, Else: &stmt.Else{ Stmt: &stmt.StmtList{Stmts: []node.Node{}}, diff --git a/node/stmt/t_property_list_test.go b/node/stmt/t_property_list_test.go index cea1a84..b45fe32 100644 --- a/node/stmt/t_property_list_test.go +++ b/node/stmt/t_property_list_test.go @@ -27,7 +27,7 @@ func TestProperty(t *testing.T) { Properties: []node.Node{ &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -59,11 +59,11 @@ func TestProperties(t *testing.T) { Properties: []node.Node{ &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Expr: &scalar.Lnumber{Value: "1"}, }, }, @@ -96,12 +96,12 @@ func TestProperties2(t *testing.T) { Properties: []node.Node{ &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &scalar.Lnumber{Value: "1"}, }, &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/node/stmt/t_static_var_test.go b/node/stmt/t_static_var_test.go index b113a27..3689368 100644 --- a/node/stmt/t_static_var_test.go +++ b/node/stmt/t_static_var_test.go @@ -20,7 +20,7 @@ func TestStaticVar(t *testing.T) { &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -42,10 +42,10 @@ func TestStaticVars(t *testing.T) { &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Expr: &scalar.Lnumber{Value: "1"}, }, }, @@ -68,11 +68,11 @@ func TestStaticVars2(t *testing.T) { &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &scalar.Lnumber{Value: "1"}, }, &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/node/stmt/t_throw_test.go b/node/stmt/t_throw_test.go index ff15c7a..71668de 100644 --- a/node/stmt/t_throw_test.go +++ b/node/stmt/t_throw_test.go @@ -17,7 +17,7 @@ func TestThrow(t *testing.T) { expected := &stmt.StmtList{ Stmts: []node.Node{ &stmt.Throw{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$e"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "e"}}, }, }, } diff --git a/node/stmt/t_try_catch_finnaly_test.go b/node/stmt/t_try_catch_finnaly_test.go index bf5c937..b4487a9 100644 --- a/node/stmt/t_try_catch_finnaly_test.go +++ b/node/stmt/t_try_catch_finnaly_test.go @@ -52,7 +52,7 @@ func TestTryCatch(t *testing.T) { }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -92,7 +92,7 @@ func TestPhp7TryCatch(t *testing.T) { }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -124,7 +124,7 @@ func TestTryCatchCatch(t *testing.T) { }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -137,7 +137,7 @@ func TestTryCatchCatch(t *testing.T) { }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -172,7 +172,7 @@ func TestTryCatchFinally(t *testing.T) { }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -208,7 +208,7 @@ func TestTryCatchCatchCatch(t *testing.T) { }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -221,7 +221,7 @@ func TestTryCatchCatchCatch(t *testing.T) { }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -234,7 +234,7 @@ func TestTryCatchCatchCatch(t *testing.T) { }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, diff --git a/node/stmt/t_unset_test.go b/node/stmt/t_unset_test.go index b84a54d..db7bd2c 100644 --- a/node/stmt/t_unset_test.go +++ b/node/stmt/t_unset_test.go @@ -18,7 +18,7 @@ func TestUnset(t *testing.T) { Stmts: []node.Node{ &stmt.Unset{ Vars: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -38,8 +38,8 @@ func TestUnsetVars(t *testing.T) { Stmts: []node.Node{ &stmt.Unset{ Vars: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -59,8 +59,8 @@ func TestUnsetTrailingComma(t *testing.T) { Stmts: []node.Node{ &stmt.Unset{ Vars: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/node/t_node_test.go b/node/t_node_test.go index fccfd8f..36be91c 100644 --- a/node/t_node_test.go +++ b/node/t_node_test.go @@ -36,7 +36,7 @@ func TestIdentifier(t *testing.T) { Stmts: []node.Node{ &stmt.Expression{ Expr: &expr.Variable{ - VarName: &node.Identifier{Value: "$foo"}, + VarName: &node.Identifier{Value: "foo"}, }, }, }, @@ -67,27 +67,27 @@ func TestPhp7ArgumentNode(t *testing.T) { Expr: &expr.FunctionCall{ Function: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.FunctionCall{ - Function: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Function: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Method: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -96,18 +96,18 @@ func TestPhp7ArgumentNode(t *testing.T) { Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Call: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.StaticCall{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Call: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -115,8 +115,8 @@ func TestPhp7ArgumentNode(t *testing.T) { Expr: &expr.New{ Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -125,8 +125,8 @@ func TestPhp7ArgumentNode(t *testing.T) { Class: &stmt.Class{ PhpDocComment: "/** anonymous class */", Args: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, Stmts: []node.Node{}, }, @@ -155,27 +155,27 @@ func TestPhp5ArgumentNode(t *testing.T) { Expr: &expr.FunctionCall{ Function: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.FunctionCall{ - Function: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Function: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Method: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -184,18 +184,18 @@ func TestPhp5ArgumentNode(t *testing.T) { Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Call: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.StaticCall{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Call: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -203,8 +203,8 @@ func TestPhp5ArgumentNode(t *testing.T) { Expr: &expr.New{ Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -228,14 +228,14 @@ func TestPhp7ParameterNode(t *testing.T) { ByRef: false, Variadic: false, VariableType: &node.Nullable{Expr: &name.Name{Parts: []node.Node{&name.NamePart{Value: "bar"}}}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, DefaultValue: &expr.ConstFetch{Constant: &name.Name{Parts: []node.Node{&name.NamePart{Value: "null"}}}}, }, &node.Parameter{ ByRef: true, Variadic: true, VariableType: &name.Name{Parts: []node.Node{&name.NamePart{Value: "baz"}}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$baz"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "baz"}}, }, } @@ -294,14 +294,14 @@ func TestPhp5ParameterNode(t *testing.T) { ByRef: false, Variadic: false, VariableType: &name.Name{Parts: []node.Node{&name.NamePart{Value: "bar"}}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, DefaultValue: &expr.ConstFetch{Constant: &name.Name{Parts: []node.Node{&name.NamePart{Value: "null"}}}}, }, &node.Parameter{ ByRef: true, Variadic: true, VariableType: &name.Name{Parts: []node.Node{&name.NamePart{Value: "baz"}}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$baz"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "baz"}}, }, } diff --git a/php5/php5.go b/php5/php5.go index ba616b3..796cbc1 100644 --- a/php5/php5.go +++ b/php5/php5.go @@ -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)) diff --git a/php5/php5.y b/php5/php5.y index a507ac2..5f9853a 100644 --- a/php5/php5.y +++ b/php5/php5.y @@ -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)) diff --git a/php5/php5_test.go b/php5/php5_test.go index 0c96856..11a34e9 100644 --- a/php5/php5_test.go +++ b/php5/php5_test.go @@ -442,14 +442,14 @@ CAD; ByRef: false, Variadic: false, VariableType: &name.Name{Parts: []node.Node{&name.NamePart{Value: "bar"}}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, DefaultValue: &expr.ConstFetch{Constant: &name.Name{Parts: []node.Node{&name.NamePart{Value: "null"}}}}, }, &node.Parameter{ ByRef: true, Variadic: true, VariableType: &name.Name{Parts: []node.Node{&name.NamePart{Value: "baz"}}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$baz"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "baz"}}, }, } @@ -459,27 +459,27 @@ CAD; Expr: &expr.FunctionCall{ Function: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.FunctionCall{ - Function: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Function: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Method: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -488,18 +488,18 @@ CAD; Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Call: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.StaticCall{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Call: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -507,8 +507,8 @@ CAD; Expr: &expr.New{ Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -573,7 +573,7 @@ CAD; Expr: &scalar.Encapsed{ Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "\thello "}, - &expr.Variable{VarName: &node.Identifier{Value: "$world"}}, + &expr.Variable{VarName: &node.Identifier{Value: "world"}}, &scalar.EncapsedStringPart{Value: "\n"}, }, }, @@ -632,7 +632,7 @@ CAD; Expr: &scalar.Encapsed{ Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, - &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + &expr.Variable{VarName: &node.Identifier{Value: "var"}}, }, }, }, @@ -641,7 +641,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "var"}}, Dim: &scalar.Lnumber{Value: "1"}, }, }, @@ -652,7 +652,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "var"}}, Dim: &scalar.String{Value: "1234567890123456789012345678901234567890"}, }, }, @@ -663,7 +663,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "var"}}, Dim: &scalar.String{Value: "bar"}, }, }, @@ -674,8 +674,8 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, - Dim: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "var"}}, + Dim: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, @@ -683,9 +683,9 @@ CAD; &stmt.Expression{ Expr: &scalar.Encapsed{ Parts: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, &scalar.EncapsedStringPart{Value: " "}, - &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, @@ -694,7 +694,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Property: &node.Identifier{Value: "bar"}, }, &scalar.EncapsedStringPart{Value: "()"}, @@ -725,7 +725,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Method: &node.Identifier{Value: "bar"}, Arguments: []node.Node{}, }, @@ -734,36 +734,36 @@ CAD; }, &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.AltElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, }, &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, Else: &stmt.AltElse{ Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.AltElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.AltElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -1019,7 +1019,7 @@ CAD; &stmt.Echo{ Exprs: []node.Node{ &expr.Variable{ - VarName: &node.Identifier{Value: "$a"}, + VarName: &node.Identifier{Value: "a"}, }, &scalar.Lnumber{Value: "1"}, }, @@ -1027,29 +1027,29 @@ CAD; &stmt.Echo{ Exprs: []node.Node{ &expr.Variable{ - VarName: &node.Identifier{Value: "$a"}, + VarName: &node.Identifier{Value: "a"}, }, }, }, &stmt.For{ Init: []node.Node{ &assign.Assign{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, Expression: &scalar.Lnumber{Value: "0"}, }, }, Cond: []node.Node{ &binary.Smaller{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, Right: &scalar.Lnumber{Value: "10"}, }, }, Loop: []node.Node{ &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, }, &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, }, }, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, @@ -1057,60 +1057,60 @@ CAD; &stmt.AltFor{ Cond: []node.Node{ &binary.Smaller{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, Right: &scalar.Lnumber{Value: "10"}, }, }, Loop: []node.Node{ &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, }, }, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.Foreach{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.Foreach{ Expr: &expr.ShortArray{Items: []node.Node{}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.AltForeach{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.Foreach{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.Foreach{ Expr: &expr.ShortArray{Items: []node.Node{}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.Foreach{ ByRef: true, - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.Foreach{ ByRef: false, - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, Variable: &expr.List{ Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, }, }, }, @@ -1140,7 +1140,7 @@ CAD; Stmts: []node.Node{}, }, &stmt.Return{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -1153,13 +1153,13 @@ CAD; ByRef: false, Variadic: false, VariableType: &node.Identifier{Value: "array"}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &node.Parameter{ ByRef: false, Variadic: false, VariableType: &node.Identifier{Value: "callable"}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, Stmts: []node.Node{ @@ -1184,9 +1184,9 @@ CAD; }, &stmt.Global{ Vars: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "c"}}}, &expr.Variable{ VarName: &expr.FunctionCall{ Function: &name.Name{ @@ -1207,36 +1207,36 @@ CAD; }, &stmt.HaltCompiler{}, &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, }, &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, Else: &stmt.Else{ Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -1245,17 +1245,17 @@ CAD; }, }, &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, Else: &stmt.Else{ Stmt: &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, Else: &stmt.Else{ Stmt: &stmt.StmtList{Stmts: []node.Node{}}, @@ -1328,7 +1328,7 @@ CAD; Properties: []node.Node{ &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -1345,11 +1345,11 @@ CAD; Properties: []node.Node{ &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Expr: &scalar.Lnumber{Value: "1"}, }, }, @@ -1367,12 +1367,12 @@ CAD; Properties: []node.Node{ &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &scalar.Lnumber{Value: "1"}, }, &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -1381,10 +1381,10 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Expr: &scalar.Lnumber{Value: "1"}, }, }, @@ -1392,11 +1392,11 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &scalar.Lnumber{Value: "1"}, }, &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -1464,7 +1464,7 @@ CAD; }, }, &stmt.Throw{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$e"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "e"}}, }, &stmt.Trait{ PhpDocComment: "", @@ -1634,7 +1634,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1652,7 +1652,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1665,7 +1665,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1683,7 +1683,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1696,7 +1696,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1709,7 +1709,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1727,7 +1727,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1738,8 +1738,8 @@ CAD; }, &stmt.Unset{ Vars: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.UseList{ @@ -1895,14 +1895,14 @@ CAD; }, &stmt.Expression{ Expr: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Dim: &scalar.Lnumber{Value: "1"}, }, }, &stmt.Expression{ Expr: &expr.ArrayDimFetch{ Variable: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Dim: &scalar.Lnumber{Value: "1"}, }, Dim: &scalar.Lnumber{Value: "2"}, @@ -1933,7 +1933,7 @@ CAD; }, &expr.ArrayItem{ ByRef: true, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -1944,7 +1944,7 @@ CAD; &expr.ArrayItem{ ByRef: true, Key: &scalar.Lnumber{Value: "3"}, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -1954,7 +1954,7 @@ CAD; Items: []node.Node{ &expr.ArrayItem{ ByRef: true, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, &expr.ArrayItem{ ByRef: false, @@ -1968,19 +1968,19 @@ CAD; &expr.ArrayItem{ ByRef: true, Key: &scalar.Lnumber{Value: "3"}, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, }, &stmt.Expression{ Expr: &expr.BitwiseNot{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.BooleanNot{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -1995,12 +1995,12 @@ CAD; }, &stmt.Expression{ Expr: &expr.Clone{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.Clone{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -2021,22 +2021,22 @@ CAD; &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, Uses: []node.Node{ &expr.ClosureUse{ ByRef: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, &expr.ClosureUse{ ByRef: true, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, }, }, Stmts: []node.Node{}, @@ -2051,22 +2051,22 @@ CAD; &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, Uses: []node.Node{ &expr.ClosureUse{ ByRef: true, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, &expr.ClosureUse{ ByRef: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, }, }, Stmts: []node.Node{}, @@ -2098,7 +2098,7 @@ CAD; }, &stmt.Expression{ Expr: &expr.Empty{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -2110,12 +2110,12 @@ CAD; }, &stmt.Expression{ Expr: &expr.ErrorSuppress{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.Eval{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -2123,7 +2123,7 @@ CAD; }, &stmt.Expression{ Expr: &expr.Exit{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -2131,7 +2131,7 @@ CAD; }, &stmt.Expression{ Expr: &expr.Die{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -2155,7 +2155,7 @@ CAD; &node.Argument{ Variadic: false, IsReference: true, - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -2180,13 +2180,13 @@ CAD; }, &stmt.Expression{ Expr: &expr.FunctionCall{ - Function: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Function: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Arguments: []node.Node{ &node.Argument{ Variadic: false, IsReference: false, Expr: &expr.Yield{ - Value: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Value: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -2194,47 +2194,47 @@ CAD; }, &stmt.Expression{ Expr: &expr.PostDec{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.PreDec{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.PreInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.Include{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.IncludeOnce{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.Require{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.RequireOnce{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Class: &name.Name{ Parts: []node.Node{ &name.NamePart{Value: "Foo"}, @@ -2244,7 +2244,7 @@ CAD; }, &stmt.Expression{ Expr: &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Class: &name.Relative{ Parts: []node.Node{ &name.NamePart{Value: "Foo"}, @@ -2254,7 +2254,7 @@ CAD; }, &stmt.Expression{ Expr: &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Class: &name.FullyQualified{ Parts: []node.Node{ &name.NamePart{Value: "Foo"}, @@ -2265,8 +2265,8 @@ CAD; &stmt.Expression{ Expr: &expr.Isset{ Variables: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -2284,7 +2284,7 @@ CAD; Variable: &expr.List{ Items: []node.Node{}, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ @@ -2293,15 +2293,15 @@ CAD; Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ @@ -2311,12 +2311,12 @@ CAD; &expr.ArrayItem{ ByRef: false, Val: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ @@ -2329,19 +2329,19 @@ CAD; Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Method: &node.Identifier{Value: "foo"}, Arguments: []node.Node{}, }, @@ -2377,19 +2377,19 @@ CAD; }, &stmt.Expression{ Expr: &expr.Print{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Property: &node.Identifier{Value: "foo"}, }, }, &stmt.Expression{ Expr: &expr.ArrayDimFetch{ Variable: &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Property: &node.Identifier{Value: "foo"}, }, Dim: &scalar.Lnumber{Value: "1"}, @@ -2401,7 +2401,7 @@ CAD; Variable: &expr.MethodCall{ Variable: &expr.PropertyFetch{ Variable: &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Property: &node.Identifier{Value: "foo"}, }, Property: &node.Identifier{Value: "bar"}, @@ -2418,7 +2418,7 @@ CAD; Expr: &expr.ArrayDimFetch{ Variable: &expr.ArrayDimFetch{ Variable: &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Method: &node.Identifier{Value: "foo"}, Arguments: []node.Node{}, }, @@ -2431,7 +2431,7 @@ CAD; Expr: &expr.ShellExec{ Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "cmd "}, - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -2472,7 +2472,7 @@ CAD; }, &expr.ArrayItem{ ByRef: true, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -2517,14 +2517,14 @@ CAD; &name.NamePart{Value: "Foo"}, }, }, - Call: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Call: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, Arguments: []node.Node{}, }, }, &stmt.Expression{ Expr: &expr.StaticCall{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, - Call: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, + Call: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, Arguments: []node.Node{}, }, }, @@ -2535,7 +2535,7 @@ CAD; &name.NamePart{Value: "Foo"}, }, }, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, &stmt.Expression{ @@ -2545,7 +2545,7 @@ CAD; &name.NamePart{Value: "Foo"}, }, }, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, &stmt.Expression{ @@ -2555,72 +2555,72 @@ CAD; &name.NamePart{Value: "Foo"}, }, }, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, &stmt.Expression{ Expr: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, }, &stmt.Expression{ Expr: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, }, &stmt.Expression{ Expr: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, IfTrue: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, }, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$e"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "e"}}, }, }, &stmt.Expression{ Expr: &expr.Ternary{ Condition: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$e"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "e"}}, }, }, &stmt.Expression{ Expr: &expr.UnaryMinus{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.UnaryPlus{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ - Expr: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, + Expr: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, }, &stmt.Expression{ - Expr: &expr.Variable{VarName: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}}, + Expr: &expr.Variable{VarName: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}}, }, &stmt.Expression{ Expr: &expr.Yield{}, }, &stmt.Expression{ Expr: &expr.Yield{ - Value: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Value: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.Yield{ - Key: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Value: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Value: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ @@ -2637,7 +2637,7 @@ CAD; }, &stmt.Expression{ Expr: &expr.Yield{ - Key: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Value: &expr.ClassConstFetch{ Class: &name.Name{ Parts: []node.Node{ @@ -2650,213 +2650,213 @@ CAD; }, &stmt.Expression{ Expr: &cast.CastArray{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastBool{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastBool{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastDouble{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastDouble{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastInt{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastInt{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastObject{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastString{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastUnset{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &binary.BitwiseAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.BitwiseOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.BitwiseXor{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.BooleanAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.BooleanOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Concat{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Div{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Equal{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.GreaterOrEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Greater{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Identical{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.LogicalAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.LogicalOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.LogicalXor{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Minus{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Mod{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Mul{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.NotEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.NotIdentical{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Plus{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Pow{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.ShiftLeft{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.ShiftRight{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.SmallerOrEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Smaller{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.AssignRef{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.AssignRef{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expression: &expr.New{ Class: &name.Name{ Parts: []node.Node{ @@ -2868,7 +2868,7 @@ CAD; }, &stmt.Expression{ Expr: &assign.AssignRef{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expression: &expr.New{ Class: &name.Name{ Parts: []node.Node{ @@ -2879,7 +2879,7 @@ CAD; &node.Argument{ Variadic: false, IsReference: false, - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -2887,80 +2887,80 @@ CAD; }, &stmt.Expression{ Expr: &assign.Assign{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.BitwiseAnd{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.BitwiseOr{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.BitwiseXor{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Concat{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Div{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Minus{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Mod{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Mul{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Plus{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Pow{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.ShiftLeft{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.ShiftRight{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ @@ -3072,14 +3072,14 @@ CAD; }, &stmt.Expression{ Expr: &expr.New{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, }, }, &stmt.Expression{ Expr: &expr.New{ Class: &expr.StaticPropertyFetch{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, @@ -3087,7 +3087,7 @@ CAD; Expr: &expr.New{ Class: &expr.ArrayDimFetch{ Variable: &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Property: &node.Identifier{Value: "b"}, }, Dim: &scalar.Lnumber{Value: "0"}, @@ -3101,11 +3101,11 @@ CAD; Variable: &expr.PropertyFetch{ Variable: &expr.ArrayDimFetch{ Variable: &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Property: &node.Identifier{Value: "b"}, }, Dim: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, IfFalse: &expr.ConstFetch{ Constant: &name.Name{ Parts: []node.Node{ @@ -3115,7 +3115,7 @@ CAD; }, }, }, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, Property: &node.Identifier{Value: "d"}, }, @@ -3126,7 +3126,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.ArrayDimFetch{ Variable: &expr.ShortArray{ Items: []node.Node{ @@ -3144,7 +3144,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.BooleanNot{ Expr: &scalar.Lnumber{Value: "1"}, }, @@ -3154,7 +3154,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.BitwiseNot{ Expr: &scalar.Lnumber{Value: "1"}, }, @@ -3164,7 +3164,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.UnaryPlus{ Expr: &scalar.Lnumber{Value: "1"}, }, @@ -3174,7 +3174,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.UnaryMinus{ Expr: &scalar.Lnumber{Value: "1"}, }, @@ -3184,7 +3184,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &scalar.Lnumber{Value: "1"}, }, }, @@ -3192,7 +3192,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.Ternary{ Condition: &scalar.Lnumber{Value: "1"}, IfFalse: &scalar.Lnumber{Value: "2"}, @@ -3203,7 +3203,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.Ternary{ Condition: &scalar.Lnumber{Value: "1"}, IfTrue: &scalar.Lnumber{Value: "2"}, @@ -3215,7 +3215,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.BitwiseAnd{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3226,7 +3226,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.BitwiseOr{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3237,7 +3237,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.BitwiseXor{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3248,7 +3248,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.BooleanAnd{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3259,7 +3259,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.BooleanOr{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3270,7 +3270,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Concat{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3281,7 +3281,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Div{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3292,7 +3292,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Equal{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3303,7 +3303,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.GreaterOrEqual{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3314,7 +3314,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Greater{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3325,7 +3325,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Identical{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3336,7 +3336,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.LogicalAnd{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3347,7 +3347,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.LogicalOr{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3358,7 +3358,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.LogicalXor{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3369,7 +3369,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Minus{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3380,7 +3380,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Mod{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3391,7 +3391,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Mul{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3402,7 +3402,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.NotEqual{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3413,7 +3413,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.NotIdentical{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3424,7 +3424,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Plus{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3435,7 +3435,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Pow{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3446,7 +3446,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.ShiftLeft{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3457,7 +3457,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.ShiftRight{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3468,7 +3468,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.SmallerOrEqual{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3479,7 +3479,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &binary.Smaller{ Left: &scalar.Lnumber{Value: "1"}, Right: &scalar.Lnumber{Value: "2"}, @@ -3490,7 +3490,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.ClassConstFetch{ Class: &name.Name{ Parts: []node.Node{ @@ -3505,7 +3505,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.ClassConstFetch{ Class: &name.Name{ Parts: []node.Node{ @@ -3520,7 +3520,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &scalar.MagicConstant{Value: "__CLASS__"}, }, }, @@ -3528,7 +3528,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.ConstFetch{ Constant: &name.Name{ Parts: []node.Node{ @@ -3542,7 +3542,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.ConstFetch{ Constant: &name.Relative{ Parts: []node.Node{ @@ -3556,7 +3556,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.ConstFetch{ Constant: &name.FullyQualified{ Parts: []node.Node{ @@ -3570,7 +3570,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.Array{}, }, }, @@ -3578,7 +3578,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.Array{ Items: []node.Node{ &expr.ArrayItem{ @@ -3598,7 +3598,7 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Expr: &expr.ArrayDimFetch{ Variable: &expr.ShortArray{ Items: []node.Node{ @@ -3629,12 +3629,12 @@ CAD; &stmt.Expression{ Expr: &expr.StaticPropertyFetch{ Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "Foo"}}}, - Property: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}}, + Property: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}}, }, }, &stmt.Expression{ Expr: &expr.FunctionCall{ - Function: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Function: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Arguments: []node.Node{}, }, }, @@ -3642,7 +3642,7 @@ CAD; Expr: &expr.ArrayDimFetch{ Variable: &expr.ArrayDimFetch{ Variable: &expr.FunctionCall{ - Function: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Function: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Arguments: []node.Node{}, }, Dim: &scalar.Lnumber{Value: "0"}, @@ -3652,23 +3652,23 @@ CAD; }, &stmt.Expression{ Expr: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Dim: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Dim: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ - Expr: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, + Expr: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, }, &stmt.Expression{ Expr: &expr.StaticCall{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, - Call: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, + Call: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, Arguments: []node.Node{}, }, }, &stmt.Expression{ Expr: &expr.ClassConstFetch{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, ConstantName: &node.Identifier{Value: "bar"}, }, }, diff --git a/php7/php7.go b/php7/php7.go index 4bc5ff6..48b30b9 100644 --- a/php7/php7.go +++ b/php7/php7.go @@ -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)) diff --git a/php7/php7.y b/php7/php7.y index 3ddf549..b6e5153 100644 --- a/php7/php7.y +++ b/php7/php7.y @@ -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)) diff --git a/php7/php7_test.go b/php7/php7_test.go index 0dc0309..63b6cd2 100644 --- a/php7/php7_test.go +++ b/php7/php7_test.go @@ -410,14 +410,14 @@ CAD; ByRef: false, Variadic: false, VariableType: &node.Nullable{Expr: &name.Name{Parts: []node.Node{&name.NamePart{Value: "bar"}}}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, DefaultValue: &expr.ConstFetch{Constant: &name.Name{Parts: []node.Node{&name.NamePart{Value: "null"}}}}, }, &node.Parameter{ ByRef: true, Variadic: true, VariableType: &name.Name{Parts: []node.Node{&name.NamePart{Value: "baz"}}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$baz"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "baz"}}, }, } @@ -427,27 +427,27 @@ CAD; Expr: &expr.FunctionCall{ Function: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.FunctionCall{ - Function: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Function: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Method: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -456,18 +456,18 @@ CAD; Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Call: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, &stmt.Expression{ Expr: &expr.StaticCall{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Call: &node.Identifier{Value: "bar"}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -475,8 +475,8 @@ CAD; Expr: &expr.New{ Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "foo"}}}, Arguments: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, }, }, @@ -485,8 +485,8 @@ CAD; Class: &stmt.Class{ PhpDocComment: "/** anonymous class */", Args: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, Stmts: []node.Node{}, }, @@ -502,13 +502,13 @@ CAD; }, &stmt.Expression{ Expr: &expr.New{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, }, }, &stmt.Expression{ Expr: &expr.New{ Class: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Dim: &scalar.Lnumber{Value: "1"}, }, }, @@ -516,15 +516,15 @@ CAD; &stmt.Expression{ Expr: &expr.New{ Class: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, - Dim: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, + Dim: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, &stmt.Expression{ Expr: &expr.New{ Class: &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Property: &node.Identifier{Value: "bar"}, }, }, @@ -532,8 +532,8 @@ CAD; &stmt.Expression{ Expr: &expr.New{ Class: &expr.StaticPropertyFetch{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, @@ -541,7 +541,7 @@ CAD; Expr: &expr.New{ Class: &expr.StaticPropertyFetch{ Class: &node.Identifier{Value: "static"}, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, @@ -606,7 +606,7 @@ CAD; Expr: &scalar.Encapsed{ Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "\thello "}, - &expr.Variable{VarName: &node.Identifier{Value: "$world"}}, + &expr.Variable{VarName: &node.Identifier{Value: "world"}}, &scalar.EncapsedStringPart{Value: "\n"}, }, }, @@ -665,7 +665,7 @@ CAD; Expr: &scalar.Encapsed{ Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, - &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + &expr.Variable{VarName: &node.Identifier{Value: "var"}}, }, }, }, @@ -674,7 +674,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "var"}}, Dim: &scalar.Lnumber{Value: "1"}, }, }, @@ -685,7 +685,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "var"}}, Dim: &expr.UnaryMinus{ Expr: &scalar.Lnumber{Value: "1"}, }, @@ -698,7 +698,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "var"}}, Dim: &scalar.String{Value: "1234567890123456789012345678901234567890"}, }, }, @@ -709,7 +709,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "var"}}, Dim: &scalar.String{Value: "-1234567890123456789012345678901234567890"}, }, }, @@ -720,7 +720,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "var"}}, Dim: &scalar.String{Value: "bar"}, }, }, @@ -731,8 +731,8 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$var"}}, - Dim: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "var"}}, + Dim: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, @@ -740,9 +740,9 @@ CAD; &stmt.Expression{ Expr: &scalar.Encapsed{ Parts: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, &scalar.EncapsedStringPart{Value: " "}, - &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, }, @@ -751,7 +751,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Property: &node.Identifier{Value: "bar"}, }, &scalar.EncapsedStringPart{Value: "()"}, @@ -781,7 +781,7 @@ CAD; Expr: &scalar.Encapsed{ Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, - &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}}, + &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}}, }, }, }, @@ -790,7 +790,7 @@ CAD; Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "test "}, &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Method: &node.Identifier{Value: "bar"}, Arguments: []node.Node{}, }, @@ -799,36 +799,36 @@ CAD; }, &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.AltElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, }, &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, Else: &stmt.AltElse{ Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, &stmt.AltIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.AltElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.AltElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -1112,7 +1112,7 @@ CAD; &stmt.Echo{ Exprs: []node.Node{ &expr.Variable{ - VarName: &node.Identifier{Value: "$a"}, + VarName: &node.Identifier{Value: "a"}, }, &scalar.Lnumber{Value: "1"}, }, @@ -1120,29 +1120,29 @@ CAD; &stmt.Echo{ Exprs: []node.Node{ &expr.Variable{ - VarName: &node.Identifier{Value: "$a"}, + VarName: &node.Identifier{Value: "a"}, }, }, }, &stmt.For{ Init: []node.Node{ &assign.Assign{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, Expression: &scalar.Lnumber{Value: "0"}, }, }, Cond: []node.Node{ &binary.Smaller{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, Right: &scalar.Lnumber{Value: "10"}, }, }, Loop: []node.Node{ &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, }, &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, }, }, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, @@ -1150,52 +1150,52 @@ CAD; &stmt.AltFor{ Cond: []node.Node{ &binary.Smaller{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, Right: &scalar.Lnumber{Value: "10"}, }, }, Loop: []node.Node{ &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, }, &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$i"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "i"}}, }, }, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.Foreach{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.AltForeach{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.Foreach{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.Foreach{ ByRef: true, - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.Foreach{ ByRef: false, - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, Variable: &expr.List{ Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, }, }, }, @@ -1203,13 +1203,13 @@ CAD; }, &stmt.Foreach{ ByRef: false, - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Key: &expr.Variable{VarName: &node.Identifier{Value: "$k"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "k"}}, Variable: &expr.ShortList{ Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$v"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "v"}}, }, }, }, @@ -1252,8 +1252,8 @@ CAD; }, &stmt.Global{ Vars: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Label{ @@ -1264,36 +1264,36 @@ CAD; }, &stmt.HaltCompiler{}, &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, }, &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, Else: &stmt.Else{ Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, @@ -1302,17 +1302,17 @@ CAD; }, }, &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, ElseIf: []node.Node{ &stmt.ElseIf{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, }, }, Else: &stmt.Else{ Stmt: &stmt.If{ - Cond: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Cond: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, Stmt: &stmt.StmtList{Stmts: []node.Node{}}, Else: &stmt.Else{ Stmt: &stmt.StmtList{Stmts: []node.Node{}}, @@ -1384,7 +1384,7 @@ CAD; Properties: []node.Node{ &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -1401,11 +1401,11 @@ CAD; Properties: []node.Node{ &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &stmt.Property{ PhpDocComment: "", - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Expr: &scalar.Lnumber{Value: "1"}, }, }, @@ -1415,10 +1415,10 @@ CAD; &stmt.Static{ Vars: []node.Node{ &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &stmt.StaticVar{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, Expr: &scalar.Lnumber{Value: "1"}, }, }, @@ -1487,7 +1487,7 @@ CAD; }, }, &stmt.Throw{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$e"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "e"}}, }, &stmt.Trait{ PhpDocComment: "", @@ -1685,7 +1685,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1708,7 +1708,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1726,7 +1726,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1739,7 +1739,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1757,7 +1757,7 @@ CAD; }, }, Variable: &expr.Variable{ - VarName: &node.Identifier{Value: "$e"}, + VarName: &node.Identifier{Value: "e"}, }, Stmts: []node.Node{}, }, @@ -1768,8 +1768,8 @@ CAD; }, &stmt.Unset{ Vars: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.UseList{ @@ -2045,14 +2045,14 @@ CAD; }, &stmt.Expression{ Expr: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Dim: &scalar.Lnumber{Value: "1"}, }, }, &stmt.Expression{ Expr: &expr.ArrayDimFetch{ Variable: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Dim: &scalar.Lnumber{Value: "1"}, }, Dim: &scalar.Lnumber{Value: "2"}, @@ -2083,19 +2083,19 @@ CAD; }, &expr.ArrayItem{ ByRef: true, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, }, &stmt.Expression{ Expr: &expr.BitwiseNot{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.BooleanNot{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -2110,18 +2110,18 @@ CAD; }, &stmt.Expression{ Expr: &expr.ClassConstFetch{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, ConstantName: &node.Identifier{Value: "Bar"}, }, }, &stmt.Expression{ Expr: &expr.Clone{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.Clone{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -2142,22 +2142,22 @@ CAD; &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, Uses: []node.Node{ &expr.ClosureUse{ ByRef: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, &expr.ClosureUse{ ByRef: true, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, }, }, Stmts: []node.Node{}, @@ -2192,17 +2192,17 @@ CAD; }, &stmt.Expression{ Expr: &expr.Empty{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.ErrorSuppress{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.Eval{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -2210,7 +2210,7 @@ CAD; }, &stmt.Expression{ Expr: &expr.Exit{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -2218,7 +2218,7 @@ CAD; }, &stmt.Expression{ Expr: &expr.Die{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ @@ -2253,53 +2253,53 @@ CAD; }, &stmt.Expression{ Expr: &expr.FunctionCall{ - Function: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Function: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Arguments: []node.Node{}, }, }, &stmt.Expression{ Expr: &expr.PostDec{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.PostInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.PreDec{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.PreInc{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.Include{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.IncludeOnce{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.Require{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.RequireOnce{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Class: &name.Name{ Parts: []node.Node{ &name.NamePart{Value: "Foo"}, @@ -2309,7 +2309,7 @@ CAD; }, &stmt.Expression{ Expr: &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Class: &name.Relative{ Parts: []node.Node{ &name.NamePart{Value: "Foo"}, @@ -2319,7 +2319,7 @@ CAD; }, &stmt.Expression{ Expr: &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Class: &name.FullyQualified{ Parts: []node.Node{ &name.NamePart{Value: "Foo"}, @@ -2330,8 +2330,8 @@ CAD; &stmt.Expression{ Expr: &expr.Isset{ Variables: []node.Node{ - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -2341,11 +2341,11 @@ CAD; Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ @@ -2355,12 +2355,12 @@ CAD; &expr.ArrayItem{ ByRef: false, Val: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ @@ -2373,19 +2373,19 @@ CAD; Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &expr.MethodCall{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Method: &node.Identifier{Value: "foo"}, Arguments: []node.Node{}, }, @@ -2425,8 +2425,8 @@ CAD; Class: &stmt.Class{ PhpDocComment: "", Args: []node.Node{ - &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, - &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}}, + &node.Argument{Variadic: false, Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, + &node.Argument{Variadic: true, Expr: &expr.Variable{VarName: &node.Identifier{Value: "b"}}}, }, Stmts: []node.Node{}, }, @@ -2434,12 +2434,12 @@ CAD; }, &stmt.Expression{ Expr: &expr.Print{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, Property: &node.Identifier{Value: "foo"}, }, }, @@ -2447,7 +2447,7 @@ CAD; Expr: &expr.ShellExec{ Parts: []node.Node{ &scalar.EncapsedStringPart{Value: "cmd "}, - &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, @@ -2488,7 +2488,7 @@ CAD; }, &expr.ArrayItem{ ByRef: true, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, @@ -2499,11 +2499,11 @@ CAD; Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ @@ -2513,12 +2513,12 @@ CAD; &expr.ArrayItem{ ByRef: false, Val: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ @@ -2531,14 +2531,14 @@ CAD; Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, }, }, }, }, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ @@ -2581,13 +2581,13 @@ CAD; &name.NamePart{Value: "Foo"}, }, }, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, &stmt.Expression{ Expr: &expr.StaticPropertyFetch{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, &stmt.Expression{ @@ -2597,7 +2597,7 @@ CAD; &name.NamePart{Value: "Foo"}, }, }, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, &stmt.Expression{ @@ -2607,370 +2607,370 @@ CAD; &name.NamePart{Value: "Foo"}, }, }, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, &stmt.Expression{ Expr: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, }, &stmt.Expression{ Expr: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, }, &stmt.Expression{ Expr: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, IfTrue: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, }, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$e"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "e"}}, }, }, &stmt.Expression{ Expr: &expr.Ternary{ Condition: &expr.Ternary{ - Condition: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Condition: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, }, - IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "$d"}}, - IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "$e"}}, + IfTrue: &expr.Variable{VarName: &node.Identifier{Value: "d"}}, + IfFalse: &expr.Variable{VarName: &node.Identifier{Value: "e"}}, }, }, &stmt.Expression{ Expr: &expr.UnaryMinus{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.UnaryPlus{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ - Expr: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}}, + Expr: &expr.Variable{VarName: &expr.Variable{VarName: &node.Identifier{Value: "a"}}}, }, &stmt.Expression{ Expr: &expr.Yield{}, }, &stmt.Expression{ Expr: &expr.Yield{ - Value: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Value: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &expr.Yield{ - Key: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Value: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Key: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Value: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &expr.YieldFrom{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastArray{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastBool{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastBool{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastDouble{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastDouble{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastInt{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastInt{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastObject{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastString{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &cast.CastUnset{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, }, &stmt.Expression{ Expr: &binary.BitwiseAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.BitwiseOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.BitwiseXor{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.BooleanAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.BooleanOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Coalesce{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Concat{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Div{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Equal{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.GreaterOrEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Greater{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Identical{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.LogicalAnd{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.LogicalOr{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.LogicalXor{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Minus{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Mod{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Mul{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.NotEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.NotIdentical{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Plus{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Pow{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.ShiftLeft{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.ShiftRight{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.SmallerOrEqual{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Smaller{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &binary.Spaceship{ - Left: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Right: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Left: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Right: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.AssignRef{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Assign{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.BitwiseAnd{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.BitwiseOr{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.BitwiseXor{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Concat{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Div{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Minus{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Mod{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Mul{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Plus{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.Pow{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.ShiftLeft{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Expression{ Expr: &assign.ShiftRight{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, - Expression: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, + Expression: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, &stmt.Class{ @@ -3000,12 +3000,12 @@ CAD; &node.Parameter{ ByRef: true, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &node.Parameter{ ByRef: false, Variadic: true, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, Stmts: []node.Node{ @@ -3034,19 +3034,19 @@ CAD; &node.Parameter{ ByRef: true, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, DefaultValue: &scalar.Lnumber{Value: "1"}, }, &node.Parameter{ ByRef: false, Variadic: true, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, DefaultValue: &scalar.Lnumber{Value: "1"}, }, &node.Parameter{ ByRef: false, Variadic: false, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$c"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "c"}}, DefaultValue: &scalar.Lnumber{Value: "1"}, }, }, @@ -3059,13 +3059,13 @@ CAD; ByRef: false, Variadic: false, VariableType: &node.Identifier{Value: "array"}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &node.Parameter{ ByRef: false, Variadic: false, VariableType: &node.Identifier{Value: "callable"}, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, Stmts: []node.Node{}, @@ -3118,7 +3118,7 @@ CAD; Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, }, }, }, @@ -3155,7 +3155,7 @@ CAD; }, }, }, - Dim: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Dim: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, }, Arguments: []node.Node{}, }, @@ -3171,7 +3171,7 @@ CAD; &stmt.Expression{ Expr: &expr.StaticCall{ Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "Foo"}}}, - Call: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Call: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, Arguments: []node.Node{}, }, }, @@ -3179,7 +3179,7 @@ CAD; Expr: &expr.StaticCall{ Class: &name.Name{Parts: []node.Node{&name.NamePart{Value: "Foo"}}}, Call: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, Dim: &scalar.Lnumber{Value: "0"}, }, Arguments: []node.Node{}, @@ -3187,15 +3187,15 @@ CAD; }, &stmt.Expression{ Expr: &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, - Property: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, + Property: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, }, }, &stmt.Expression{ Expr: &expr.PropertyFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Property: &expr.ArrayDimFetch{ - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$bar"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "bar"}}, Dim: &scalar.Lnumber{Value: "0"}, }, }, @@ -3206,7 +3206,7 @@ CAD; &expr.ArrayItem{ ByRef: true, Key: &scalar.Lnumber{Value: "1"}, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$a"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "a"}}, }, &expr.ArrayItem{ ByRef: false, @@ -3215,7 +3215,7 @@ CAD; Items: []node.Node{ &expr.ArrayItem{ ByRef: false, - Val: &expr.Variable{VarName: &node.Identifier{Value: "$b"}}, + Val: &expr.Variable{VarName: &node.Identifier{Value: "b"}}, }, }, }, diff --git a/visitor/dumper_test.go b/visitor/dumper_test.go index ead27d8..7b36af0 100644 --- a/visitor/dumper_test.go +++ b/visitor/dumper_test.go @@ -90,7 +90,7 @@ func ExampleDumper() { //| "VarName": //| [*node.Identifier] //| "Position": Pos{Line: 5-5 Pos: 79-82}; - //| "Value": $var; + //| "Value": var; //| "DefaultValue": //| [*expr.ConstFetch] //| "Position": Pos{Line: 5-5 Pos: 86-89}; @@ -115,7 +115,7 @@ func ExampleDumper() { //| "VarName": //| [*node.Identifier] //| "Position": Pos{Line: 8-8 Pos: 124-127}; - //| "Value": $var; + //| "Value": var; //| "Comments": //| "// some comment\n" } diff --git a/visitor/namespace_resolver_test.go b/visitor/namespace_resolver_test.go index 1ddb96b..12b1f13 100644 --- a/visitor/namespace_resolver_test.go +++ b/visitor/namespace_resolver_test.go @@ -164,7 +164,7 @@ func TestResolveInstanceOf(t *testing.T) { }, }, &expr.InstanceOf{ - Expr: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Expr: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Class: nameBC, }, }, @@ -208,7 +208,7 @@ func TestResolveInstanceCatch(t *testing.T) { nameBC, nameF, }, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Stmts: []node.Node{}, }, }, @@ -500,7 +500,7 @@ func TestResolveFunctionName(t *testing.T) { ByRef: false, Variadic: false, VariableType: nameAB, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, }, }, ReturnType: &node.Nullable{Expr: nameBC}, @@ -538,7 +538,7 @@ func TestResolveMethodName(t *testing.T) { ByRef: false, Variadic: false, VariableType: nameAB, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, }, }, ReturnType: &node.Nullable{Expr: nameBC}, @@ -569,7 +569,7 @@ func TestResolveClosureName(t *testing.T) { ByRef: false, Variadic: false, VariableType: nameAB, - Variable: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Variable: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, }, }, ReturnType: &node.Nullable{Expr: nameBC}, @@ -708,7 +708,7 @@ func TestResolveStaticCallDinamicClassName(t *testing.T) { ast := &stmt.StmtList{ Stmts: []node.Node{ &expr.StaticCall{ - Class: &expr.Variable{VarName: &node.Identifier{Value: "$foo"}}, + Class: &expr.Variable{VarName: &node.Identifier{Value: "foo"}}, Call: &node.Identifier{Value: "foo"}, Arguments: []node.Node{}, },