From 065e6ad203cb0aa670518526d3f254de07d3267d Mon Sep 17 00:00:00 2001 From: z7zmey Date: Sat, 6 Jan 2018 14:04:02 +0200 Subject: [PATCH] fix comments pointers --- node/argument.go | 4 +- node/expr/array.go | 4 +- node/expr/array_dim_fetch.go | 4 +- node/expr/array_item.go | 4 +- node/expr/assign_op/assign.go | 4 +- node/expr/assign_op/assign_ref.go | 4 +- node/expr/assign_op/bitwise_and.go | 4 +- node/expr/assign_op/bitwise_or.go | 4 +- node/expr/assign_op/bitwise_xor.go | 4 +- node/expr/assign_op/concat.go | 4 +- node/expr/assign_op/div.go | 4 +- node/expr/assign_op/minus.go | 4 +- node/expr/assign_op/mod.go | 4 +- node/expr/assign_op/mul.go | 4 +- node/expr/assign_op/plus.go | 4 +- node/expr/assign_op/pow.go | 4 +- node/expr/assign_op/shift_left.go | 4 +- node/expr/assign_op/shift_right.go | 4 +- node/expr/binary_op/bitwise_and.go | 4 +- node/expr/binary_op/bitwise_or.go | 4 +- node/expr/binary_op/bitwise_xor.go | 4 +- node/expr/binary_op/boolean_and.go | 4 +- node/expr/binary_op/boolean_or.go | 4 +- node/expr/binary_op/coalesce.go | 4 +- node/expr/binary_op/concat.go | 4 +- node/expr/binary_op/div.go | 4 +- node/expr/binary_op/equal.go | 4 +- node/expr/binary_op/greater.go | 4 +- node/expr/binary_op/greater_or_equal.go | 4 +- node/expr/binary_op/identical.go | 4 +- node/expr/binary_op/logical_and.go | 4 +- node/expr/binary_op/logical_or.go | 4 +- node/expr/binary_op/logical_xor.go | 4 +- node/expr/binary_op/minus.go | 4 +- node/expr/binary_op/mod.go | 4 +- node/expr/binary_op/mul.go | 4 +- node/expr/binary_op/not_equal.go | 4 +- node/expr/binary_op/not_identical.go | 4 +- node/expr/binary_op/plus.go | 4 +- node/expr/binary_op/pow.go | 4 +- node/expr/binary_op/shift_left.go | 4 +- node/expr/binary_op/shift_right.go | 4 +- node/expr/binary_op/smaller.go | 4 +- node/expr/binary_op/smaller_or_equal.go | 4 +- node/expr/binary_op/spaceship.go | 4 +- node/expr/bitwise_not.go | 4 +- node/expr/boolean_not.go | 4 +- node/expr/cast/cast_array.go | 4 +- node/expr/cast/cast_bool.go | 4 +- node/expr/cast/cast_double.go | 4 +- node/expr/cast/cast_int.go | 4 +- node/expr/cast/cast_object.go | 4 +- node/expr/cast/cast_string.go | 4 +- node/expr/cast/cast_unset.go | 4 +- node/expr/class_const_fetch.go | 4 +- node/expr/clone.go | 4 +- node/expr/closure.go | 4 +- node/expr/closure_use.go | 4 +- node/expr/const_fetch.go | 4 +- node/expr/empty.go | 4 +- node/expr/error_suppress.go | 4 +- node/expr/eval.go | 4 +- node/expr/exit.go | 4 +- node/expr/function_call.go | 4 +- node/expr/include.go | 4 +- node/expr/include_once.go | 4 +- node/expr/instance_of.go | 4 +- node/expr/isset.go | 4 +- node/expr/list.go | 4 +- node/expr/method_call.go | 4 +- node/expr/new.go | 4 +- node/expr/post_dec.go | 4 +- node/expr/post_inc.go | 4 +- node/expr/pre_dec.go | 4 +- node/expr/pre_inc.go | 4 +- node/expr/print.go | 4 +- node/expr/property_fetch.go | 4 +- node/expr/require.go | 4 +- node/expr/require_once.go | 4 +- node/expr/shell_exec.go | 4 +- node/expr/short_array.go | 4 +- node/expr/short_list.go | 4 +- node/expr/static_call.go | 4 +- node/expr/static_property_fetch.go | 4 +- node/expr/ternary.go | 4 +- node/expr/unary_minus.go | 4 +- node/expr/unary_plus.go | 4 +- node/expr/variable.go | 4 +- node/expr/yield.go | 4 +- node/expr/yield_from.go | 4 +- node/identifier.go | 4 +- node/name/name.go | 4 +- node/name/name_part.go | 4 +- node/node.go | 2 +- node/nullable.go | 4 +- node/parameter.go | 4 +- node/scalar/dnumber.go | 4 +- node/scalar/encapsed.go | 4 +- node/scalar/encapsed_string_part.go | 4 +- node/scalar/lnumber.go | 4 +- node/scalar/magic_constant.go | 4 +- node/scalar/string.go | 4 +- node/stmt/alt_else.go | 4 +- node/stmt/alt_else_if.go | 4 +- node/stmt/alt_if.go | 4 +- node/stmt/break.go | 4 +- node/stmt/case.go | 4 +- node/stmt/catch.go | 4 +- node/stmt/class.go | 4 +- node/stmt/class_const_list.go | 4 +- node/stmt/class_method.go | 4 +- node/stmt/const_list.go | 4 +- node/stmt/constant.go | 4 +- node/stmt/continue.go | 4 +- node/stmt/declare.go | 4 +- node/stmt/default.go | 4 +- node/stmt/do.go | 4 +- node/stmt/echo.go | 4 +- node/stmt/else.go | 4 +- node/stmt/else_if.go | 4 +- node/stmt/expression.go | 4 +- node/stmt/finally.go | 4 +- node/stmt/for.go | 4 +- node/stmt/foreach.go | 4 +- node/stmt/function.go | 4 +- node/stmt/global.go | 4 +- node/stmt/goto.go | 4 +- node/stmt/group_use.go | 4 +- node/stmt/halt_compiler.go | 4 +- node/stmt/if.go | 4 +- node/stmt/inline_html.go | 4 +- node/stmt/interface.go | 4 +- node/stmt/label.go | 4 +- node/stmt/namespace.go | 4 +- node/stmt/nop.go | 4 +- node/stmt/property.go | 4 +- node/stmt/property_list.go | 4 +- node/stmt/return.go | 4 +- node/stmt/static.go | 4 +- node/stmt/static_var.go | 4 +- node/stmt/stmt_list.go | 4 +- node/stmt/switch.go | 4 +- node/stmt/throw.go | 4 +- node/stmt/trait.go | 4 +- node/stmt/trait_method_ref.go | 4 +- node/stmt/trait_use.go | 4 +- node/stmt/trait_use_alias.go | 4 +- node/stmt/trait_use_precedence.go | 4 +- node/stmt/try.go | 4 +- node/stmt/unset.go | 4 +- node/stmt/use.go | 4 +- node/stmt/use_list.go | 4 +- node/stmt/while.go | 4 +- parser/lexer.go | 12 +- parser/parser.go | 1139 ++++++++++++----------- parser/parser.y | 169 ++-- parser/positions.go | 11 - parser/scanner.go | 6 +- parser/scanner.l | 6 +- token/token.go | 10 +- 160 files changed, 991 insertions(+), 972 deletions(-) diff --git a/node/argument.go b/node/argument.go index 6bde221..94b4377 100644 --- a/node/argument.go +++ b/node/argument.go @@ -37,8 +37,8 @@ func (n Argument) Comments() *[]comment.Comment { return n.comments } -func (n Argument) SetComments(c []comment.Comment) Node { - n.comments = &c +func (n Argument) SetComments(c *[]comment.Comment) Node { + n.comments = c return n } diff --git a/node/expr/array.go b/node/expr/array.go index c13f987..197feac 100644 --- a/node/expr/array.go +++ b/node/expr/array.go @@ -36,8 +36,8 @@ func (n Array) Comments() *[]comment.Comment { return n.comments } -func (n Array) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Array) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/array_dim_fetch.go b/node/expr/array_dim_fetch.go index b2140a4..ed51d52 100644 --- a/node/expr/array_dim_fetch.go +++ b/node/expr/array_dim_fetch.go @@ -38,8 +38,8 @@ func (n ArrayDimFetch) Comments() *[]comment.Comment { return n.comments } -func (n ArrayDimFetch) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ArrayDimFetch) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/array_item.go b/node/expr/array_item.go index 8548895..e7533fc 100644 --- a/node/expr/array_item.go +++ b/node/expr/array_item.go @@ -42,8 +42,8 @@ func (n ArrayItem) Comments() *[]comment.Comment { return n.comments } -func (n ArrayItem) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ArrayItem) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/assign.go b/node/expr/assign_op/assign.go index 6278cab..9a0d476 100644 --- a/node/expr/assign_op/assign.go +++ b/node/expr/assign_op/assign.go @@ -37,8 +37,8 @@ func (n Assign) Comments() *[]comment.Comment { return n.comments } -func (n Assign) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Assign) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/assign_ref.go b/node/expr/assign_op/assign_ref.go index 36409ca..5ad5c5f 100644 --- a/node/expr/assign_op/assign_ref.go +++ b/node/expr/assign_op/assign_ref.go @@ -37,8 +37,8 @@ func (n AssignRef) Comments() *[]comment.Comment { return n.comments } -func (n AssignRef) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n AssignRef) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/bitwise_and.go b/node/expr/assign_op/bitwise_and.go index 35bbfe3..de63043 100644 --- a/node/expr/assign_op/bitwise_and.go +++ b/node/expr/assign_op/bitwise_and.go @@ -37,8 +37,8 @@ func (n BitwiseAnd) Comments() *[]comment.Comment { return n.comments } -func (n BitwiseAnd) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n BitwiseAnd) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/bitwise_or.go b/node/expr/assign_op/bitwise_or.go index 5ed4c31..3c1523b 100644 --- a/node/expr/assign_op/bitwise_or.go +++ b/node/expr/assign_op/bitwise_or.go @@ -37,8 +37,8 @@ func (n BitwiseOr) Comments() *[]comment.Comment { return n.comments } -func (n BitwiseOr) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n BitwiseOr) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/bitwise_xor.go b/node/expr/assign_op/bitwise_xor.go index cb776f8..e378305 100644 --- a/node/expr/assign_op/bitwise_xor.go +++ b/node/expr/assign_op/bitwise_xor.go @@ -37,8 +37,8 @@ func (n BitwiseXor) Comments() *[]comment.Comment { return n.comments } -func (n BitwiseXor) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n BitwiseXor) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/concat.go b/node/expr/assign_op/concat.go index 1d4a7e3..f1e19e0 100644 --- a/node/expr/assign_op/concat.go +++ b/node/expr/assign_op/concat.go @@ -37,8 +37,8 @@ func (n Concat) Comments() *[]comment.Comment { return n.comments } -func (n Concat) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Concat) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/div.go b/node/expr/assign_op/div.go index 43552a7..fcc18c7 100644 --- a/node/expr/assign_op/div.go +++ b/node/expr/assign_op/div.go @@ -37,8 +37,8 @@ func (n Div) Comments() *[]comment.Comment { return n.comments } -func (n Div) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Div) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/minus.go b/node/expr/assign_op/minus.go index efeb765..de17c3a 100644 --- a/node/expr/assign_op/minus.go +++ b/node/expr/assign_op/minus.go @@ -37,8 +37,8 @@ func (n Minus) Comments() *[]comment.Comment { return n.comments } -func (n Minus) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Minus) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/mod.go b/node/expr/assign_op/mod.go index d58882e..af24cf1 100644 --- a/node/expr/assign_op/mod.go +++ b/node/expr/assign_op/mod.go @@ -37,8 +37,8 @@ func (n Mod) Comments() *[]comment.Comment { return n.comments } -func (n Mod) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Mod) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/mul.go b/node/expr/assign_op/mul.go index 06bcb4b..4c5d205 100644 --- a/node/expr/assign_op/mul.go +++ b/node/expr/assign_op/mul.go @@ -37,8 +37,8 @@ func (n Mul) Comments() *[]comment.Comment { return n.comments } -func (n Mul) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Mul) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/plus.go b/node/expr/assign_op/plus.go index 1d6173a..8d87d93 100644 --- a/node/expr/assign_op/plus.go +++ b/node/expr/assign_op/plus.go @@ -37,8 +37,8 @@ func (n Plus) Comments() *[]comment.Comment { return n.comments } -func (n Plus) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Plus) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/pow.go b/node/expr/assign_op/pow.go index be23df8..d984e82 100644 --- a/node/expr/assign_op/pow.go +++ b/node/expr/assign_op/pow.go @@ -37,8 +37,8 @@ func (n Pow) Comments() *[]comment.Comment { return n.comments } -func (n Pow) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Pow) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/shift_left.go b/node/expr/assign_op/shift_left.go index 6cc46dc..52be668 100644 --- a/node/expr/assign_op/shift_left.go +++ b/node/expr/assign_op/shift_left.go @@ -37,8 +37,8 @@ func (n ShiftLeft) Comments() *[]comment.Comment { return n.comments } -func (n ShiftLeft) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ShiftLeft) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/assign_op/shift_right.go b/node/expr/assign_op/shift_right.go index db26af0..8b1a08e 100644 --- a/node/expr/assign_op/shift_right.go +++ b/node/expr/assign_op/shift_right.go @@ -37,8 +37,8 @@ func (n ShiftRight) Comments() *[]comment.Comment { return n.comments } -func (n ShiftRight) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ShiftRight) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/bitwise_and.go b/node/expr/binary_op/bitwise_and.go index 9723440..a7e887e 100644 --- a/node/expr/binary_op/bitwise_and.go +++ b/node/expr/binary_op/bitwise_and.go @@ -37,8 +37,8 @@ func (n BitwiseAnd) Comments() *[]comment.Comment { return n.comments } -func (n BitwiseAnd) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n BitwiseAnd) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/bitwise_or.go b/node/expr/binary_op/bitwise_or.go index d4b65c6..f56134b 100644 --- a/node/expr/binary_op/bitwise_or.go +++ b/node/expr/binary_op/bitwise_or.go @@ -37,8 +37,8 @@ func (n BitwiseOr) Comments() *[]comment.Comment { return n.comments } -func (n BitwiseOr) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n BitwiseOr) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/bitwise_xor.go b/node/expr/binary_op/bitwise_xor.go index 1460f86..73c2957 100644 --- a/node/expr/binary_op/bitwise_xor.go +++ b/node/expr/binary_op/bitwise_xor.go @@ -37,8 +37,8 @@ func (n BitwiseXor) Comments() *[]comment.Comment { return n.comments } -func (n BitwiseXor) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n BitwiseXor) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/boolean_and.go b/node/expr/binary_op/boolean_and.go index a16f6ab..ec3a809 100644 --- a/node/expr/binary_op/boolean_and.go +++ b/node/expr/binary_op/boolean_and.go @@ -37,8 +37,8 @@ func (n BooleanAnd) Comments() *[]comment.Comment { return n.comments } -func (n BooleanAnd) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n BooleanAnd) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/boolean_or.go b/node/expr/binary_op/boolean_or.go index 0cec937..8fa9d96 100644 --- a/node/expr/binary_op/boolean_or.go +++ b/node/expr/binary_op/boolean_or.go @@ -37,8 +37,8 @@ func (n BooleanOr) Comments() *[]comment.Comment { return n.comments } -func (n BooleanOr) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n BooleanOr) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/coalesce.go b/node/expr/binary_op/coalesce.go index db71d83..df4d0ed 100644 --- a/node/expr/binary_op/coalesce.go +++ b/node/expr/binary_op/coalesce.go @@ -37,8 +37,8 @@ func (n Coalesce) Comments() *[]comment.Comment { return n.comments } -func (n Coalesce) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Coalesce) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/concat.go b/node/expr/binary_op/concat.go index 303e834..422f49c 100644 --- a/node/expr/binary_op/concat.go +++ b/node/expr/binary_op/concat.go @@ -37,8 +37,8 @@ func (n Concat) Comments() *[]comment.Comment { return n.comments } -func (n Concat) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Concat) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/div.go b/node/expr/binary_op/div.go index f449fce..a7da01f 100644 --- a/node/expr/binary_op/div.go +++ b/node/expr/binary_op/div.go @@ -37,8 +37,8 @@ func (n Div) Comments() *[]comment.Comment { return n.comments } -func (n Div) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Div) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/equal.go b/node/expr/binary_op/equal.go index 4681b2e..cdd7983 100644 --- a/node/expr/binary_op/equal.go +++ b/node/expr/binary_op/equal.go @@ -37,8 +37,8 @@ func (n Equal) Comments() *[]comment.Comment { return n.comments } -func (n Equal) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Equal) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/greater.go b/node/expr/binary_op/greater.go index 041f1b7..2544192 100644 --- a/node/expr/binary_op/greater.go +++ b/node/expr/binary_op/greater.go @@ -37,8 +37,8 @@ func (n Greater) Comments() *[]comment.Comment { return n.comments } -func (n Greater) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Greater) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/greater_or_equal.go b/node/expr/binary_op/greater_or_equal.go index 77a3bc0..04b8834 100644 --- a/node/expr/binary_op/greater_or_equal.go +++ b/node/expr/binary_op/greater_or_equal.go @@ -37,8 +37,8 @@ func (n GreaterOrEqual) Comments() *[]comment.Comment { return n.comments } -func (n GreaterOrEqual) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n GreaterOrEqual) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/identical.go b/node/expr/binary_op/identical.go index 14b368c..9f77a1e 100644 --- a/node/expr/binary_op/identical.go +++ b/node/expr/binary_op/identical.go @@ -37,8 +37,8 @@ func (n Identical) Comments() *[]comment.Comment { return n.comments } -func (n Identical) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Identical) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/logical_and.go b/node/expr/binary_op/logical_and.go index 97173f7..4ffb950 100644 --- a/node/expr/binary_op/logical_and.go +++ b/node/expr/binary_op/logical_and.go @@ -37,8 +37,8 @@ func (n LogicalAnd) Comments() *[]comment.Comment { return n.comments } -func (n LogicalAnd) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n LogicalAnd) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/logical_or.go b/node/expr/binary_op/logical_or.go index 6b9c335..8407b5d 100644 --- a/node/expr/binary_op/logical_or.go +++ b/node/expr/binary_op/logical_or.go @@ -37,8 +37,8 @@ func (n LogicalOr) Comments() *[]comment.Comment { return n.comments } -func (n LogicalOr) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n LogicalOr) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/logical_xor.go b/node/expr/binary_op/logical_xor.go index f034f67..72c6034 100644 --- a/node/expr/binary_op/logical_xor.go +++ b/node/expr/binary_op/logical_xor.go @@ -37,8 +37,8 @@ func (n LogicalXor) Comments() *[]comment.Comment { return n.comments } -func (n LogicalXor) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n LogicalXor) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/minus.go b/node/expr/binary_op/minus.go index cc3ccf4..e6d6694 100644 --- a/node/expr/binary_op/minus.go +++ b/node/expr/binary_op/minus.go @@ -37,8 +37,8 @@ func (n Minus) Comments() *[]comment.Comment { return n.comments } -func (n Minus) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Minus) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/mod.go b/node/expr/binary_op/mod.go index f385912..48ea0b5 100644 --- a/node/expr/binary_op/mod.go +++ b/node/expr/binary_op/mod.go @@ -37,8 +37,8 @@ func (n Mod) Comments() *[]comment.Comment { return n.comments } -func (n Mod) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Mod) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/mul.go b/node/expr/binary_op/mul.go index 49b49f5..f47ec0a 100644 --- a/node/expr/binary_op/mul.go +++ b/node/expr/binary_op/mul.go @@ -37,8 +37,8 @@ func (n Mul) Comments() *[]comment.Comment { return n.comments } -func (n Mul) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Mul) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/not_equal.go b/node/expr/binary_op/not_equal.go index 8fc23fe..979f3d8 100644 --- a/node/expr/binary_op/not_equal.go +++ b/node/expr/binary_op/not_equal.go @@ -37,8 +37,8 @@ func (n NotEqual) Comments() *[]comment.Comment { return n.comments } -func (n NotEqual) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n NotEqual) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/not_identical.go b/node/expr/binary_op/not_identical.go index 1414b67..6fc1a50 100644 --- a/node/expr/binary_op/not_identical.go +++ b/node/expr/binary_op/not_identical.go @@ -37,8 +37,8 @@ func (n NotIdentical) Comments() *[]comment.Comment { return n.comments } -func (n NotIdentical) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n NotIdentical) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/plus.go b/node/expr/binary_op/plus.go index 05712be..c20b206 100644 --- a/node/expr/binary_op/plus.go +++ b/node/expr/binary_op/plus.go @@ -37,8 +37,8 @@ func (n Plus) Comments() *[]comment.Comment { return n.comments } -func (n Plus) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Plus) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/pow.go b/node/expr/binary_op/pow.go index 28b9a4f..0d85662 100644 --- a/node/expr/binary_op/pow.go +++ b/node/expr/binary_op/pow.go @@ -37,8 +37,8 @@ func (n Pow) Comments() *[]comment.Comment { return n.comments } -func (n Pow) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Pow) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/shift_left.go b/node/expr/binary_op/shift_left.go index 3c2d6fe..2772926 100644 --- a/node/expr/binary_op/shift_left.go +++ b/node/expr/binary_op/shift_left.go @@ -37,8 +37,8 @@ func (n ShiftLeft) Comments() *[]comment.Comment { return n.comments } -func (n ShiftLeft) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ShiftLeft) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/shift_right.go b/node/expr/binary_op/shift_right.go index 618f212..1e5acb5 100644 --- a/node/expr/binary_op/shift_right.go +++ b/node/expr/binary_op/shift_right.go @@ -37,8 +37,8 @@ func (n ShiftRight) Comments() *[]comment.Comment { return n.comments } -func (n ShiftRight) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ShiftRight) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/smaller.go b/node/expr/binary_op/smaller.go index 5a02365..7438575 100644 --- a/node/expr/binary_op/smaller.go +++ b/node/expr/binary_op/smaller.go @@ -37,8 +37,8 @@ func (n Smaller) Comments() *[]comment.Comment { return n.comments } -func (n Smaller) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Smaller) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/smaller_or_equal.go b/node/expr/binary_op/smaller_or_equal.go index 8345562..5d874a8 100644 --- a/node/expr/binary_op/smaller_or_equal.go +++ b/node/expr/binary_op/smaller_or_equal.go @@ -37,8 +37,8 @@ func (n SmallerOrEqual) Comments() *[]comment.Comment { return n.comments } -func (n SmallerOrEqual) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n SmallerOrEqual) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/binary_op/spaceship.go b/node/expr/binary_op/spaceship.go index 999651a..888d147 100644 --- a/node/expr/binary_op/spaceship.go +++ b/node/expr/binary_op/spaceship.go @@ -37,8 +37,8 @@ func (n Spaceship) Comments() *[]comment.Comment { return n.comments } -func (n Spaceship) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Spaceship) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/bitwise_not.go b/node/expr/bitwise_not.go index 05c0721..205fd1a 100644 --- a/node/expr/bitwise_not.go +++ b/node/expr/bitwise_not.go @@ -36,8 +36,8 @@ func (n BitwiseNot) Comments() *[]comment.Comment { return n.comments } -func (n BitwiseNot) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n BitwiseNot) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/boolean_not.go b/node/expr/boolean_not.go index 18ef3e4..b7beb7e 100644 --- a/node/expr/boolean_not.go +++ b/node/expr/boolean_not.go @@ -36,8 +36,8 @@ func (n BooleanNot) Comments() *[]comment.Comment { return n.comments } -func (n BooleanNot) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n BooleanNot) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/cast/cast_array.go b/node/expr/cast/cast_array.go index 51e47c4..2403a1a 100644 --- a/node/expr/cast/cast_array.go +++ b/node/expr/cast/cast_array.go @@ -36,8 +36,8 @@ func (n CastArray) Comments() *[]comment.Comment { return n.comments } -func (n CastArray) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n CastArray) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/cast/cast_bool.go b/node/expr/cast/cast_bool.go index 6d25a75..583b839 100644 --- a/node/expr/cast/cast_bool.go +++ b/node/expr/cast/cast_bool.go @@ -36,8 +36,8 @@ func (n CastBool) Comments() *[]comment.Comment { return n.comments } -func (n CastBool) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n CastBool) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/cast/cast_double.go b/node/expr/cast/cast_double.go index 820578b..da06a18 100644 --- a/node/expr/cast/cast_double.go +++ b/node/expr/cast/cast_double.go @@ -36,8 +36,8 @@ func (n CastDouble) Comments() *[]comment.Comment { return n.comments } -func (n CastDouble) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n CastDouble) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/cast/cast_int.go b/node/expr/cast/cast_int.go index fed7775..44e57c1 100644 --- a/node/expr/cast/cast_int.go +++ b/node/expr/cast/cast_int.go @@ -36,8 +36,8 @@ func (n CastInt) Comments() *[]comment.Comment { return n.comments } -func (n CastInt) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n CastInt) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/cast/cast_object.go b/node/expr/cast/cast_object.go index 1c3ade0..8c4079b 100644 --- a/node/expr/cast/cast_object.go +++ b/node/expr/cast/cast_object.go @@ -36,8 +36,8 @@ func (n CastObject) Comments() *[]comment.Comment { return n.comments } -func (n CastObject) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n CastObject) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/cast/cast_string.go b/node/expr/cast/cast_string.go index f73969f..1057678 100644 --- a/node/expr/cast/cast_string.go +++ b/node/expr/cast/cast_string.go @@ -36,8 +36,8 @@ func (n CastString) Comments() *[]comment.Comment { return n.comments } -func (n CastString) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n CastString) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/cast/cast_unset.go b/node/expr/cast/cast_unset.go index 8a6fb48..b97c867 100644 --- a/node/expr/cast/cast_unset.go +++ b/node/expr/cast/cast_unset.go @@ -36,8 +36,8 @@ func (n CastUnset) Comments() *[]comment.Comment { return n.comments } -func (n CastUnset) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n CastUnset) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/class_const_fetch.go b/node/expr/class_const_fetch.go index e220f98..a0e0fa4 100644 --- a/node/expr/class_const_fetch.go +++ b/node/expr/class_const_fetch.go @@ -38,8 +38,8 @@ func (n ClassConstFetch) Comments() *[]comment.Comment { return n.comments } -func (n ClassConstFetch) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ClassConstFetch) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/clone.go b/node/expr/clone.go index e25eec4..40baff3 100644 --- a/node/expr/clone.go +++ b/node/expr/clone.go @@ -36,8 +36,8 @@ func (n Clone) Comments() *[]comment.Comment { return n.comments } -func (n Clone) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Clone) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/closure.go b/node/expr/closure.go index 64143d2..d1a665f 100644 --- a/node/expr/closure.go +++ b/node/expr/closure.go @@ -52,8 +52,8 @@ func (n Closure) Comments() *[]comment.Comment { return n.comments } -func (n Closure) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Closure) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/closure_use.go b/node/expr/closure_use.go index 5a9dad2..eb7662a 100644 --- a/node/expr/closure_use.go +++ b/node/expr/closure_use.go @@ -40,8 +40,8 @@ func (n ClusureUse) Comments() *[]comment.Comment { return n.comments } -func (n ClusureUse) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ClusureUse) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/const_fetch.go b/node/expr/const_fetch.go index 31115f5..50347f8 100644 --- a/node/expr/const_fetch.go +++ b/node/expr/const_fetch.go @@ -36,8 +36,8 @@ func (n ConstFetch) Comments() *[]comment.Comment { return n.comments } -func (n ConstFetch) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ConstFetch) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/empty.go b/node/expr/empty.go index 5080f86..a323e06 100644 --- a/node/expr/empty.go +++ b/node/expr/empty.go @@ -36,8 +36,8 @@ func (n Empty) Comments() *[]comment.Comment { return n.comments } -func (n Empty) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Empty) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/error_suppress.go b/node/expr/error_suppress.go index 7a280a8..aea40b9 100644 --- a/node/expr/error_suppress.go +++ b/node/expr/error_suppress.go @@ -36,8 +36,8 @@ func (n ErrorSuppress) Comments() *[]comment.Comment { return n.comments } -func (n ErrorSuppress) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ErrorSuppress) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/eval.go b/node/expr/eval.go index 8183248..664ea32 100644 --- a/node/expr/eval.go +++ b/node/expr/eval.go @@ -36,8 +36,8 @@ func (n Eval) Comments() *[]comment.Comment { return n.comments } -func (n Eval) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Eval) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/exit.go b/node/expr/exit.go index de55874..3770d97 100644 --- a/node/expr/exit.go +++ b/node/expr/exit.go @@ -40,8 +40,8 @@ func (n Exit) Comments() *[]comment.Comment { return n.comments } -func (n Exit) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Exit) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/function_call.go b/node/expr/function_call.go index b988b59..e36f879 100644 --- a/node/expr/function_call.go +++ b/node/expr/function_call.go @@ -38,8 +38,8 @@ func (n FunctionCall) Comments() *[]comment.Comment { return n.comments } -func (n FunctionCall) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n FunctionCall) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/include.go b/node/expr/include.go index e992207..3860a99 100644 --- a/node/expr/include.go +++ b/node/expr/include.go @@ -36,8 +36,8 @@ func (n Include) Comments() *[]comment.Comment { return n.comments } -func (n Include) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Include) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/include_once.go b/node/expr/include_once.go index f1a1dbe..c9accd7 100644 --- a/node/expr/include_once.go +++ b/node/expr/include_once.go @@ -36,8 +36,8 @@ func (n IncludeOnce) Comments() *[]comment.Comment { return n.comments } -func (n IncludeOnce) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n IncludeOnce) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/instance_of.go b/node/expr/instance_of.go index 50e7b8e..b9ecd86 100644 --- a/node/expr/instance_of.go +++ b/node/expr/instance_of.go @@ -38,8 +38,8 @@ func (n InstanceOf) Comments() *[]comment.Comment { return n.comments } -func (n InstanceOf) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n InstanceOf) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/isset.go b/node/expr/isset.go index 4f019e7..125372b 100644 --- a/node/expr/isset.go +++ b/node/expr/isset.go @@ -36,8 +36,8 @@ func (n Isset) Comments() *[]comment.Comment { return n.comments } -func (n Isset) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Isset) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/list.go b/node/expr/list.go index 93e4e26..860a6a4 100644 --- a/node/expr/list.go +++ b/node/expr/list.go @@ -36,8 +36,8 @@ func (n List) Comments() *[]comment.Comment { return n.comments } -func (n List) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n List) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/method_call.go b/node/expr/method_call.go index fd3c2eb..a5669b5 100644 --- a/node/expr/method_call.go +++ b/node/expr/method_call.go @@ -40,8 +40,8 @@ func (n MethodCall) Comments() *[]comment.Comment { return n.comments } -func (n MethodCall) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n MethodCall) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/new.go b/node/expr/new.go index c4e1eb3..5404043 100644 --- a/node/expr/new.go +++ b/node/expr/new.go @@ -38,8 +38,8 @@ func (n New) Comments() *[]comment.Comment { return n.comments } -func (n New) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n New) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/post_dec.go b/node/expr/post_dec.go index 64e325a..a231c67 100644 --- a/node/expr/post_dec.go +++ b/node/expr/post_dec.go @@ -36,8 +36,8 @@ func (n PostDec) Comments() *[]comment.Comment { return n.comments } -func (n PostDec) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n PostDec) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/post_inc.go b/node/expr/post_inc.go index fba26c7..6503bfc 100644 --- a/node/expr/post_inc.go +++ b/node/expr/post_inc.go @@ -36,8 +36,8 @@ func (n PostInc) Comments() *[]comment.Comment { return n.comments } -func (n PostInc) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n PostInc) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/pre_dec.go b/node/expr/pre_dec.go index 660d20d..8991bc1 100644 --- a/node/expr/pre_dec.go +++ b/node/expr/pre_dec.go @@ -36,8 +36,8 @@ func (n PreDec) Comments() *[]comment.Comment { return n.comments } -func (n PreDec) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n PreDec) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/pre_inc.go b/node/expr/pre_inc.go index 090f98f..2b117a5 100644 --- a/node/expr/pre_inc.go +++ b/node/expr/pre_inc.go @@ -36,8 +36,8 @@ func (n PreInc) Comments() *[]comment.Comment { return n.comments } -func (n PreInc) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n PreInc) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/print.go b/node/expr/print.go index e73a134..0867b9b 100644 --- a/node/expr/print.go +++ b/node/expr/print.go @@ -36,8 +36,8 @@ func (n Print) Comments() *[]comment.Comment { return n.comments } -func (n Print) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Print) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/property_fetch.go b/node/expr/property_fetch.go index af1781d..e5701d3 100644 --- a/node/expr/property_fetch.go +++ b/node/expr/property_fetch.go @@ -38,8 +38,8 @@ func (n PropertyFetch) Comments() *[]comment.Comment { return n.comments } -func (n PropertyFetch) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n PropertyFetch) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/require.go b/node/expr/require.go index 6d2f706..66a7bc9 100644 --- a/node/expr/require.go +++ b/node/expr/require.go @@ -36,8 +36,8 @@ func (n Require) Comments() *[]comment.Comment { return n.comments } -func (n Require) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Require) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/require_once.go b/node/expr/require_once.go index f9e6bd1..e4886c8 100644 --- a/node/expr/require_once.go +++ b/node/expr/require_once.go @@ -36,8 +36,8 @@ func (n RequireOnce) Comments() *[]comment.Comment { return n.comments } -func (n RequireOnce) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n RequireOnce) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/shell_exec.go b/node/expr/shell_exec.go index be6ee7d..25fd0ae 100644 --- a/node/expr/shell_exec.go +++ b/node/expr/shell_exec.go @@ -36,8 +36,8 @@ func (n ShellExec) Comments() *[]comment.Comment { return n.comments } -func (n ShellExec) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ShellExec) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/short_array.go b/node/expr/short_array.go index aba0c02..e959a87 100644 --- a/node/expr/short_array.go +++ b/node/expr/short_array.go @@ -36,8 +36,8 @@ func (n ShortArray) Comments() *[]comment.Comment { return n.comments } -func (n ShortArray) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ShortArray) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/short_list.go b/node/expr/short_list.go index 71bbe68..b5c53b5 100644 --- a/node/expr/short_list.go +++ b/node/expr/short_list.go @@ -36,8 +36,8 @@ func (n ShortList) Comments() *[]comment.Comment { return n.comments } -func (n ShortList) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ShortList) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/static_call.go b/node/expr/static_call.go index 91118d3..009c7a5 100644 --- a/node/expr/static_call.go +++ b/node/expr/static_call.go @@ -40,8 +40,8 @@ func (n StaticCall) Comments() *[]comment.Comment { return n.comments } -func (n StaticCall) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n StaticCall) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/static_property_fetch.go b/node/expr/static_property_fetch.go index 4f8713d..0bce323 100644 --- a/node/expr/static_property_fetch.go +++ b/node/expr/static_property_fetch.go @@ -38,8 +38,8 @@ func (n StaticPropertyFetch) Comments() *[]comment.Comment { return n.comments } -func (n StaticPropertyFetch) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n StaticPropertyFetch) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/ternary.go b/node/expr/ternary.go index bb0cf8b..739f375 100644 --- a/node/expr/ternary.go +++ b/node/expr/ternary.go @@ -40,8 +40,8 @@ func (n Ternary) Comments() *[]comment.Comment { return n.comments } -func (n Ternary) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Ternary) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/unary_minus.go b/node/expr/unary_minus.go index 5dc4098..c3e8c87 100644 --- a/node/expr/unary_minus.go +++ b/node/expr/unary_minus.go @@ -36,8 +36,8 @@ func (n UnaryMinus) Comments() *[]comment.Comment { return n.comments } -func (n UnaryMinus) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n UnaryMinus) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/unary_plus.go b/node/expr/unary_plus.go index e013337..921b48e 100644 --- a/node/expr/unary_plus.go +++ b/node/expr/unary_plus.go @@ -36,8 +36,8 @@ func (n UnaryPlus) Comments() *[]comment.Comment { return n.comments } -func (n UnaryPlus) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n UnaryPlus) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/variable.go b/node/expr/variable.go index 667e4a7..b54799b 100644 --- a/node/expr/variable.go +++ b/node/expr/variable.go @@ -36,8 +36,8 @@ func (n Variable) Comments() *[]comment.Comment { return n.comments } -func (n Variable) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Variable) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/yield.go b/node/expr/yield.go index 97d93b9..add0f4d 100644 --- a/node/expr/yield.go +++ b/node/expr/yield.go @@ -38,8 +38,8 @@ func (n Yield) Comments() *[]comment.Comment { return n.comments } -func (n Yield) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Yield) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/expr/yield_from.go b/node/expr/yield_from.go index 1def185..19efee7 100644 --- a/node/expr/yield_from.go +++ b/node/expr/yield_from.go @@ -36,8 +36,8 @@ func (n YieldFrom) Comments() *[]comment.Comment { return n.comments } -func (n YieldFrom) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n YieldFrom) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/identifier.go b/node/identifier.go index a1432a0..533e74d 100644 --- a/node/identifier.go +++ b/node/identifier.go @@ -35,8 +35,8 @@ func (n Identifier) Comments() *[]comment.Comment { return n.comments } -func (n Identifier) SetComments(c []comment.Comment) Node { - n.comments = &c +func (n Identifier) SetComments(c *[]comment.Comment) Node { + n.comments = c return n } diff --git a/node/name/name.go b/node/name/name.go index 3faf986..3c8d5b2 100644 --- a/node/name/name.go +++ b/node/name/name.go @@ -36,8 +36,8 @@ func (n Name) Comments() *[]comment.Comment { return n.comments } -func (n Name) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Name) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/name/name_part.go b/node/name/name_part.go index 7dce590..9ce00c9 100644 --- a/node/name/name_part.go +++ b/node/name/name_part.go @@ -38,8 +38,8 @@ func (n NamePart) Comments() *[]comment.Comment { return n.comments } -func (n NamePart) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n NamePart) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/node.go b/node/node.go index ff96c67..3b7aaa0 100644 --- a/node/node.go +++ b/node/node.go @@ -12,7 +12,7 @@ type Node interface { type Commenter interface { Comments() *[]comment.Comment - SetComments([]comment.Comment) Node + SetComments(*[]comment.Comment) Node } type Positioner interface { diff --git a/node/nullable.go b/node/nullable.go index 219a188..7dc8355 100644 --- a/node/nullable.go +++ b/node/nullable.go @@ -33,8 +33,8 @@ func (n Nullable) Comments() *[]comment.Comment { return n.comments } -func (n Nullable) SetComments(c []comment.Comment) Node { - n.comments = &c +func (n Nullable) SetComments(c *[]comment.Comment) Node { + n.comments = c return n } diff --git a/node/parameter.go b/node/parameter.go index 58a0083..65cfe0e 100644 --- a/node/parameter.go +++ b/node/parameter.go @@ -44,8 +44,8 @@ func (n Parameter) Comments() *[]comment.Comment { return n.comments } -func (n Parameter) SetComments(c []comment.Comment) Node { - n.comments = &c +func (n Parameter) SetComments(c *[]comment.Comment) Node { + n.comments = c return n } diff --git a/node/scalar/dnumber.go b/node/scalar/dnumber.go index 6e7584c..b2696cd 100644 --- a/node/scalar/dnumber.go +++ b/node/scalar/dnumber.go @@ -38,8 +38,8 @@ func (n Dnumber) Comments() *[]comment.Comment { return n.comments } -func (n Dnumber) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Dnumber) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/scalar/encapsed.go b/node/scalar/encapsed.go index 7eb26c4..693f195 100644 --- a/node/scalar/encapsed.go +++ b/node/scalar/encapsed.go @@ -36,8 +36,8 @@ func (n Encapsed) Comments() *[]comment.Comment { return n.comments } -func (n Encapsed) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Encapsed) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/scalar/encapsed_string_part.go b/node/scalar/encapsed_string_part.go index c5b6388..c17af13 100644 --- a/node/scalar/encapsed_string_part.go +++ b/node/scalar/encapsed_string_part.go @@ -38,8 +38,8 @@ func (n EncapsedStringPart) Comments() *[]comment.Comment { return n.comments } -func (n EncapsedStringPart) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n EncapsedStringPart) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/scalar/lnumber.go b/node/scalar/lnumber.go index 4089410..cdd06f3 100644 --- a/node/scalar/lnumber.go +++ b/node/scalar/lnumber.go @@ -38,8 +38,8 @@ func (n Lnumber) Comments() *[]comment.Comment { return n.comments } -func (n Lnumber) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Lnumber) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/scalar/magic_constant.go b/node/scalar/magic_constant.go index beafca9..a9d1671 100644 --- a/node/scalar/magic_constant.go +++ b/node/scalar/magic_constant.go @@ -38,8 +38,8 @@ func (n MagicConstant) Comments() *[]comment.Comment { return n.comments } -func (n MagicConstant) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n MagicConstant) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/scalar/string.go b/node/scalar/string.go index 226e997..79dff54 100644 --- a/node/scalar/string.go +++ b/node/scalar/string.go @@ -38,8 +38,8 @@ func (n String) Comments() *[]comment.Comment { return n.comments } -func (n String) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n String) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/alt_else.go b/node/stmt/alt_else.go index 94086f2..a3b390d 100644 --- a/node/stmt/alt_else.go +++ b/node/stmt/alt_else.go @@ -36,8 +36,8 @@ func (n AltElse) Comments() *[]comment.Comment { return n.comments } -func (n AltElse) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n AltElse) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/alt_else_if.go b/node/stmt/alt_else_if.go index 687ee2b..b516b26 100644 --- a/node/stmt/alt_else_if.go +++ b/node/stmt/alt_else_if.go @@ -38,8 +38,8 @@ func (n AltElseIf) Comments() *[]comment.Comment { return n.comments } -func (n AltElseIf) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n AltElseIf) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/alt_if.go b/node/stmt/alt_if.go index 87f5bf7..55604ad 100644 --- a/node/stmt/alt_if.go +++ b/node/stmt/alt_if.go @@ -42,8 +42,8 @@ func (n AltIf) Comments() *[]comment.Comment { return n.comments } -func (n AltIf) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n AltIf) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/break.go b/node/stmt/break.go index 2dee43a..9313dfb 100644 --- a/node/stmt/break.go +++ b/node/stmt/break.go @@ -36,8 +36,8 @@ func (n Break) Comments() *[]comment.Comment { return n.comments } -func (n Break) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Break) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/case.go b/node/stmt/case.go index 46265f6..0dcfe77 100644 --- a/node/stmt/case.go +++ b/node/stmt/case.go @@ -38,8 +38,8 @@ func (n Case) Comments() *[]comment.Comment { return n.comments } -func (n Case) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Case) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/catch.go b/node/stmt/catch.go index c8a3c92..cfe5e5e 100644 --- a/node/stmt/catch.go +++ b/node/stmt/catch.go @@ -40,8 +40,8 @@ func (n Catch) Comments() *[]comment.Comment { return n.comments } -func (n Catch) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Catch) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/class.go b/node/stmt/class.go index fcbe6d5..1fafb67 100644 --- a/node/stmt/class.go +++ b/node/stmt/class.go @@ -50,8 +50,8 @@ func (n Class) Comments() *[]comment.Comment { return n.comments } -func (n Class) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Class) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/class_const_list.go b/node/stmt/class_const_list.go index b631988..faa3aef 100644 --- a/node/stmt/class_const_list.go +++ b/node/stmt/class_const_list.go @@ -38,8 +38,8 @@ func (n ClassConstList) Comments() *[]comment.Comment { return n.comments } -func (n ClassConstList) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ClassConstList) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/class_method.go b/node/stmt/class_method.go index 579240a..a48b43e 100644 --- a/node/stmt/class_method.go +++ b/node/stmt/class_method.go @@ -51,8 +51,8 @@ func (n ClassMethod) Comments() *[]comment.Comment { return n.comments } -func (n ClassMethod) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ClassMethod) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/const_list.go b/node/stmt/const_list.go index 4c53595..61144ab 100644 --- a/node/stmt/const_list.go +++ b/node/stmt/const_list.go @@ -36,8 +36,8 @@ func (n ConstList) Comments() *[]comment.Comment { return n.comments } -func (n ConstList) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ConstList) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/constant.go b/node/stmt/constant.go index f6470f6..77cdb61 100644 --- a/node/stmt/constant.go +++ b/node/stmt/constant.go @@ -42,8 +42,8 @@ func (n Constant) Comments() *[]comment.Comment { return n.comments } -func (n Constant) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Constant) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/continue.go b/node/stmt/continue.go index df71ffb..773084d 100644 --- a/node/stmt/continue.go +++ b/node/stmt/continue.go @@ -36,8 +36,8 @@ func (n Continue) Comments() *[]comment.Comment { return n.comments } -func (n Continue) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Continue) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/declare.go b/node/stmt/declare.go index 5c4c435..828cd7d 100644 --- a/node/stmt/declare.go +++ b/node/stmt/declare.go @@ -38,8 +38,8 @@ func (n Declare) Comments() *[]comment.Comment { return n.comments } -func (n Declare) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Declare) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/default.go b/node/stmt/default.go index 9b5db97..7a2d629 100644 --- a/node/stmt/default.go +++ b/node/stmt/default.go @@ -36,8 +36,8 @@ func (n Default) Comments() *[]comment.Comment { return n.comments } -func (n Default) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Default) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/do.go b/node/stmt/do.go index 13e1938..8f4535f 100644 --- a/node/stmt/do.go +++ b/node/stmt/do.go @@ -38,8 +38,8 @@ func (n Do) Comments() *[]comment.Comment { return n.comments } -func (n Do) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Do) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/echo.go b/node/stmt/echo.go index f569124..5a6054d 100644 --- a/node/stmt/echo.go +++ b/node/stmt/echo.go @@ -36,8 +36,8 @@ func (n Echo) Comments() *[]comment.Comment { return n.comments } -func (n Echo) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Echo) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/else.go b/node/stmt/else.go index 4d9ed58..fec37bc 100644 --- a/node/stmt/else.go +++ b/node/stmt/else.go @@ -36,8 +36,8 @@ func (n Else) Comments() *[]comment.Comment { return n.comments } -func (n Else) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Else) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/else_if.go b/node/stmt/else_if.go index b0d4a64..6e06e0e 100644 --- a/node/stmt/else_if.go +++ b/node/stmt/else_if.go @@ -38,8 +38,8 @@ func (n ElseIf) Comments() *[]comment.Comment { return n.comments } -func (n ElseIf) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n ElseIf) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/expression.go b/node/stmt/expression.go index dc180ec..93f6d37 100644 --- a/node/stmt/expression.go +++ b/node/stmt/expression.go @@ -36,8 +36,8 @@ func (n Expression) Comments() *[]comment.Comment { return n.comments } -func (n Expression) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Expression) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/finally.go b/node/stmt/finally.go index 1827558..d2a5df1 100644 --- a/node/stmt/finally.go +++ b/node/stmt/finally.go @@ -36,8 +36,8 @@ func (n Finally) Comments() *[]comment.Comment { return n.comments } -func (n Finally) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Finally) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/for.go b/node/stmt/for.go index dacac5c..f6dd0ff 100644 --- a/node/stmt/for.go +++ b/node/stmt/for.go @@ -42,8 +42,8 @@ func (n For) Comments() *[]comment.Comment { return n.comments } -func (n For) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n For) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/foreach.go b/node/stmt/foreach.go index 89b3161..d328438 100644 --- a/node/stmt/foreach.go +++ b/node/stmt/foreach.go @@ -46,8 +46,8 @@ func (n Foreach) Comments() *[]comment.Comment { return n.comments } -func (n Foreach) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Foreach) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/function.go b/node/stmt/function.go index 19aeac4..83bee35 100644 --- a/node/stmt/function.go +++ b/node/stmt/function.go @@ -50,8 +50,8 @@ func (n Function) Comments() *[]comment.Comment { return n.comments } -func (n Function) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Function) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/global.go b/node/stmt/global.go index 2934e6f..90bb138 100644 --- a/node/stmt/global.go +++ b/node/stmt/global.go @@ -36,8 +36,8 @@ func (n Global) Comments() *[]comment.Comment { return n.comments } -func (n Global) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Global) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/goto.go b/node/stmt/goto.go index 82901e9..81ac98e 100644 --- a/node/stmt/goto.go +++ b/node/stmt/goto.go @@ -36,8 +36,8 @@ func (n Goto) Comments() *[]comment.Comment { return n.comments } -func (n Goto) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Goto) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/group_use.go b/node/stmt/group_use.go index 73299d7..628b392 100644 --- a/node/stmt/group_use.go +++ b/node/stmt/group_use.go @@ -40,8 +40,8 @@ func (n GroupUse) Comments() *[]comment.Comment { return n.comments } -func (n GroupUse) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n GroupUse) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/halt_compiler.go b/node/stmt/halt_compiler.go index 8a0bc62..7e7f259 100644 --- a/node/stmt/halt_compiler.go +++ b/node/stmt/halt_compiler.go @@ -34,8 +34,8 @@ func (n HaltCompiler) Comments() *[]comment.Comment { return n.comments } -func (n HaltCompiler) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n HaltCompiler) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/if.go b/node/stmt/if.go index 7c11b2d..90668e7 100644 --- a/node/stmt/if.go +++ b/node/stmt/if.go @@ -42,8 +42,8 @@ func (n If) Comments() *[]comment.Comment { return n.comments } -func (n If) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n If) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/inline_html.go b/node/stmt/inline_html.go index 975f9fe..38f2f42 100644 --- a/node/stmt/inline_html.go +++ b/node/stmt/inline_html.go @@ -38,8 +38,8 @@ func (n InlineHtml) Comments() *[]comment.Comment { return n.comments } -func (n InlineHtml) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n InlineHtml) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/interface.go b/node/stmt/interface.go index 99a3a90..4f5b1c0 100644 --- a/node/stmt/interface.go +++ b/node/stmt/interface.go @@ -44,8 +44,8 @@ func (n Interface) Comments() *[]comment.Comment { return n.comments } -func (n Interface) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Interface) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/label.go b/node/stmt/label.go index ca47806..ee70300 100644 --- a/node/stmt/label.go +++ b/node/stmt/label.go @@ -36,8 +36,8 @@ func (n Label) Comments() *[]comment.Comment { return n.comments } -func (n Label) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Label) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/namespace.go b/node/stmt/namespace.go index 11d2911..57b7d40 100644 --- a/node/stmt/namespace.go +++ b/node/stmt/namespace.go @@ -38,8 +38,8 @@ func (n Namespace) Comments() *[]comment.Comment { return n.comments } -func (n Namespace) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Namespace) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/nop.go b/node/stmt/nop.go index bba8ec1..d173ab5 100644 --- a/node/stmt/nop.go +++ b/node/stmt/nop.go @@ -34,8 +34,8 @@ func (n Nop) Comments() *[]comment.Comment { return n.comments } -func (n Nop) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Nop) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/property.go b/node/stmt/property.go index 8ad7a97..1097b71 100644 --- a/node/stmt/property.go +++ b/node/stmt/property.go @@ -41,8 +41,8 @@ func (n Property) Comments() *[]comment.Comment { return n.comments } -func (n Property) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Property) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/property_list.go b/node/stmt/property_list.go index a30eca1..b00ac7c 100644 --- a/node/stmt/property_list.go +++ b/node/stmt/property_list.go @@ -38,8 +38,8 @@ func (n PropertyList) Comments() *[]comment.Comment { return n.comments } -func (n PropertyList) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n PropertyList) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/return.go b/node/stmt/return.go index 21a5780..432cffe 100644 --- a/node/stmt/return.go +++ b/node/stmt/return.go @@ -36,8 +36,8 @@ func (n Return) Comments() *[]comment.Comment { return n.comments } -func (n Return) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Return) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/static.go b/node/stmt/static.go index 869b4f9..4db90e0 100644 --- a/node/stmt/static.go +++ b/node/stmt/static.go @@ -36,8 +36,8 @@ func (n Static) Comments() *[]comment.Comment { return n.comments } -func (n Static) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Static) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/static_var.go b/node/stmt/static_var.go index f5f61a5..14de22c 100644 --- a/node/stmt/static_var.go +++ b/node/stmt/static_var.go @@ -38,8 +38,8 @@ func (n StaticVar) Comments() *[]comment.Comment { return n.comments } -func (n StaticVar) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n StaticVar) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/stmt_list.go b/node/stmt/stmt_list.go index 8d12ac8..d4f1d16 100644 --- a/node/stmt/stmt_list.go +++ b/node/stmt/stmt_list.go @@ -36,8 +36,8 @@ func (n StmtList) Comments() *[]comment.Comment { return n.comments } -func (n StmtList) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n StmtList) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/switch.go b/node/stmt/switch.go index b210c53..71e1e6a 100644 --- a/node/stmt/switch.go +++ b/node/stmt/switch.go @@ -41,8 +41,8 @@ func (n Switch) Comments() *[]comment.Comment { return n.comments } -func (n Switch) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Switch) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/throw.go b/node/stmt/throw.go index f014b8b..9b0db9b 100644 --- a/node/stmt/throw.go +++ b/node/stmt/throw.go @@ -36,8 +36,8 @@ func (n Throw) Comments() *[]comment.Comment { return n.comments } -func (n Throw) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Throw) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/trait.go b/node/stmt/trait.go index 000169a..ae6c927 100644 --- a/node/stmt/trait.go +++ b/node/stmt/trait.go @@ -42,8 +42,8 @@ func (n Trait) Comments() *[]comment.Comment { return n.comments } -func (n Trait) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Trait) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/trait_method_ref.go b/node/stmt/trait_method_ref.go index 32cedb3..7157dfb 100644 --- a/node/stmt/trait_method_ref.go +++ b/node/stmt/trait_method_ref.go @@ -38,8 +38,8 @@ func (n TraitMethodRef) Comments() *[]comment.Comment { return n.comments } -func (n TraitMethodRef) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n TraitMethodRef) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/trait_use.go b/node/stmt/trait_use.go index def3e9c..cc955c4 100644 --- a/node/stmt/trait_use.go +++ b/node/stmt/trait_use.go @@ -38,8 +38,8 @@ func (n TraitUse) Comments() *[]comment.Comment { return n.comments } -func (n TraitUse) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n TraitUse) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/trait_use_alias.go b/node/stmt/trait_use_alias.go index 01cb46e..6ad9e24 100644 --- a/node/stmt/trait_use_alias.go +++ b/node/stmt/trait_use_alias.go @@ -40,8 +40,8 @@ func (n TraitUseAlias) Comments() *[]comment.Comment { return n.comments } -func (n TraitUseAlias) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n TraitUseAlias) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/trait_use_precedence.go b/node/stmt/trait_use_precedence.go index 7d3c0e4..dbe9025 100644 --- a/node/stmt/trait_use_precedence.go +++ b/node/stmt/trait_use_precedence.go @@ -38,8 +38,8 @@ func (n TraitUsePrecedence) Comments() *[]comment.Comment { return n.comments } -func (n TraitUsePrecedence) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n TraitUsePrecedence) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/try.go b/node/stmt/try.go index 0d5919d..b741387 100644 --- a/node/stmt/try.go +++ b/node/stmt/try.go @@ -40,8 +40,8 @@ func (n Try) Comments() *[]comment.Comment { return n.comments } -func (n Try) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Try) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/unset.go b/node/stmt/unset.go index aedcb19..f820002 100644 --- a/node/stmt/unset.go +++ b/node/stmt/unset.go @@ -36,8 +36,8 @@ func (n Unset) Comments() *[]comment.Comment { return n.comments } -func (n Unset) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Unset) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/use.go b/node/stmt/use.go index 4d39676..eb0ce41 100644 --- a/node/stmt/use.go +++ b/node/stmt/use.go @@ -40,8 +40,8 @@ func (n Use) Comments() *[]comment.Comment { return n.comments } -func (n Use) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n Use) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/use_list.go b/node/stmt/use_list.go index fa4a358..2d4ddb6 100644 --- a/node/stmt/use_list.go +++ b/node/stmt/use_list.go @@ -38,8 +38,8 @@ func (n UseList) Comments() *[]comment.Comment { return n.comments } -func (n UseList) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n UseList) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/node/stmt/while.go b/node/stmt/while.go index 861de14..4c9f8fd 100644 --- a/node/stmt/while.go +++ b/node/stmt/while.go @@ -41,8 +41,8 @@ func (n While) Comments() *[]comment.Comment { return n.comments } -func (n While) SetComments(c []comment.Comment) node.Node { - n.comments = &c +func (n While) SetComments(c *[]comment.Comment) node.Node { + n.comments = c return n } diff --git a/parser/lexer.go b/parser/lexer.go index 9ac375e..d232565 100644 --- a/parser/lexer.go +++ b/parser/lexer.go @@ -23,7 +23,7 @@ type lexer struct { stateStack []int lineNumber int phpDocComment string - comments []comment.Comment + comments *[]comment.Comment } func rune2Class(r rune) int { @@ -46,7 +46,7 @@ func newLexer(src io.Reader, fName string) *lexer { if err != nil { panic(err) } - return &lexer{lx, []int{0}, 1, "", []comment.Comment{}} + return &lexer{lx, []int{0}, 1, "", nil} } func (l *lexer) ungetN(n int) []byte { @@ -112,3 +112,11 @@ func (l *lexer) handleNewLine(tokenBytes []byte) ([]byte, int, int, int, int) { func (l *lexer) newToken() t.Token { return t.NewToken(l.handleNewLine(l.TokenBytes(nil))).SetComments(l.comments) } + +func (l *lexer) addComment(c comment.Comment) { + if l.comments == nil { + l.comments = &[]comment.Comment{c} + } else { + *l.comments = append(*l.comments, c) + } +} diff --git a/parser/parser.go b/parser/parser.go index cc983f8..3361799 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -5,6 +5,7 @@ import __yyfmt__ "fmt" //line parser/parser.y:2 import ( + "github.com/z7zmey/php-parser/comment" "github.com/z7zmey/php-parser/node" "github.com/z7zmey/php-parser/node/expr" "github.com/z7zmey/php-parser/node/expr/assign_op" @@ -29,6 +30,16 @@ func Parse(src io.Reader, fName string) node.Node { return rootnode } +func ListGetFirstNodeComments(list []node.Node) *[]comment.Comment { + if len(list) == 0 { + return nil + } + + node := list[0] + + return node.Comments() +} + type foreachVariable struct { node node.Node byRef bool @@ -44,7 +55,7 @@ type boolWithToken struct { token *token.Token } -//line parser/parser.y:46 +//line parser/parser.y:57 type yySymType struct { yys int node node.Node @@ -368,7 +379,7 @@ const yyEofCode = 1 const yyErrCode = 2 const yyInitialStackSize = 16 -//line parser/parser.y:1456 +//line parser/parser.y:1467 //line yacctab:1 var yyExca = [...]int{ @@ -2077,547 +2088,547 @@ yydefault: case 1: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:275 + //line parser/parser.y:286 { rootnode = stmt.NewStmtList(yyDollar[1].list).SetPosition(NewNodeListPosition(yyDollar[1].list)) } case 2: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:279 + //line parser/parser.y:290 { yyVAL.token = yyDollar[1].token } case 3: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:279 + //line parser/parser.y:290 { yyVAL.token = yyDollar[1].token } case 4: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:279 + //line parser/parser.y:290 { yyVAL.token = yyDollar[1].token } case 5: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:279 + //line parser/parser.y:290 { yyVAL.token = yyDollar[1].token } case 6: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:279 + //line parser/parser.y:290 { yyVAL.token = yyDollar[1].token } case 7: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:279 + //line parser/parser.y:290 { yyVAL.token = yyDollar[1].token } case 8: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:279 + //line parser/parser.y:290 { yyVAL.token = yyDollar[1].token } case 9: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:279 + //line parser/parser.y:290 { yyVAL.token = yyDollar[1].token } case 10: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 11: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 12: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 13: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 14: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 15: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 16: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 17: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 18: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 19: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 20: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 21: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:280 + //line parser/parser.y:291 { yyVAL.token = yyDollar[1].token } case 22: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:281 + //line parser/parser.y:292 { yyVAL.token = yyDollar[1].token } case 23: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:281 + //line parser/parser.y:292 { yyVAL.token = yyDollar[1].token } case 24: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:281 + //line parser/parser.y:292 { yyVAL.token = yyDollar[1].token } case 25: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:281 + //line parser/parser.y:292 { yyVAL.token = yyDollar[1].token } case 26: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:281 + //line parser/parser.y:292 { yyVAL.token = yyDollar[1].token } case 27: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:281 + //line parser/parser.y:292 { yyVAL.token = yyDollar[1].token } case 28: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:281 + //line parser/parser.y:292 { yyVAL.token = yyDollar[1].token } case 29: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:281 + //line parser/parser.y:292 { yyVAL.token = yyDollar[1].token } case 30: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:281 + //line parser/parser.y:292 { yyVAL.token = yyDollar[1].token } case 31: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:281 + //line parser/parser.y:292 { yyVAL.token = yyDollar[1].token } case 32: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:282 + //line parser/parser.y:293 { yyVAL.token = yyDollar[1].token } case 33: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:282 + //line parser/parser.y:293 { yyVAL.token = yyDollar[1].token } case 34: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:282 + //line parser/parser.y:293 { yyVAL.token = yyDollar[1].token } case 35: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:282 + //line parser/parser.y:293 { yyVAL.token = yyDollar[1].token } case 36: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:282 + //line parser/parser.y:293 { yyVAL.token = yyDollar[1].token } case 37: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:282 + //line parser/parser.y:293 { yyVAL.token = yyDollar[1].token } case 38: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:282 + //line parser/parser.y:293 { yyVAL.token = yyDollar[1].token } case 39: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:282 + //line parser/parser.y:293 { yyVAL.token = yyDollar[1].token } case 40: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:282 + //line parser/parser.y:293 { yyVAL.token = yyDollar[1].token } case 41: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:282 + //line parser/parser.y:293 { yyVAL.token = yyDollar[1].token } case 42: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 43: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 44: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 45: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 46: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 47: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 48: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 49: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 50: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 51: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 52: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:283 + //line parser/parser.y:294 { yyVAL.token = yyDollar[1].token } case 53: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:284 + //line parser/parser.y:295 { yyVAL.token = yyDollar[1].token } case 54: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:284 + //line parser/parser.y:295 { yyVAL.token = yyDollar[1].token } case 55: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:284 + //line parser/parser.y:295 { yyVAL.token = yyDollar[1].token } case 56: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:284 + //line parser/parser.y:295 { yyVAL.token = yyDollar[1].token } case 57: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:284 + //line parser/parser.y:295 { yyVAL.token = yyDollar[1].token } case 58: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:284 + //line parser/parser.y:295 { yyVAL.token = yyDollar[1].token } case 59: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:284 + //line parser/parser.y:295 { yyVAL.token = yyDollar[1].token } case 60: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:284 + //line parser/parser.y:295 { yyVAL.token = yyDollar[1].token } case 61: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:285 + //line parser/parser.y:296 { yyVAL.token = yyDollar[1].token } case 62: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:285 + //line parser/parser.y:296 { yyVAL.token = yyDollar[1].token } case 63: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:285 + //line parser/parser.y:296 { yyVAL.token = yyDollar[1].token } case 64: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:285 + //line parser/parser.y:296 { yyVAL.token = yyDollar[1].token } case 65: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:285 + //line parser/parser.y:296 { yyVAL.token = yyDollar[1].token } case 66: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:285 + //line parser/parser.y:296 { yyVAL.token = yyDollar[1].token } case 67: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:285 + //line parser/parser.y:296 { yyVAL.token = yyDollar[1].token } case 68: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:285 + //line parser/parser.y:296 { yyVAL.token = yyDollar[1].token } case 69: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:289 + //line parser/parser.y:300 { yyVAL.token = yyDollar[1].token } case 70: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:290 + //line parser/parser.y:301 { yyVAL.token = yyDollar[1].token } case 71: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:290 + //line parser/parser.y:301 { yyVAL.token = yyDollar[1].token } case 72: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:290 + //line parser/parser.y:301 { yyVAL.token = yyDollar[1].token } case 73: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:290 + //line parser/parser.y:301 { yyVAL.token = yyDollar[1].token } case 74: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:290 + //line parser/parser.y:301 { yyVAL.token = yyDollar[1].token } case 75: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:290 + //line parser/parser.y:301 { yyVAL.token = yyDollar[1].token } case 76: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:294 + //line parser/parser.y:305 { yyVAL.token = yyDollar[1].token } case 77: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:295 + //line parser/parser.y:306 { yyVAL.token = yyDollar[1].token } case 78: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:299 + //line parser/parser.y:310 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) } case 79: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:300 + //line parser/parser.y:311 { yyVAL.list = []node.Node{} } case 80: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:304 + //line parser/parser.y:315 { yyVAL.list = []node.Node{name.NewNamePart(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token))} } case 81: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:305 + //line parser/parser.y:316 { yyVAL.list = append(yyDollar[1].list, name.NewNamePart(yyDollar[3].token.Value).SetComments(ListGetFirstNodeComments(yyDollar[1].list)).SetPosition(NewTokenPosition(yyDollar[3].token))) } case 82: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:309 + //line parser/parser.y:320 { yyVAL.node = name.NewName(yyDollar[1].list).SetComments(ListGetFirstNodeComments(yyDollar[1].list)).SetPosition(NewNodeListPosition(yyDollar[1].list)) } case 83: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:310 + //line parser/parser.y:321 { yyVAL.node = name.NewRelative(yyDollar[3].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodeListPosition(yyDollar[1].token, yyDollar[3].list)) } case 84: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:311 + //line parser/parser.y:322 { yyVAL.node = name.NewFullyQualified(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodeListPosition(yyDollar[1].token, yyDollar[2].list)) } case 85: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:315 + //line parser/parser.y:326 { yyVAL.node = yyDollar[1].node } case 86: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:316 + //line parser/parser.y:327 { yyVAL.node = yyDollar[1].node } case 87: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:317 + //line parser/parser.y:328 { yyVAL.node = yyDollar[1].node } case 88: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:318 + //line parser/parser.y:329 { yyVAL.node = yyDollar[1].node } case 89: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:319 + //line parser/parser.y:330 { yyVAL.node = yyDollar[1].node } case 90: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:320 + //line parser/parser.y:331 { yyVAL.node = stmt.NewHaltCompiler() } case 91: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:322 + //line parser/parser.y:333 { name := name.NewName(yyDollar[2].list).SetComments(ListGetFirstNodeComments(yyDollar[2].list)).SetPosition(NewNodeListPosition(yyDollar[2].list)) yyVAL.node = stmt.NewNamespace(name, nil). @@ -2626,7 +2637,7 @@ yydefault: } case 92: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:329 + //line parser/parser.y:340 { name := name.NewName(yyDollar[2].list).SetComments(ListGetFirstNodeComments(yyDollar[2].list)).SetPosition(NewNodeListPosition(yyDollar[2].list)) yyVAL.node = stmt.NewNamespace(name, yyDollar[4].list). @@ -2635,55 +2646,55 @@ yydefault: } case 93: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:335 + //line parser/parser.y:346 { yyVAL.node = stmt.NewNamespace(nil, yyDollar[3].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 94: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:336 + //line parser/parser.y:347 { yyVAL.node = yyDollar[2].node } case 95: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:337 + //line parser/parser.y:348 { yyVAL.node = yyDollar[3].node.(stmt.GroupUse).SetUseType(yyDollar[2].node) } case 96: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:338 + //line parser/parser.y:349 { yyVAL.node = stmt.NewUseList(nil, yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 97: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:339 + //line parser/parser.y:350 { yyVAL.node = stmt.NewUseList(yyDollar[2].node, yyDollar[3].list) } case 98: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:340 + //line parser/parser.y:351 { yyVAL.node = stmt.NewConstList(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 99: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:344 + //line parser/parser.y:355 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 100: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:345 + //line parser/parser.y:356 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 101: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:350 + //line parser/parser.y:361 { name := name.NewName(yyDollar[1].list).SetComments(ListGetFirstNodeComments(yyDollar[1].list)).SetPosition(NewNodeListPosition(yyDollar[1].list)) yyVAL.node = stmt.NewGroupUse(nil, name, yyDollar[4].list). @@ -2692,7 +2703,7 @@ yydefault: } case 102: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:357 + //line parser/parser.y:368 { name := name.NewName(yyDollar[2].list).SetComments(ListGetFirstNodeComments(yyDollar[2].list)).SetPosition(NewNodeListPosition(yyDollar[2].list)) yyVAL.node = stmt.NewGroupUse(nil, name, yyDollar[5].list). @@ -2701,7 +2712,7 @@ yydefault: } case 103: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:367 + //line parser/parser.y:378 { name := name.NewName(yyDollar[1].list).SetComments(ListGetFirstNodeComments(yyDollar[1].list)).SetPosition(NewNodeListPosition(yyDollar[1].list)) yyVAL.node = stmt.NewGroupUse(nil, name, yyDollar[4].list). @@ -2710,7 +2721,7 @@ yydefault: } case 104: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:374 + //line parser/parser.y:385 { name := name.NewName(yyDollar[2].list).SetComments(ListGetFirstNodeComments(yyDollar[2].list)).SetPosition(NewNodeListPosition(yyDollar[2].list)) yyVAL.node = stmt.NewGroupUse(nil, name, yyDollar[5].list). @@ -2719,62 +2730,62 @@ yydefault: } case 107: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:389 + //line parser/parser.y:400 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 108: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:390 + //line parser/parser.y:401 { yyVAL.list = []node.Node{yyDollar[1].node} } case 109: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:395 + //line parser/parser.y:406 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 110: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:396 + //line parser/parser.y:407 { yyVAL.list = []node.Node{yyDollar[1].node} } case 111: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:400 + //line parser/parser.y:411 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 112: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:401 + //line parser/parser.y:412 { yyVAL.list = []node.Node{yyDollar[1].node} } case 113: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:405 + //line parser/parser.y:416 { yyVAL.node = yyDollar[1].node } case 114: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:406 + //line parser/parser.y:417 { yyVAL.node = yyDollar[2].node.(stmt.Use).SetUseType(yyDollar[1].node) } case 115: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:411 + //line parser/parser.y:422 { name := name.NewName(yyDollar[1].list).SetComments(ListGetFirstNodeComments(yyDollar[1].list)).SetPosition(NewNodeListPosition(yyDollar[1].list)) yyVAL.node = stmt.NewUse(nil, name, nil).SetComments(ListGetFirstNodeComments(yyDollar[1].list)).SetPosition(NewNodeListPosition(yyDollar[1].list)) } case 116: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:416 + //line parser/parser.y:427 { name := name.NewName(yyDollar[1].list).SetComments(ListGetFirstNodeComments(yyDollar[1].list)).SetPosition(NewNodeListPosition(yyDollar[1].list)) alias := node.NewIdentifier(yyDollar[3].token.Value).SetComments(yyDollar[3].token.Comments()).SetPosition(NewTokenPosition(yyDollar[3].token)) @@ -2782,199 +2793,199 @@ yydefault: } case 117: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:424 + //line parser/parser.y:435 { yyVAL.node = yyDollar[1].node } case 118: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:425 + //line parser/parser.y:436 { yyVAL.node = yyDollar[2].node } case 119: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:429 + //line parser/parser.y:440 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 120: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:430 + //line parser/parser.y:441 { yyVAL.list = []node.Node{yyDollar[1].node} } case 121: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:434 + //line parser/parser.y:445 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) } case 122: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:435 + //line parser/parser.y:446 { yyVAL.list = []node.Node{} } case 123: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:439 + //line parser/parser.y:450 { yyVAL.node = yyDollar[1].node } case 124: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:440 + //line parser/parser.y:451 { yyVAL.node = yyDollar[1].node } case 125: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:441 + //line parser/parser.y:452 { yyVAL.node = yyDollar[1].node } case 126: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:442 + //line parser/parser.y:453 { yyVAL.node = yyDollar[1].node } case 127: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:443 + //line parser/parser.y:454 { yyVAL.node = yyDollar[1].node } case 128: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:444 + //line parser/parser.y:455 { yyVAL.node = stmt.NewHaltCompiler().SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 129: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:447 + //line parser/parser.y:458 { yyVAL.node = stmt.NewStmtList(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 130: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:448 + //line parser/parser.y:459 { yyVAL.node = yyDollar[1].node } case 131: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:449 + //line parser/parser.y:460 { yyVAL.node = yyDollar[1].node } case 132: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:451 + //line parser/parser.y:462 { yyVAL.node = stmt.NewWhile(yyDollar[1].token, yyDollar[3].node, yyDollar[5].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node)) } case 133: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:452 + //line parser/parser.y:463 { yyVAL.node = stmt.NewDo(yyDollar[2].node, yyDollar[5].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[7].token)) } case 134: yyDollar = yyS[yypt-9 : yypt+1] - //line parser/parser.y:454 + //line parser/parser.y:465 { yyVAL.node = stmt.NewFor(yyDollar[3].list, yyDollar[5].list, yyDollar[7].list, yyDollar[9].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node)) } case 135: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:455 + //line parser/parser.y:466 { yyVAL.node = stmt.NewSwitch(yyDollar[1].token, yyDollar[3].node, yyDollar[5].nodesWithEndToken.nodes).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[5].nodesWithEndToken.endToken)) } case 136: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:456 + //line parser/parser.y:467 { yyVAL.node = stmt.NewBreak(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 137: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:457 + //line parser/parser.y:468 { yyVAL.node = stmt.NewContinue(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 138: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:458 + //line parser/parser.y:469 { yyVAL.node = stmt.NewReturn(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 139: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:459 + //line parser/parser.y:470 { yyVAL.node = stmt.NewGlobal(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 140: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:460 + //line parser/parser.y:471 { yyVAL.node = stmt.NewStatic(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 141: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:461 + //line parser/parser.y:472 { yyVAL.node = stmt.NewEcho(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 142: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:462 + //line parser/parser.y:473 { yyVAL.node = stmt.NewInlineHtml(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 143: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:463 + //line parser/parser.y:474 { - yyVAL.node = stmt.NewExpression(yyDollar[1].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token)) + yyVAL.node = stmt.NewExpression(yyDollar[1].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token)) } case 144: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:465 + //line parser/parser.y:476 { yyVAL.node = stmt.NewUnset(yyDollar[3].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[6].token)) } case 145: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:467 + //line parser/parser.y:478 { yyVAL.node = stmt.NewForeach(yyDollar[3].node, nil, yyDollar[5].foreachVariable.node, yyDollar[7].node, yyDollar[5].foreachVariable.byRef).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[7].node)) } case 146: yyDollar = yyS[yypt-9 : yypt+1] - //line parser/parser.y:469 + //line parser/parser.y:480 { yyVAL.node = stmt.NewForeach(yyDollar[3].node, yyDollar[5].node, yyDollar[7].foreachVariable.node, yyDollar[9].node, yyDollar[7].foreachVariable.byRef).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[9].node)) } case 147: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:470 + //line parser/parser.y:481 { yyVAL.node = stmt.NewDeclare(yyDollar[3].list, yyDollar[5].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node)) } case 148: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:471 + //line parser/parser.y:482 { yyVAL.node = stmt.NewNop().SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 149: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:473 + //line parser/parser.y:484 { if yyDollar[6].node == nil { yyVAL.node = stmt.NewTry(yyDollar[3].list, yyDollar[5].list, yyDollar[6].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodeListPosition(yyDollar[1].token, yyDollar[5].list)) @@ -2984,33 +2995,33 @@ yydefault: } case 150: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:480 + //line parser/parser.y:491 { yyVAL.node = stmt.NewThrow(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 151: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:482 + //line parser/parser.y:493 { label := node.NewIdentifier(yyDollar[2].token.Value).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenPosition(yyDollar[2].token)) yyVAL.node = stmt.NewGoto(label).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 152: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:487 + //line parser/parser.y:498 { label := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) yyVAL.node = stmt.NewLabel(label).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[2].token)) } case 153: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:493 + //line parser/parser.y:504 { yyVAL.list = []node.Node{} } case 154: yyDollar = yyS[yypt-9 : yypt+1] - //line parser/parser.y:495 + //line parser/parser.y:506 { identifier := node.NewIdentifier(yyDollar[5].token.Value).SetComments(yyDollar[5].token.Comments()).SetPosition(NewTokenPosition(yyDollar[5].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[5].token.Comments()).SetPosition(NewTokenPosition(yyDollar[5].token)) @@ -3018,49 +3029,49 @@ yydefault: } case 155: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:502 + //line parser/parser.y:513 { yyVAL.list = []node.Node{yyDollar[1].node} } case 156: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:503 + //line parser/parser.y:514 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 157: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:507 + //line parser/parser.y:518 { yyVAL.node = nil } case 158: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:508 + //line parser/parser.y:519 { yyVAL.node = stmt.NewFinally(yyDollar[3].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 159: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:512 + //line parser/parser.y:523 { yyVAL.list = []node.Node{yyDollar[1].node} } case 160: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:513 + //line parser/parser.y:524 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 161: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:517 + //line parser/parser.y:528 { yyVAL.node = yyDollar[1].node } case 162: yyDollar = yyS[yypt-11 : yypt+1] - //line parser/parser.y:522 + //line parser/parser.y:533 { name := node.NewIdentifier(yyDollar[3].token.Value).SetComments(yyDollar[3].token.Comments()).SetPosition(NewTokenPosition(yyDollar[3].token)) yyVAL.node = stmt.NewFunction(name, yyDollar[2].boolWithToken.value, yyDollar[6].list, yyDollar[8].node, yyDollar[10].list, yyDollar[4].str). @@ -3069,31 +3080,31 @@ yydefault: } case 163: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:531 + //line parser/parser.y:542 { yyVAL.boolWithToken = boolWithToken{false, nil} } case 164: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:532 + //line parser/parser.y:543 { yyVAL.boolWithToken = boolWithToken{true, &yyDollar[1].token} } case 165: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:536 + //line parser/parser.y:547 { yyVAL.boolWithToken = boolWithToken{false, nil} } case 166: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:537 + //line parser/parser.y:548 { yyVAL.boolWithToken = boolWithToken{true, &yyDollar[1].token} } case 167: yyDollar = yyS[yypt-9 : yypt+1] - //line parser/parser.y:542 + //line parser/parser.y:553 { name := node.NewIdentifier(yyDollar[3].token.Value).SetComments(yyDollar[3].token.Comments()).SetPosition(NewTokenPosition(yyDollar[3].token)) yyVAL.node = stmt.NewClass(name, yyDollar[1].list, nil, yyDollar[4].node, yyDollar[5].list, yyDollar[8].list, yyDollar[6].str). @@ -3102,7 +3113,7 @@ yydefault: } case 168: yyDollar = yyS[yypt-8 : yypt+1] - //line parser/parser.y:549 + //line parser/parser.y:560 { name := node.NewIdentifier(yyDollar[2].token.Value).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenPosition(yyDollar[2].token)) yyVAL.node = stmt.NewClass(name, nil, nil, yyDollar[3].node, yyDollar[4].list, yyDollar[7].list, yyDollar[5].str). @@ -3111,31 +3122,31 @@ yydefault: } case 169: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:558 + //line parser/parser.y:569 { yyVAL.list = []node.Node{yyDollar[1].node} } case 170: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:559 + //line parser/parser.y:570 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) } case 171: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:563 + //line parser/parser.y:574 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 172: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:564 + //line parser/parser.y:575 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 173: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:569 + //line parser/parser.y:580 { name := node.NewIdentifier(yyDollar[2].token.Value).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenPosition(yyDollar[2].token)) yyVAL.node = stmt.NewTrait(name, yyDollar[5].list, yyDollar[3].str). @@ -3144,7 +3155,7 @@ yydefault: } case 174: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:579 + //line parser/parser.y:590 { name := node.NewIdentifier(yyDollar[2].token.Value).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenPosition(yyDollar[2].token)) yyVAL.node = stmt.NewInterface(name, yyDollar[3].list, yyDollar[6].list, yyDollar[4].str). @@ -3153,190 +3164,190 @@ yydefault: } case 175: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:588 + //line parser/parser.y:599 { yyVAL.node = nil } case 176: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:589 + //line parser/parser.y:600 { yyVAL.node = yyDollar[2].node } case 177: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:593 + //line parser/parser.y:604 { yyVAL.list = nil } case 178: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:594 + //line parser/parser.y:605 { yyVAL.list = yyDollar[2].list } case 179: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:598 + //line parser/parser.y:609 { yyVAL.list = nil } case 180: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:599 + //line parser/parser.y:610 { yyVAL.list = yyDollar[2].list } case 181: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:603 + //line parser/parser.y:614 { yyVAL.foreachVariable = foreachVariable{yyDollar[1].node, false} } case 182: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:604 + //line parser/parser.y:615 { yyVAL.foreachVariable = foreachVariable{yyDollar[2].node, true} } case 183: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:605 + //line parser/parser.y:616 { yyVAL.foreachVariable = foreachVariable{expr.NewList(yyDollar[3].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)), false} } case 184: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:606 + //line parser/parser.y:617 { yyVAL.foreachVariable = foreachVariable{expr.NewShortList(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)), false} } case 185: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:610 + //line parser/parser.y:621 { yyVAL.node = yyDollar[1].node } case 186: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:611 + //line parser/parser.y:622 { yyVAL.node = stmt.NewStmtList(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 187: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:615 + //line parser/parser.y:626 { yyVAL.node = yyDollar[1].node } case 188: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:616 + //line parser/parser.y:627 { yyVAL.node = stmt.NewStmtList(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 189: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:620 + //line parser/parser.y:631 { yyVAL.node = yyDollar[1].node } case 190: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:621 + //line parser/parser.y:632 { yyVAL.node = stmt.NewStmtList(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 191: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:625 + //line parser/parser.y:636 { yyVAL.nodesWithEndToken = &nodesWithEndToken{yyDollar[2].list, yyDollar[3].token} } case 192: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:626 + //line parser/parser.y:637 { yyVAL.nodesWithEndToken = &nodesWithEndToken{yyDollar[3].list, yyDollar[4].token} } case 193: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:627 + //line parser/parser.y:638 { yyVAL.nodesWithEndToken = &nodesWithEndToken{yyDollar[2].list, yyDollar[4].token} } case 194: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:628 + //line parser/parser.y:639 { yyVAL.nodesWithEndToken = &nodesWithEndToken{yyDollar[3].list, yyDollar[5].token} } case 195: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:632 + //line parser/parser.y:643 { yyVAL.list = []node.Node{} } case 196: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:634 + //line parser/parser.y:645 { yyVAL.list = append(yyDollar[1].list, stmt.NewCase(yyDollar[3].node, yyDollar[5].list).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenNodeListPosition(yyDollar[2].token, yyDollar[5].list))) } case 197: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:638 + //line parser/parser.y:649 { yyVAL.list = append(yyDollar[1].list, stmt.NewDefault(yyDollar[4].list).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenNodeListPosition(yyDollar[2].token, yyDollar[4].list))) } case 200: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:649 + //line parser/parser.y:660 { yyVAL.node = yyDollar[1].node } case 201: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:650 + //line parser/parser.y:661 { yyVAL.node = stmt.NewStmtList(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 202: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:654 + //line parser/parser.y:665 { yyVAL.node = stmt.NewIf(yyDollar[3].node, yyDollar[5].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node)) } case 203: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:656 + //line parser/parser.y:667 { _elseIf := stmt.NewElseIf(yyDollar[4].node, yyDollar[6].node).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[2].token, yyDollar[6].node)) yyVAL.node = yyDollar[1].node.(stmt.If).AddElseIf(_elseIf).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[6].node)) } case 204: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:663 + //line parser/parser.y:674 { yyVAL.node = yyDollar[1].node } case 205: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:665 + //line parser/parser.y:676 { _else := stmt.NewElse(yyDollar[3].node).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[2].token, yyDollar[3].node)) yyVAL.node = yyDollar[1].node.(stmt.If).SetElse(_else).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 206: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:673 + //line parser/parser.y:684 { stmts := stmt.NewStmtList(yyDollar[6].list).SetComments(yyDollar[5].token.Comments()).SetPosition(NewNodeListPosition(yyDollar[6].list)) yyVAL.node = stmt.NewAltIf(yyDollar[3].node, stmts).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodeListPosition(yyDollar[1].token, yyDollar[6].list)) } case 207: yyDollar = yyS[yypt-7 : yypt+1] - //line parser/parser.y:678 + //line parser/parser.y:689 { stmts := stmt.NewStmtList(yyDollar[7].list).SetComments(yyDollar[6].token.Comments()).SetPosition(NewNodeListPosition(yyDollar[7].list)) _elseIf := stmt.NewAltElseIf(yyDollar[4].node, stmts).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenNodeListPosition(yyDollar[2].token, yyDollar[7].list)) @@ -3344,13 +3355,13 @@ yydefault: } case 208: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:687 + //line parser/parser.y:698 { yyVAL.node = yyDollar[1].node.SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token)) } case 209: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:691 + //line parser/parser.y:702 { stmts := stmt.NewStmtList(yyDollar[4].list).SetComments(yyDollar[3].token.Comments()).SetPosition(NewNodeListPosition(yyDollar[4].list)) _else := stmt.NewAltElse(stmts).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenNodeListPosition(yyDollar[2].token, yyDollar[4].list)) @@ -3358,36 +3369,36 @@ yydefault: } case 210: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:699 + //line parser/parser.y:710 { yyVAL.list = yyDollar[1].list } case 211: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:700 + //line parser/parser.y:711 { yyVAL.list = nil } case 212: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:704 + //line parser/parser.y:715 { yyVAL.list = []node.Node{yyDollar[1].node} } case 213: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:705 + //line parser/parser.y:716 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 214: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:710 + //line parser/parser.y:721 { identifier := node.NewIdentifier(yyDollar[4].token.Value).SetComments(yyDollar[4].token.Comments()).SetPosition(NewTokenPosition(yyDollar[4].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[4].token.Comments()).SetPosition(NewTokenPosition(yyDollar[4].token)) if yyDollar[1].node != nil { - yyVAL.node = node.NewParameter(yyDollar[1].node, variable, nil, yyDollar[2].boolWithToken.value, yyDollar[3].boolWithToken.value).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) + yyVAL.node = node.NewParameter(yyDollar[1].node, variable, nil, yyDollar[2].boolWithToken.value, yyDollar[3].boolWithToken.value).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) } else if yyDollar[2].boolWithToken.value == true { yyVAL.node = node.NewParameter(yyDollar[1].node, variable, nil, yyDollar[2].boolWithToken.value, yyDollar[3].boolWithToken.value).SetComments(yyDollar[2].boolWithToken.token.Comments()).SetPosition(NewTokensPosition(*yyDollar[2].boolWithToken.token, yyDollar[4].token)) } else if yyDollar[3].boolWithToken.value == true { @@ -3398,12 +3409,12 @@ yydefault: } case 215: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:724 + //line parser/parser.y:735 { identifier := node.NewIdentifier(yyDollar[4].token.Value).SetComments(yyDollar[4].token.Comments()).SetPosition(NewTokenPosition(yyDollar[4].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[4].token.Comments()).SetPosition(NewTokenPosition(yyDollar[4].token)) if yyDollar[1].node != nil { - yyVAL.node = node.NewParameter(yyDollar[1].node, variable, yyDollar[6].node, yyDollar[2].boolWithToken.value, yyDollar[3].boolWithToken.value).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[6].node)) + yyVAL.node = node.NewParameter(yyDollar[1].node, variable, yyDollar[6].node, yyDollar[2].boolWithToken.value, yyDollar[3].boolWithToken.value).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[6].node)) } else if yyDollar[2].boolWithToken.value == true { yyVAL.node = node.NewParameter(yyDollar[1].node, variable, yyDollar[6].node, yyDollar[2].boolWithToken.value, yyDollar[3].boolWithToken.value).SetComments(yyDollar[2].boolWithToken.token.Comments()).SetPosition(NewTokenNodePosition(*yyDollar[2].boolWithToken.token, yyDollar[6].node)) } else if yyDollar[3].boolWithToken.value == true { @@ -3414,127 +3425,127 @@ yydefault: } case 216: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:740 + //line parser/parser.y:751 { yyVAL.node = nil } case 217: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:741 + //line parser/parser.y:752 { yyVAL.node = yyDollar[1].node } case 218: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:745 + //line parser/parser.y:756 { yyVAL.node = yyDollar[1].node } case 219: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:746 + //line parser/parser.y:757 { yyVAL.node = node.NewNullable(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 220: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:750 + //line parser/parser.y:761 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 221: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:751 + //line parser/parser.y:762 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 222: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:752 + //line parser/parser.y:763 { yyVAL.node = yyDollar[1].node } case 223: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:756 + //line parser/parser.y:767 { yyVAL.node = nil } case 224: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:757 + //line parser/parser.y:768 { yyVAL.node = yyDollar[2].node } case 225: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:761 + //line parser/parser.y:772 { yyVAL.nodesWithEndToken = &nodesWithEndToken{[]node.Node{}, yyDollar[2].token} } case 226: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:762 + //line parser/parser.y:773 { yyVAL.nodesWithEndToken = &nodesWithEndToken{yyDollar[2].list, yyDollar[4].token} } case 227: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:766 + //line parser/parser.y:777 { yyVAL.list = []node.Node{yyDollar[1].node} } case 228: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:767 + //line parser/parser.y:778 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 229: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:771 + //line parser/parser.y:782 { - yyVAL.node = node.NewArgument(yyDollar[1].node, false).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodePosition(yyDollar[1].node)) + yyVAL.node = node.NewArgument(yyDollar[1].node, false).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodePosition(yyDollar[1].node)) } case 230: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:772 + //line parser/parser.y:783 { yyVAL.node = node.NewArgument(yyDollar[2].node, true).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 231: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:776 + //line parser/parser.y:787 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 232: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:777 + //line parser/parser.y:788 { yyVAL.list = []node.Node{yyDollar[1].node} } case 233: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:781 + //line parser/parser.y:792 { yyVAL.node = yyDollar[1].node } case 234: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:785 + //line parser/parser.y:796 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 235: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:786 + //line parser/parser.y:797 { yyVAL.list = []node.Node{yyDollar[1].node} } case 236: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:791 + //line parser/parser.y:802 { identifier := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) @@ -3542,7 +3553,7 @@ yydefault: } case 237: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:797 + //line parser/parser.y:808 { identifier := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) @@ -3550,37 +3561,37 @@ yydefault: } case 238: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:805 + //line parser/parser.y:816 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) } case 239: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:806 + //line parser/parser.y:817 { yyVAL.list = []node.Node{} } case 240: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:810 + //line parser/parser.y:821 { yyVAL.node = stmt.NewPropertyList(yyDollar[1].list, yyDollar[2].list).SetComments(ListGetFirstNodeComments(yyDollar[1].list)).SetPosition(NewNodeListTokenPosition(yyDollar[1].list, yyDollar[3].token)) } case 241: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:811 + //line parser/parser.y:822 { yyVAL.node = stmt.NewClassConstList(yyDollar[1].list, yyDollar[3].list).SetComments(ListGetFirstNodeComments(yyDollar[1].list)).SetPosition(NewOptionalListTokensPosition(yyDollar[1].list, yyDollar[2].token, yyDollar[4].token)) } case 242: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:812 + //line parser/parser.y:823 { yyVAL.node = stmt.NewTraitUse(yyDollar[2].list, yyDollar[3].nodesWithEndToken.nodes).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].nodesWithEndToken.endToken)) } case 243: yyDollar = yyS[yypt-10 : yypt+1] - //line parser/parser.y:814 + //line parser/parser.y:825 { name := node.NewIdentifier(yyDollar[4].token.Value).SetComments(yyDollar[4].token.Comments()).SetPosition(NewTokenPosition(yyDollar[4].token)) yyVAL.node = stmt.NewClassMethod(name, yyDollar[1].list, yyDollar[3].boolWithToken.value, yyDollar[7].list, yyDollar[9].node, yyDollar[10].nodesWithEndToken.nodes, yyDollar[5].str). @@ -3589,219 +3600,219 @@ yydefault: } case 244: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:823 + //line parser/parser.y:834 { yyVAL.list = []node.Node{yyDollar[1].node} } case 245: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:824 + //line parser/parser.y:835 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 246: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:828 + //line parser/parser.y:839 { yyVAL.nodesWithEndToken = &nodesWithEndToken{nil, yyDollar[1].token} } case 247: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:829 + //line parser/parser.y:840 { yyVAL.nodesWithEndToken = &nodesWithEndToken{nil, yyDollar[2].token} } case 248: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:830 + //line parser/parser.y:841 { yyVAL.nodesWithEndToken = &nodesWithEndToken{yyDollar[2].list, yyDollar[3].token} } case 249: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:834 + //line parser/parser.y:845 { yyVAL.list = []node.Node{yyDollar[1].node} } case 250: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:835 + //line parser/parser.y:846 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) } case 251: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:839 + //line parser/parser.y:850 { yyVAL.node = yyDollar[1].node } case 252: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:840 + //line parser/parser.y:851 { yyVAL.node = yyDollar[1].node } case 253: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:845 + //line parser/parser.y:856 { name := name.NewName(yyDollar[3].list).SetComments(ListGetFirstNodeComments(yyDollar[3].list)).SetPosition(NewNodeListPosition(yyDollar[3].list)) yyVAL.node = stmt.NewTraitUsePrecedence(yyDollar[1].node, name). - SetComments(*yyDollar[1].node.Comments()). + SetComments(yyDollar[1].node.Comments()). SetPosition(NewNodeNodeListPosition(yyDollar[1].node, yyDollar[3].list)) } case 254: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:855 + //line parser/parser.y:866 { alias := node.NewIdentifier(yyDollar[3].token.Value).SetComments(yyDollar[3].token.Comments()).SetPosition(NewTokenPosition(yyDollar[3].token)) yyVAL.node = stmt.NewTraitUseAlias(yyDollar[1].node, nil, alias). - SetComments(*yyDollar[1].node.Comments()). + SetComments(yyDollar[1].node.Comments()). SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token)) } case 255: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:862 + //line parser/parser.y:873 { alias := node.NewIdentifier(yyDollar[3].token.Value).SetComments(yyDollar[3].token.Comments()).SetPosition(NewTokenPosition(yyDollar[3].token)) yyVAL.node = stmt.NewTraitUseAlias(yyDollar[1].node, nil, alias). - SetComments(*yyDollar[1].node.Comments()). + SetComments(yyDollar[1].node.Comments()). SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token)) } case 256: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:869 + //line parser/parser.y:880 { alias := node.NewIdentifier(yyDollar[4].token.Value).SetComments(yyDollar[4].token.Comments()).SetPosition(NewTokenPosition(yyDollar[4].token)) yyVAL.node = stmt.NewTraitUseAlias(yyDollar[1].node, yyDollar[3].node, alias). - SetComments(*yyDollar[1].node.Comments()). + SetComments(yyDollar[1].node.Comments()). SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) } case 257: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:876 + //line parser/parser.y:887 { - yyVAL.node = stmt.NewTraitUseAlias(yyDollar[1].node, yyDollar[3].node, nil).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = stmt.NewTraitUseAlias(yyDollar[1].node, yyDollar[3].node, nil).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 258: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:883 + //line parser/parser.y:894 { name := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) yyVAL.node = stmt.NewTraitMethodRef(nil, name).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 259: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:887 + //line parser/parser.y:898 { yyVAL.node = yyDollar[1].node } case 260: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:892 + //line parser/parser.y:903 { target := node.NewIdentifier(yyDollar[3].token.Value).SetComments(yyDollar[3].token.Comments()).SetPosition(NewTokenPosition(yyDollar[3].token)) - yyVAL.node = stmt.NewTraitMethodRef(yyDollar[1].node, target).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token)) + yyVAL.node = stmt.NewTraitMethodRef(yyDollar[1].node, target).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token)) } case 261: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:899 + //line parser/parser.y:910 { yyVAL.nodesWithEndToken = &nodesWithEndToken{nil, yyDollar[1].token} } case 262: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:900 + //line parser/parser.y:911 { yyVAL.nodesWithEndToken = &nodesWithEndToken{yyDollar[2].list, yyDollar[3].token} } case 263: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:904 + //line parser/parser.y:915 { yyVAL.list = yyDollar[1].list } case 264: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:905 + //line parser/parser.y:916 { yyVAL.list = []node.Node{node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token))} } case 265: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:909 + //line parser/parser.y:920 { yyVAL.list = nil } case 266: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:910 + //line parser/parser.y:921 { yyVAL.list = yyDollar[1].list } case 267: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:914 + //line parser/parser.y:925 { yyVAL.list = []node.Node{yyDollar[1].node} } case 268: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:915 + //line parser/parser.y:926 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) } case 269: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:919 + //line parser/parser.y:930 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 270: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:920 + //line parser/parser.y:931 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 271: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:921 + //line parser/parser.y:932 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 272: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:922 + //line parser/parser.y:933 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 273: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:923 + //line parser/parser.y:934 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 274: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:924 + //line parser/parser.y:935 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 275: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:928 + //line parser/parser.y:939 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 276: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:929 + //line parser/parser.y:940 { yyVAL.list = []node.Node{yyDollar[1].node} } case 277: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:934 + //line parser/parser.y:945 { identifier := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) @@ -3809,7 +3820,7 @@ yydefault: } case 278: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:940 + //line parser/parser.y:951 { identifier := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) @@ -3817,75 +3828,75 @@ yydefault: } case 279: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:948 + //line parser/parser.y:959 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 280: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:949 + //line parser/parser.y:960 { yyVAL.list = []node.Node{yyDollar[1].node} } case 281: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:954 + //line parser/parser.y:965 { name := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) yyVAL.node = stmt.NewConstant(name, yyDollar[3].node, yyDollar[4].str).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node)) } case 282: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:962 + //line parser/parser.y:973 { name := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) yyVAL.node = stmt.NewConstant(name, yyDollar[3].node, yyDollar[4].str).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[3].node)) } case 283: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:969 + //line parser/parser.y:980 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 284: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:970 + //line parser/parser.y:981 { yyVAL.list = []node.Node{yyDollar[1].node} } case 285: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:974 + //line parser/parser.y:985 { yyVAL.node = yyDollar[1].node } case 286: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:978 + //line parser/parser.y:989 { yyVAL.list = nil } case 287: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:979 + //line parser/parser.y:990 { yyVAL.list = yyDollar[1].list } case 288: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:982 + //line parser/parser.y:993 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 289: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:983 + //line parser/parser.y:994 { yyVAL.list = []node.Node{yyDollar[1].node} } case 290: yyDollar = yyS[yypt-8 : yypt+1] - //line parser/parser.y:988 + //line parser/parser.y:999 { if yyDollar[2].nodesWithEndToken != nil { yyVAL.node = stmt.NewClass(nil, nil, yyDollar[2].nodesWithEndToken.nodes, yyDollar[3].node, yyDollar[4].list, yyDollar[7].list, yyDollar[5].str).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[8].token)) @@ -3895,7 +3906,7 @@ yydefault: } case 291: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:999 + //line parser/parser.y:1010 { if yyDollar[3].nodesWithEndToken != nil { yyVAL.node = expr.NewNew(yyDollar[2].node, yyDollar[3].nodesWithEndToken.nodes).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].nodesWithEndToken.endToken)) @@ -3905,459 +3916,459 @@ yydefault: } case 292: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1006 + //line parser/parser.y:1017 { yyVAL.node = expr.NewNew(yyDollar[2].node, nil) } case 293: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:1011 + //line parser/parser.y:1022 { list := expr.NewList(yyDollar[3].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) yyVAL.node = assign_op.NewAssign(list, yyDollar[6].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[6].node)) } case 294: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:1016 + //line parser/parser.y:1027 { shortList := expr.NewShortList(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) yyVAL.node = assign_op.NewAssign(shortList, yyDollar[5].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[5].node)) } case 295: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1020 + //line parser/parser.y:1031 { - yyVAL.node = assign_op.NewAssign(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewAssign(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 296: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1021 + //line parser/parser.y:1032 { - yyVAL.node = assign_op.NewAssignRef(yyDollar[1].node, yyDollar[4].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[4].node)) + yyVAL.node = assign_op.NewAssignRef(yyDollar[1].node, yyDollar[4].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[4].node)) } case 297: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1022 + //line parser/parser.y:1033 { yyVAL.node = expr.NewClone(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 298: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1023 + //line parser/parser.y:1034 { - yyVAL.node = assign_op.NewPlus(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewPlus(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 299: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1024 + //line parser/parser.y:1035 { - yyVAL.node = assign_op.NewMinus(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewMinus(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 300: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1025 + //line parser/parser.y:1036 { - yyVAL.node = assign_op.NewMul(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewMul(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 301: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1026 + //line parser/parser.y:1037 { - yyVAL.node = assign_op.NewPow(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewPow(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 302: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1027 + //line parser/parser.y:1038 { - yyVAL.node = assign_op.NewDiv(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewDiv(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 303: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1028 + //line parser/parser.y:1039 { - yyVAL.node = assign_op.NewConcat(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewConcat(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 304: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1029 + //line parser/parser.y:1040 { - yyVAL.node = assign_op.NewMod(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewMod(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 305: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1030 + //line parser/parser.y:1041 { - yyVAL.node = assign_op.NewBitwiseAnd(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewBitwiseAnd(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 306: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1031 + //line parser/parser.y:1042 { - yyVAL.node = assign_op.NewBitwiseOr(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewBitwiseOr(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 307: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1032 + //line parser/parser.y:1043 { - yyVAL.node = assign_op.NewBitwiseXor(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewBitwiseXor(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 308: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1033 + //line parser/parser.y:1044 { - yyVAL.node = assign_op.NewShiftLeft(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewShiftLeft(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 309: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1034 + //line parser/parser.y:1045 { - yyVAL.node = assign_op.NewShiftRight(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = assign_op.NewShiftRight(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 310: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1035 + //line parser/parser.y:1046 { - yyVAL.node = expr.NewPostInc(yyDollar[1].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token)) + yyVAL.node = expr.NewPostInc(yyDollar[1].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token)) } case 311: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1036 + //line parser/parser.y:1047 { yyVAL.node = expr.NewPreInc(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 312: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1037 + //line parser/parser.y:1048 { - yyVAL.node = expr.NewPostDec(yyDollar[1].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token)) + yyVAL.node = expr.NewPostDec(yyDollar[1].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].token)) } case 313: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1038 + //line parser/parser.y:1049 { yyVAL.node = expr.NewPreDec(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 314: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1039 + //line parser/parser.y:1050 { - yyVAL.node = binary_op.NewBooleanOr(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewBooleanOr(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 315: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1040 + //line parser/parser.y:1051 { - yyVAL.node = binary_op.NewBooleanAnd(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewBooleanAnd(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 316: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1041 + //line parser/parser.y:1052 { - yyVAL.node = binary_op.NewLogicalOr(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewLogicalOr(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 317: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1042 + //line parser/parser.y:1053 { - yyVAL.node = binary_op.NewLogicalAnd(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewLogicalAnd(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 318: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1043 + //line parser/parser.y:1054 { - yyVAL.node = binary_op.NewLogicalXor(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewLogicalXor(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 319: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1044 + //line parser/parser.y:1055 { - yyVAL.node = binary_op.NewBitwiseOr(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewBitwiseOr(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 320: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1045 + //line parser/parser.y:1056 { - yyVAL.node = binary_op.NewBitwiseAnd(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewBitwiseAnd(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 321: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1046 + //line parser/parser.y:1057 { - yyVAL.node = binary_op.NewBitwiseXor(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewBitwiseXor(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 322: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1047 + //line parser/parser.y:1058 { - yyVAL.node = binary_op.NewConcat(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewConcat(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 323: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1048 + //line parser/parser.y:1059 { - yyVAL.node = binary_op.NewPlus(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewPlus(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 324: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1049 + //line parser/parser.y:1060 { - yyVAL.node = binary_op.NewMinus(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewMinus(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 325: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1050 + //line parser/parser.y:1061 { - yyVAL.node = binary_op.NewMul(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewMul(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 326: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1051 + //line parser/parser.y:1062 { - yyVAL.node = binary_op.NewPow(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewPow(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 327: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1052 + //line parser/parser.y:1063 { - yyVAL.node = binary_op.NewDiv(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewDiv(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 328: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1053 + //line parser/parser.y:1064 { - yyVAL.node = binary_op.NewMod(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewMod(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 329: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1054 + //line parser/parser.y:1065 { - yyVAL.node = binary_op.NewShiftLeft(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewShiftLeft(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 330: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1055 + //line parser/parser.y:1066 { - yyVAL.node = binary_op.NewShiftRight(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewShiftRight(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 331: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1056 + //line parser/parser.y:1067 { yyVAL.node = expr.NewUnaryPlus(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 332: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1057 + //line parser/parser.y:1068 { yyVAL.node = expr.NewUnaryMinus(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 333: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1058 + //line parser/parser.y:1069 { yyVAL.node = expr.NewBooleanNot(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 334: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1059 + //line parser/parser.y:1070 { yyVAL.node = expr.NewBitwiseNot(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 335: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1060 + //line parser/parser.y:1071 { - yyVAL.node = binary_op.NewIdentical(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewIdentical(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 336: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1061 + //line parser/parser.y:1072 { - yyVAL.node = binary_op.NewNotIdentical(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewNotIdentical(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 337: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1062 + //line parser/parser.y:1073 { - yyVAL.node = binary_op.NewEqual(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewEqual(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 338: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1063 + //line parser/parser.y:1074 { - yyVAL.node = binary_op.NewNotEqual(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewNotEqual(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 339: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1064 + //line parser/parser.y:1075 { - yyVAL.node = binary_op.NewSmaller(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewSmaller(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 340: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1065 + //line parser/parser.y:1076 { - yyVAL.node = binary_op.NewSmallerOrEqual(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewSmallerOrEqual(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 341: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1066 + //line parser/parser.y:1077 { - yyVAL.node = binary_op.NewGreater(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewGreater(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 342: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1067 + //line parser/parser.y:1078 { - yyVAL.node = binary_op.NewGreaterOrEqual(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewGreaterOrEqual(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 343: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1068 + //line parser/parser.y:1079 { - yyVAL.node = binary_op.NewSpaceship(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewSpaceship(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 344: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1069 + //line parser/parser.y:1080 { - yyVAL.node = expr.NewInstanceOf(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = expr.NewInstanceOf(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 345: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1070 + //line parser/parser.y:1081 { yyVAL.node = yyDollar[2].node } case 346: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1071 + //line parser/parser.y:1082 { yyVAL.node = yyDollar[1].node } case 347: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:1072 + //line parser/parser.y:1083 { - yyVAL.node = expr.NewTernary(yyDollar[1].node, yyDollar[3].node, yyDollar[5].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[5].node)) + yyVAL.node = expr.NewTernary(yyDollar[1].node, yyDollar[3].node, yyDollar[5].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[5].node)) } case 348: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1073 + //line parser/parser.y:1084 { - yyVAL.node = expr.NewTernary(yyDollar[1].node, nil, yyDollar[4].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[4].node)) + yyVAL.node = expr.NewTernary(yyDollar[1].node, nil, yyDollar[4].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[4].node)) } case 349: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1074 + //line parser/parser.y:1085 { - yyVAL.node = binary_op.NewCoalesce(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = binary_op.NewCoalesce(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 350: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1075 + //line parser/parser.y:1086 { yyVAL.node = yyDollar[1].node } case 351: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1076 + //line parser/parser.y:1087 { yyVAL.node = cast.NewCastInt(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 352: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1077 + //line parser/parser.y:1088 { yyVAL.node = cast.NewCastDouble(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 353: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1078 + //line parser/parser.y:1089 { yyVAL.node = cast.NewCastString(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 354: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1079 + //line parser/parser.y:1090 { yyVAL.node = cast.NewCastArray(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 355: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1080 + //line parser/parser.y:1091 { yyVAL.node = cast.NewCastObject(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 356: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1081 + //line parser/parser.y:1092 { yyVAL.node = cast.NewCastBool(yyDollar[2].node.SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node))) } case 357: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1082 + //line parser/parser.y:1093 { yyVAL.node = cast.NewCastUnset(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 358: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1083 + //line parser/parser.y:1094 { yyVAL.node = expr.NewExit(yyDollar[2].node, strings.EqualFold(yyDollar[1].token.Value, "die")).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 359: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1084 + //line parser/parser.y:1095 { yyVAL.node = expr.NewErrorSuppress(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 360: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1085 + //line parser/parser.y:1096 { yyVAL.node = yyDollar[1].node } case 361: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1086 + //line parser/parser.y:1097 { yyVAL.node = expr.NewShellExec(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 362: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1087 + //line parser/parser.y:1098 { yyVAL.node = expr.NewPrint(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 363: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1088 + //line parser/parser.y:1099 { yyVAL.node = expr.NewYield(nil, nil).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 364: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1089 + //line parser/parser.y:1100 { yyVAL.node = expr.NewYield(nil, yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 365: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1090 + //line parser/parser.y:1101 { yyVAL.node = expr.NewYield(yyDollar[2].node, yyDollar[4].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[4].node)) } case 366: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1091 + //line parser/parser.y:1102 { yyVAL.node = expr.NewYieldFrom(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 367: yyDollar = yyS[yypt-11 : yypt+1] - //line parser/parser.y:1093 + //line parser/parser.y:1104 { yyVAL.node = expr.NewClosure(yyDollar[5].list, yyDollar[7].list, yyDollar[8].node, yyDollar[10].list, false, yyDollar[2].boolWithToken.value, yyDollar[3].str). SetComments(yyDollar[1].token.Comments()). @@ -4365,7 +4376,7 @@ yydefault: } case 368: yyDollar = yyS[yypt-12 : yypt+1] - //line parser/parser.y:1099 + //line parser/parser.y:1110 { yyVAL.node = expr.NewClosure(yyDollar[6].list, yyDollar[8].list, yyDollar[9].node, yyDollar[11].list, true, yyDollar[3].boolWithToken.value, yyDollar[4].str). SetComments(yyDollar[1].token.Comments()). @@ -4373,50 +4384,50 @@ yydefault: } case 369: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:1107 + //line parser/parser.y:1118 { yyVAL.str = yylex.(*lexer).phpDocComment yylex.(*lexer).phpDocComment = "" } case 370: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:1111 + //line parser/parser.y:1122 { yyVAL.boolWithToken = boolWithToken{false, nil} } case 371: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1112 + //line parser/parser.y:1123 { yyVAL.boolWithToken = boolWithToken{true, &yyDollar[1].token} } case 372: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:1116 + //line parser/parser.y:1127 { yyVAL.list = []node.Node{} } case 373: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1117 + //line parser/parser.y:1128 { yyVAL.list = yyDollar[3].list } case 374: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1121 + //line parser/parser.y:1132 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 375: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1122 + //line parser/parser.y:1133 { yyVAL.list = []node.Node{yyDollar[1].node} } case 376: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1127 + //line parser/parser.y:1138 { identifier := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) @@ -4424,7 +4435,7 @@ yydefault: } case 377: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1133 + //line parser/parser.y:1144 { identifier := node.NewIdentifier(yyDollar[2].token.Value).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenPosition(yyDollar[2].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[2].token)) @@ -4432,453 +4443,453 @@ yydefault: } case 378: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1142 + //line parser/parser.y:1153 { - yyVAL.node = expr.NewFunctionCall(yyDollar[1].node, yyDollar[2].nodesWithEndToken.nodes).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].nodesWithEndToken.endToken)) + yyVAL.node = expr.NewFunctionCall(yyDollar[1].node, yyDollar[2].nodesWithEndToken.nodes).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].nodesWithEndToken.endToken)) } case 379: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1146 + //line parser/parser.y:1157 { - yyVAL.node = expr.NewStaticCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].nodesWithEndToken.nodes).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].nodesWithEndToken.endToken)) + yyVAL.node = expr.NewStaticCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].nodesWithEndToken.nodes).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].nodesWithEndToken.endToken)) } case 380: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1150 + //line parser/parser.y:1161 { - yyVAL.node = expr.NewStaticCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].nodesWithEndToken.nodes).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].nodesWithEndToken.endToken)) + yyVAL.node = expr.NewStaticCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].nodesWithEndToken.nodes).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].nodesWithEndToken.endToken)) } case 381: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1154 + //line parser/parser.y:1165 { - yyVAL.node = expr.NewFunctionCall(yyDollar[1].node, yyDollar[2].nodesWithEndToken.nodes).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].nodesWithEndToken.endToken)) + yyVAL.node = expr.NewFunctionCall(yyDollar[1].node, yyDollar[2].nodesWithEndToken.nodes).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[2].nodesWithEndToken.endToken)) } case 382: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1160 + //line parser/parser.y:1171 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 383: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1161 + //line parser/parser.y:1172 { yyVAL.node = yyDollar[1].node } case 384: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1165 + //line parser/parser.y:1176 { yyVAL.node = yyDollar[1].node } case 385: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1166 + //line parser/parser.y:1177 { yyVAL.node = yyDollar[1].node } case 386: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:1170 + //line parser/parser.y:1181 { yyVAL.node = nil } case 387: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1171 + //line parser/parser.y:1182 { yyVAL.node = yyDollar[2].node } case 388: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:1175 + //line parser/parser.y:1186 { yyVAL.list = []node.Node{} } case 389: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1176 + //line parser/parser.y:1187 { yyVAL.list = []node.Node{scalar.NewEncapsedStringPart(yyDollar[1].token.Value)} } case 390: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1177 + //line parser/parser.y:1188 { yyVAL.list = yyDollar[1].list } case 391: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:1181 + //line parser/parser.y:1192 { yyVAL.nodesWithEndToken = nil } case 392: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1182 + //line parser/parser.y:1193 { yyVAL.nodesWithEndToken = yyDollar[1].nodesWithEndToken } case 393: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1186 + //line parser/parser.y:1197 { yyVAL.node = expr.NewArray(yyDollar[3].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 394: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1187 + //line parser/parser.y:1198 { yyVAL.node = expr.NewShortArray(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 395: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1188 + //line parser/parser.y:1199 { yyVAL.node = scalar.NewString(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 396: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1192 + //line parser/parser.y:1203 { yyVAL.node = scalar.NewLnumber(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 397: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1193 + //line parser/parser.y:1204 { yyVAL.node = scalar.NewDnumber(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 398: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1194 + //line parser/parser.y:1205 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 399: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1195 + //line parser/parser.y:1206 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 400: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1196 + //line parser/parser.y:1207 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 401: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1197 + //line parser/parser.y:1208 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 402: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1198 + //line parser/parser.y:1209 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 403: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1199 + //line parser/parser.y:1210 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 404: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1200 + //line parser/parser.y:1211 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 405: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1201 + //line parser/parser.y:1212 { yyVAL.node = scalar.NewMagicConstant(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 406: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1203 + //line parser/parser.y:1214 { yyVAL.node = scalar.NewString(yyDollar[2].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) /* TODO: mark as Heredoc*/ } case 407: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1205 + //line parser/parser.y:1216 { yyVAL.node = scalar.NewEncapsed(nil).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[2].token)) } case 408: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1206 + //line parser/parser.y:1217 { yyVAL.node = scalar.NewEncapsed(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 409: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1207 + //line parser/parser.y:1218 { yyVAL.node = scalar.NewEncapsed(yyDollar[2].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 410: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1208 + //line parser/parser.y:1219 { yyVAL.node = yyDollar[1].node } case 411: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1209 + //line parser/parser.y:1220 { yyVAL.node = yyDollar[1].node } case 412: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1213 + //line parser/parser.y:1224 { - yyVAL.node = expr.NewConstFetch(yyDollar[1].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodePosition(yyDollar[1].node)) + yyVAL.node = expr.NewConstFetch(yyDollar[1].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodePosition(yyDollar[1].node)) } case 413: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1215 + //line parser/parser.y:1226 { target := node.NewIdentifier(yyDollar[3].token.Value).SetComments(yyDollar[3].token.Comments()).SetPosition(NewTokenPosition(yyDollar[3].token)) - yyVAL.node = expr.NewClassConstFetch(yyDollar[1].node, target).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token)) + yyVAL.node = expr.NewClassConstFetch(yyDollar[1].node, target).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token)) } case 414: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1220 + //line parser/parser.y:1231 { target := node.NewIdentifier(yyDollar[3].token.Value).SetComments(yyDollar[3].token.Comments()).SetPosition(NewTokenPosition(yyDollar[3].token)) - yyVAL.node = expr.NewClassConstFetch(yyDollar[1].node, target).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token)) + yyVAL.node = expr.NewClassConstFetch(yyDollar[1].node, target).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[3].token)) } case 415: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1227 + //line parser/parser.y:1238 { yyVAL.node = yyDollar[1].node } case 416: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1228 + //line parser/parser.y:1239 { yyVAL.node = yyDollar[1].node } case 417: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:1232 + //line parser/parser.y:1243 { yyVAL.node = nil } case 418: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1233 + //line parser/parser.y:1244 { yyVAL.node = yyDollar[1].node } case 419: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1237 + //line parser/parser.y:1248 { yyVAL.node = yyDollar[1].node } case 420: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1241 + //line parser/parser.y:1252 { yyVAL.node = yyDollar[1].node } case 421: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1242 + //line parser/parser.y:1253 { yyVAL.node = yyDollar[2].node } case 422: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1243 + //line parser/parser.y:1254 { yyVAL.node = yyDollar[1].node } case 423: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1247 + //line parser/parser.y:1258 { yyVAL.node = yyDollar[1].node } case 424: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1248 + //line parser/parser.y:1259 { yyVAL.node = yyDollar[2].node } case 425: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1249 + //line parser/parser.y:1260 { yyVAL.node = yyDollar[1].node } case 426: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1253 + //line parser/parser.y:1264 { yyVAL.node = yyDollar[1].node } case 427: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1254 + //line parser/parser.y:1265 { - yyVAL.node = expr.NewArrayDimFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) + yyVAL.node = expr.NewArrayDimFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) } case 428: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1255 + //line parser/parser.y:1266 { - yyVAL.node = expr.NewArrayDimFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) + yyVAL.node = expr.NewArrayDimFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) } case 429: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1256 + //line parser/parser.y:1267 { - yyVAL.node = expr.NewArrayDimFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) + yyVAL.node = expr.NewArrayDimFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) } case 430: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1258 + //line parser/parser.y:1269 { - yyVAL.node = expr.NewMethodCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].nodesWithEndToken.nodes).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].nodesWithEndToken.endToken)) + yyVAL.node = expr.NewMethodCall(yyDollar[1].node, yyDollar[3].node, yyDollar[4].nodesWithEndToken.nodes).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].nodesWithEndToken.endToken)) } case 431: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1259 + //line parser/parser.y:1270 { yyVAL.node = yyDollar[1].node } case 432: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1263 + //line parser/parser.y:1274 { yyVAL.node = yyDollar[1].node } case 433: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1264 + //line parser/parser.y:1275 { yyVAL.node = yyDollar[1].node } case 434: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1265 + //line parser/parser.y:1276 { - yyVAL.node = expr.NewPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = expr.NewPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 435: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1269 + //line parser/parser.y:1280 { yyVAL.node = expr.NewVariable(node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token))).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 436: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1270 + //line parser/parser.y:1281 { yyVAL.node = expr.NewVariable(yyDollar[3].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 437: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1271 + //line parser/parser.y:1282 { yyVAL.node = expr.NewVariable(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 438: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1276 + //line parser/parser.y:1287 { - yyVAL.node = expr.NewStaticPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = expr.NewStaticPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 439: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1280 + //line parser/parser.y:1291 { - yyVAL.node = expr.NewStaticPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = expr.NewStaticPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 440: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1286 + //line parser/parser.y:1297 { yyVAL.node = yyDollar[1].node } case 441: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1287 + //line parser/parser.y:1298 { - yyVAL.node = expr.NewArrayDimFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) + yyVAL.node = expr.NewArrayDimFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) } case 442: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1288 + //line parser/parser.y:1299 { - yyVAL.node = expr.NewArrayDimFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) + yyVAL.node = expr.NewArrayDimFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[4].token)) } case 443: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1289 + //line parser/parser.y:1300 { - yyVAL.node = expr.NewPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = expr.NewPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 444: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1291 + //line parser/parser.y:1302 { - yyVAL.node = expr.NewStaticPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = expr.NewStaticPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 445: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1295 + //line parser/parser.y:1306 { - yyVAL.node = expr.NewStaticPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = expr.NewStaticPropertyFetch(yyDollar[1].node, yyDollar[3].node).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 446: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1301 + //line parser/parser.y:1312 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 447: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1302 + //line parser/parser.y:1313 { yyVAL.node = yyDollar[2].node } case 448: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1303 + //line parser/parser.y:1314 { yyVAL.node = yyDollar[1].node } case 449: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1307 + //line parser/parser.y:1318 { yyVAL.node = node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 450: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1308 + //line parser/parser.y:1319 { yyVAL.node = yyDollar[2].node } case 451: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1309 + //line parser/parser.y:1320 { yyVAL.node = yyDollar[1].node } case 452: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1314 + //line parser/parser.y:1325 { if yyDollar[1].list[len(yyDollar[1].list)-1] == nil { yyVAL.list = yyDollar[1].list[:len(yyDollar[1].list)-1] @@ -4888,65 +4899,65 @@ yydefault: } case 453: yyDollar = yyS[yypt-0 : yypt+1] - //line parser/parser.y:1324 + //line parser/parser.y:1335 { yyVAL.node = nil } case 454: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1325 + //line parser/parser.y:1336 { yyVAL.node = yyDollar[1].node } case 455: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1330 + //line parser/parser.y:1341 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 456: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1331 + //line parser/parser.y:1342 { yyVAL.list = []node.Node{yyDollar[1].node} } case 457: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1335 + //line parser/parser.y:1346 { - yyVAL.node = expr.NewArrayItem(yyDollar[1].node, yyDollar[3].node, false).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) + yyVAL.node = expr.NewArrayItem(yyDollar[1].node, yyDollar[3].node, false).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[3].node)) } case 458: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1336 + //line parser/parser.y:1347 { - yyVAL.node = expr.NewArrayItem(nil, yyDollar[1].node, false).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodePosition(yyDollar[1].node)) + yyVAL.node = expr.NewArrayItem(nil, yyDollar[1].node, false).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodePosition(yyDollar[1].node)) } case 459: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1337 + //line parser/parser.y:1348 { - yyVAL.node = expr.NewArrayItem(yyDollar[1].node, yyDollar[4].node, true).SetComments(*yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[4].node)) + yyVAL.node = expr.NewArrayItem(yyDollar[1].node, yyDollar[4].node, true).SetComments(yyDollar[1].node.Comments()).SetPosition(NewNodesPosition(yyDollar[1].node, yyDollar[4].node)) } case 460: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1338 + //line parser/parser.y:1349 { yyVAL.node = expr.NewArrayItem(nil, yyDollar[2].node, true).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 461: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:1340 + //line parser/parser.y:1351 { // TODO: Cannot use list() as standalone expression list := expr.NewList(yyDollar[5].list).SetComments(yyDollar[3].token.Comments()).SetPosition(NewTokensPosition(yyDollar[3].token, yyDollar[6].token)) yyVAL.node = expr.NewArrayItem(yyDollar[1].node, list, false). - SetComments(*yyDollar[1].node.Comments()). + SetComments(yyDollar[1].node.Comments()). SetPosition(NewNodeTokenPosition(yyDollar[1].node, yyDollar[6].token)) } case 462: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1348 + //line parser/parser.y:1359 { // TODO: Cannot use list() as standalone expression list := expr.NewList(yyDollar[3].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) @@ -4956,38 +4967,38 @@ yydefault: } case 463: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1358 + //line parser/parser.y:1369 { yyVAL.list = append(yyDollar[1].list, yyDollar[2].node) } case 464: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1359 + //line parser/parser.y:1370 { yyVAL.list = append(yyDollar[1].list, scalar.NewEncapsedStringPart(yyDollar[2].token.Value).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenPosition(yyDollar[2].token))) } case 465: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1360 + //line parser/parser.y:1371 { yyVAL.list = []node.Node{yyDollar[1].node} } case 466: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1361 + //line parser/parser.y:1372 { yyVAL.list = []node.Node{scalar.NewEncapsedStringPart(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)), yyDollar[2].node} } case 467: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1366 + //line parser/parser.y:1377 { name := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) yyVAL.node = expr.NewVariable(name).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 468: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1371 + //line parser/parser.y:1382 { identifier := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) @@ -4995,7 +5006,7 @@ yydefault: } case 469: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1377 + //line parser/parser.y:1388 { identifier := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) @@ -5005,20 +5016,20 @@ yydefault: } case 470: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1385 + //line parser/parser.y:1396 { yyVAL.node = expr.NewVariable(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 471: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1389 + //line parser/parser.y:1400 { name := node.NewIdentifier(yyDollar[2].token.Value).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenPosition(yyDollar[2].token)) yyVAL.node = expr.NewVariable(name).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[3].token)) } case 472: yyDollar = yyS[yypt-6 : yypt+1] - //line parser/parser.y:1394 + //line parser/parser.y:1405 { identifier := node.NewIdentifier(yyDollar[2].token.Value).SetComments(yyDollar[2].token.Comments()).SetPosition(NewTokenPosition(yyDollar[2].token)) variable := expr.NewVariable(identifier).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[2].token)) @@ -5026,19 +5037,19 @@ yydefault: } case 473: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1399 + //line parser/parser.y:1410 { yyVAL.node = yyDollar[2].node } case 474: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1403 + //line parser/parser.y:1414 { yyVAL.node = scalar.NewString(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 475: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1407 + //line parser/parser.y:1418 { // TODO: add option to handle 64 bit integer if _, err := strconv.Atoi(yyDollar[1].token.Value); err == nil { @@ -5049,7 +5060,7 @@ yydefault: } case 476: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1416 + //line parser/parser.y:1427 { // TODO: add option to handle 64 bit integer if _, err := strconv.Atoi(yyDollar[2].token.Value); err == nil { @@ -5064,68 +5075,68 @@ yydefault: } case 477: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1429 + //line parser/parser.y:1440 { identifier := node.NewIdentifier(yyDollar[1].token.Value).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) yyVAL.node = expr.NewVariable(identifier).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenPosition(yyDollar[1].token)) } case 478: yyDollar = yyS[yypt-5 : yypt+1] - //line parser/parser.y:1436 + //line parser/parser.y:1447 { yyVAL.node = expr.NewIsset(yyDollar[3].list).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[5].token)) } case 479: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1437 + //line parser/parser.y:1448 { yyVAL.node = expr.NewEmpty(yyDollar[3].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 480: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1438 + //line parser/parser.y:1449 { yyVAL.node = expr.NewInclude(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 481: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1439 + //line parser/parser.y:1450 { yyVAL.node = expr.NewIncludeOnce(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 482: yyDollar = yyS[yypt-4 : yypt+1] - //line parser/parser.y:1440 + //line parser/parser.y:1451 { yyVAL.node = expr.NewEval(yyDollar[3].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokensPosition(yyDollar[1].token, yyDollar[4].token)) } case 483: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1441 + //line parser/parser.y:1452 { yyVAL.node = expr.NewRequire(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 484: yyDollar = yyS[yypt-2 : yypt+1] - //line parser/parser.y:1442 + //line parser/parser.y:1453 { yyVAL.node = expr.NewRequireOnce(yyDollar[2].node).SetComments(yyDollar[1].token.Comments()).SetPosition(NewTokenNodePosition(yyDollar[1].token, yyDollar[2].node)) } case 485: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1446 + //line parser/parser.y:1457 { yyVAL.list = []node.Node{yyDollar[1].node} } case 486: yyDollar = yyS[yypt-3 : yypt+1] - //line parser/parser.y:1447 + //line parser/parser.y:1458 { yyVAL.list = append(yyDollar[1].list, yyDollar[3].node) } case 487: yyDollar = yyS[yypt-1 : yypt+1] - //line parser/parser.y:1451 + //line parser/parser.y:1462 { yyVAL.node = yyDollar[1].node } diff --git a/parser/parser.y b/parser/parser.y index ce5d02d..0c7dc80 100644 --- a/parser/parser.y +++ b/parser/parser.y @@ -14,6 +14,7 @@ import ( "github.com/z7zmey/php-parser/node/expr/assign_op" "github.com/z7zmey/php-parser/node/expr/binary_op" "github.com/z7zmey/php-parser/node/expr/cast" + "github.com/z7zmey/php-parser/comment" ) var rootnode = stmt.NewStmtList([]node.Node{}) @@ -26,6 +27,16 @@ func Parse(src io.Reader, fName string) node.Node { return rootnode } +func ListGetFirstNodeComments(list []node.Node) *[]comment.Comment { + if len(list) == 0 { + return nil + } + + node := list[0] + + return node.Comments() +} + type foreachVariable struct { node node.Node byRef bool @@ -460,7 +471,7 @@ statement: | T_STATIC static_var_list ';' { $$ = stmt.NewStatic($2).SetComments($1.Comments()).SetPosition(NewTokensPosition($1, $3)) } | T_ECHO echo_expr_list ';' { $$ = stmt.NewEcho($2).SetComments($1.Comments()).SetPosition(NewTokensPosition($1, $3)) } | T_INLINE_HTML { $$ = stmt.NewInlineHtml($1.Value).SetComments($1.Comments()).SetPosition(NewTokenPosition($1)) } - | expr ';' { $$ = stmt.NewExpression($1).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $2)) } + | expr ';' { $$ = stmt.NewExpression($1).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $2)) } | T_UNSET '(' unset_variables possible_comma ')' ';' { $$ = stmt.NewUnset($3).SetComments($1.Comments()).SetPosition(NewTokensPosition($1, $6)) } | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement @@ -711,7 +722,7 @@ parameter: identifier := node.NewIdentifier($4.Value).SetComments($4.Comments()).SetPosition(NewTokenPosition($4)) variable := expr.NewVariable(identifier).SetComments($4.Comments()).SetPosition(NewTokenPosition($4)) if $1 != nil { - $$ = node.NewParameter($1, variable, nil, $2.value, $3.value).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) + $$ = node.NewParameter($1, variable, nil, $2.value, $3.value).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } else if $2.value == true { $$ = node.NewParameter($1, variable, nil, $2.value, $3.value).SetComments($2.token.Comments()).SetPosition(NewTokensPosition(*$2.token, $4)) } else if $3.value == true { @@ -725,7 +736,7 @@ parameter: identifier := node.NewIdentifier($4.Value).SetComments($4.Comments()).SetPosition(NewTokenPosition($4)) variable := expr.NewVariable(identifier).SetComments($4.Comments()).SetPosition(NewTokenPosition($4)) if $1 != nil { - $$ = node.NewParameter($1, variable, $6, $2.value, $3.value).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $6)) + $$ = node.NewParameter($1, variable, $6, $2.value, $3.value).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $6)) } else if $2.value == true { $$ = node.NewParameter($1, variable, $6, $2.value, $3.value).SetComments($2.token.Comments()).SetPosition(NewTokenNodePosition(*$2.token, $6)) } else if $3.value == true { @@ -768,7 +779,7 @@ non_empty_argument_list: ; argument: - expr { $$ = node.NewArgument($1, false).SetComments(*$1.Comments()).SetPosition(NewNodePosition($1)) } + expr { $$ = node.NewArgument($1, false).SetComments($1.Comments()).SetPosition(NewNodePosition($1)) } | T_ELLIPSIS expr { $$ = node.NewArgument($2, true).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } ; @@ -845,7 +856,7 @@ trait_precedence: { name := name.NewName($3).SetComments(ListGetFirstNodeComments($3)).SetPosition(NewNodeListPosition($3)) $$ = stmt.NewTraitUsePrecedence($1, name). - SetComments(*$1.Comments()). + SetComments($1.Comments()). SetPosition(NewNodeNodeListPosition($1, $3)) } ; @@ -855,26 +866,26 @@ trait_alias: { alias := node.NewIdentifier($3.Value).SetComments($3.Comments()).SetPosition(NewTokenPosition($3)) $$ = stmt.NewTraitUseAlias($1, nil, alias). - SetComments(*$1.Comments()). + SetComments($1.Comments()). SetPosition(NewNodeTokenPosition($1, $3)) } | trait_method_reference T_AS reserved_non_modifiers { alias := node.NewIdentifier($3.Value).SetComments($3.Comments()).SetPosition(NewTokenPosition($3)) $$ = stmt.NewTraitUseAlias($1, nil, alias). - SetComments(*$1.Comments()). + SetComments($1.Comments()). SetPosition(NewNodeTokenPosition($1, $3)) } | trait_method_reference T_AS member_modifier identifier { alias := node.NewIdentifier($4.Value).SetComments($4.Comments()).SetPosition(NewTokenPosition($4)) $$ = stmt.NewTraitUseAlias($1, $3, alias). - SetComments(*$1.Comments()). + SetComments($1.Comments()). SetPosition(NewNodeTokenPosition($1, $4)) } | trait_method_reference T_AS member_modifier { - $$ = stmt.NewTraitUseAlias($1, $3, nil).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) + $$ = stmt.NewTraitUseAlias($1, $3, nil).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } ; @@ -891,7 +902,7 @@ absolute_trait_method_reference: name T_PAAMAYIM_NEKUDOTAYIM identifier { target := node.NewIdentifier($3.Value).SetComments($3.Comments()).SetPosition(NewTokenPosition($3)) - $$ = stmt.NewTraitMethodRef($1, target).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $3)) + $$ = stmt.NewTraitMethodRef($1, target).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $3)) } ; @@ -1017,61 +1028,61 @@ expr_without_variable: shortList := expr.NewShortList($2).SetComments($1.Comments()).SetPosition(NewTokensPosition($1, $3)) $$ = assign_op.NewAssign(shortList, $5).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $5)) } - | variable '=' expr { $$ = assign_op.NewAssign($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable '=' '&' expr { $$ = assign_op.NewAssignRef($1, $4).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $4)) } + | variable '=' expr { $$ = assign_op.NewAssign($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable '=' '&' expr { $$ = assign_op.NewAssignRef($1, $4).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $4)) } | T_CLONE expr { $$ = expr.NewClone($2).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } - | variable T_PLUS_EQUAL expr { $$ = assign_op.NewPlus($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_MINUS_EQUAL expr { $$ = assign_op.NewMinus($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_MUL_EQUAL expr { $$ = assign_op.NewMul($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_POW_EQUAL expr { $$ = assign_op.NewPow($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_DIV_EQUAL expr { $$ = assign_op.NewDiv($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_CONCAT_EQUAL expr { $$ = assign_op.NewConcat($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_MOD_EQUAL expr { $$ = assign_op.NewMod($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_AND_EQUAL expr { $$ = assign_op.NewBitwiseAnd($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_OR_EQUAL expr { $$ = assign_op.NewBitwiseOr($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_XOR_EQUAL expr { $$ = assign_op.NewBitwiseXor($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_SL_EQUAL expr { $$ = assign_op.NewShiftLeft($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_SR_EQUAL expr { $$ = assign_op.NewShiftRight($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | variable T_INC { $$ = expr.NewPostInc($1).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $2)) } + | variable T_PLUS_EQUAL expr { $$ = assign_op.NewPlus($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_MINUS_EQUAL expr { $$ = assign_op.NewMinus($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_MUL_EQUAL expr { $$ = assign_op.NewMul($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_POW_EQUAL expr { $$ = assign_op.NewPow($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_DIV_EQUAL expr { $$ = assign_op.NewDiv($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_CONCAT_EQUAL expr { $$ = assign_op.NewConcat($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_MOD_EQUAL expr { $$ = assign_op.NewMod($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_AND_EQUAL expr { $$ = assign_op.NewBitwiseAnd($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_OR_EQUAL expr { $$ = assign_op.NewBitwiseOr($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_XOR_EQUAL expr { $$ = assign_op.NewBitwiseXor($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_SL_EQUAL expr { $$ = assign_op.NewShiftLeft($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_SR_EQUAL expr { $$ = assign_op.NewShiftRight($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | variable T_INC { $$ = expr.NewPostInc($1).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $2)) } | T_INC variable { $$ = expr.NewPreInc($2).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } - | variable T_DEC { $$ = expr.NewPostDec($1).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $2)) } + | variable T_DEC { $$ = expr.NewPostDec($1).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $2)) } | T_DEC variable { $$ = expr.NewPreDec($2).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } - | expr T_BOOLEAN_OR expr { $$ = binary_op.NewBooleanOr($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_BOOLEAN_AND expr { $$ = binary_op.NewBooleanAnd($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_LOGICAL_OR expr { $$ = binary_op.NewLogicalOr($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_LOGICAL_AND expr { $$ = binary_op.NewLogicalAnd($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_LOGICAL_XOR expr { $$ = binary_op.NewLogicalXor($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '|' expr { $$ = binary_op.NewBitwiseOr($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '&' expr { $$ = binary_op.NewBitwiseAnd($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '^' expr { $$ = binary_op.NewBitwiseXor($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '.' expr { $$ = binary_op.NewConcat($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '+' expr { $$ = binary_op.NewPlus($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '-' expr { $$ = binary_op.NewMinus($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '*' expr { $$ = binary_op.NewMul($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_POW expr { $$ = binary_op.NewPow($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '/' expr { $$ = binary_op.NewDiv($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '%' expr { $$ = binary_op.NewMod($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_SL expr { $$ = binary_op.NewShiftLeft($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_SR expr { $$ = binary_op.NewShiftRight($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_BOOLEAN_OR expr { $$ = binary_op.NewBooleanOr($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_BOOLEAN_AND expr { $$ = binary_op.NewBooleanAnd($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_LOGICAL_OR expr { $$ = binary_op.NewLogicalOr($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_LOGICAL_AND expr { $$ = binary_op.NewLogicalAnd($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_LOGICAL_XOR expr { $$ = binary_op.NewLogicalXor($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '|' expr { $$ = binary_op.NewBitwiseOr($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '&' expr { $$ = binary_op.NewBitwiseAnd($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '^' expr { $$ = binary_op.NewBitwiseXor($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '.' expr { $$ = binary_op.NewConcat($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '+' expr { $$ = binary_op.NewPlus($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '-' expr { $$ = binary_op.NewMinus($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '*' expr { $$ = binary_op.NewMul($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_POW expr { $$ = binary_op.NewPow($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '/' expr { $$ = binary_op.NewDiv($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '%' expr { $$ = binary_op.NewMod($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_SL expr { $$ = binary_op.NewShiftLeft($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_SR expr { $$ = binary_op.NewShiftRight($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } | '+' expr %prec T_INC { $$ = expr.NewUnaryPlus($2).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } | '-' expr %prec T_INC { $$ = expr.NewUnaryMinus($2).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } | '!' expr { $$ = expr.NewBooleanNot($2).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } | '~' expr { $$ = expr.NewBitwiseNot($2).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } - | expr T_IS_IDENTICAL expr { $$ = binary_op.NewIdentical($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_IS_NOT_IDENTICAL expr { $$ = binary_op.NewNotIdentical($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_IS_EQUAL expr { $$ = binary_op.NewEqual($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_IS_NOT_EQUAL expr { $$ = binary_op.NewNotEqual($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '<' expr { $$ = binary_op.NewSmaller($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_IS_SMALLER_OR_EQUAL expr { $$ = binary_op.NewSmallerOrEqual($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr '>' expr { $$ = binary_op.NewGreater($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_IS_GREATER_OR_EQUAL expr { $$ = binary_op.NewGreaterOrEqual($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_SPACESHIP expr { $$ = binary_op.NewSpaceship($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr T_INSTANCEOF class_name_reference { $$ = expr.NewInstanceOf($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_IS_IDENTICAL expr { $$ = binary_op.NewIdentical($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_IS_NOT_IDENTICAL expr { $$ = binary_op.NewNotIdentical($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_IS_EQUAL expr { $$ = binary_op.NewEqual($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_IS_NOT_EQUAL expr { $$ = binary_op.NewNotEqual($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '<' expr { $$ = binary_op.NewSmaller($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_IS_SMALLER_OR_EQUAL expr { $$ = binary_op.NewSmallerOrEqual($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '>' expr { $$ = binary_op.NewGreater($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_IS_GREATER_OR_EQUAL expr { $$ = binary_op.NewGreaterOrEqual($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_SPACESHIP expr { $$ = binary_op.NewSpaceship($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr T_INSTANCEOF class_name_reference { $$ = expr.NewInstanceOf($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } | '(' expr ')' { $$ = $2; } | new_expr { $$ = $1; } - | expr '?' expr ':' expr { $$ = expr.NewTernary($1, $3, $5).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $5)) } - | expr '?' ':' expr { $$ = expr.NewTernary($1, nil, $4).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $4)) } - | expr T_COALESCE expr { $$ = binary_op.NewCoalesce($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr '?' expr ':' expr { $$ = expr.NewTernary($1, $3, $5).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $5)) } + | expr '?' ':' expr { $$ = expr.NewTernary($1, nil, $4).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $4)) } + | expr T_COALESCE expr { $$ = binary_op.NewCoalesce($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } | internal_functions_in_yacc { $$ = $1} | T_INT_CAST expr { $$ = cast.NewCastInt($2).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } | T_DOUBLE_CAST expr { $$ = cast.NewCastDouble($2).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } @@ -1140,19 +1151,19 @@ lexical_var: function_call: name argument_list { - $$ = expr.NewFunctionCall($1, $2.nodes).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $2.endToken)) + $$ = expr.NewFunctionCall($1, $2.nodes).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $2.endToken)) } | class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list { - $$ = expr.NewStaticCall($1, $3, $4.nodes).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $4.endToken)) + $$ = expr.NewStaticCall($1, $3, $4.nodes).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $4.endToken)) } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM member_name argument_list { - $$ = expr.NewStaticCall($1, $3, $4.nodes).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $4.endToken)) + $$ = expr.NewStaticCall($1, $3, $4.nodes).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $4.endToken)) } | callable_expr argument_list { - $$ = expr.NewFunctionCall($1, $2.nodes).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $2.endToken)) + $$ = expr.NewFunctionCall($1, $2.nodes).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $2.endToken)) } ; @@ -1210,16 +1221,16 @@ scalar: ; constant: - name { $$ = expr.NewConstFetch($1).SetComments(*$1.Comments()).SetPosition(NewNodePosition($1)) } + name { $$ = expr.NewConstFetch($1).SetComments($1.Comments()).SetPosition(NewNodePosition($1)) } | class_name T_PAAMAYIM_NEKUDOTAYIM identifier { target := node.NewIdentifier($3.Value).SetComments($3.Comments()).SetPosition(NewTokenPosition($3)) - $$ = expr.NewClassConstFetch($1, target).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $3)) + $$ = expr.NewClassConstFetch($1, target).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $3)) } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM identifier { target := node.NewIdentifier($3.Value).SetComments($3.Comments()).SetPosition(NewTokenPosition($3)) - $$ = expr.NewClassConstFetch($1, target).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $3)) + $$ = expr.NewClassConstFetch($1, target).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $3)) } ; @@ -1251,18 +1262,18 @@ callable_expr: callable_variable: simple_variable { $$ = $1; } - | dereferencable '[' optional_expr ']' { $$ = expr.NewArrayDimFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } - | constant '[' optional_expr ']' { $$ = expr.NewArrayDimFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } - | dereferencable '{' expr '}' { $$ = expr.NewArrayDimFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } + | dereferencable '[' optional_expr ']' { $$ = expr.NewArrayDimFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } + | constant '[' optional_expr ']' { $$ = expr.NewArrayDimFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } + | dereferencable '{' expr '}' { $$ = expr.NewArrayDimFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } | dereferencable T_OBJECT_OPERATOR property_name argument_list - { $$ = expr.NewMethodCall($1, $3, $4.nodes).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $4.endToken)) } + { $$ = expr.NewMethodCall($1, $3, $4.nodes).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $4.endToken)) } | function_call { $$ = $1; } ; variable: callable_variable { $$ = $1; } | static_member { $$ = $1; } - | dereferencable T_OBJECT_OPERATOR property_name { $$ = expr.NewPropertyFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | dereferencable T_OBJECT_OPERATOR property_name { $$ = expr.NewPropertyFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } ; simple_variable: @@ -1274,26 +1285,26 @@ simple_variable: static_member: class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { - $$ = expr.NewStaticPropertyFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) + $$ = expr.NewStaticPropertyFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } | variable_class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { - $$ = expr.NewStaticPropertyFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) + $$ = expr.NewStaticPropertyFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } ; new_variable: simple_variable { $$ = $1 } - | new_variable '[' optional_expr ']' { $$ = expr.NewArrayDimFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } - | new_variable '{' expr '}' { $$ = expr.NewArrayDimFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } - | new_variable T_OBJECT_OPERATOR property_name { $$ = expr.NewPropertyFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | new_variable '[' optional_expr ']' { $$ = expr.NewArrayDimFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } + | new_variable '{' expr '}' { $$ = expr.NewArrayDimFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodeTokenPosition($1, $4)) } + | new_variable T_OBJECT_OPERATOR property_name { $$ = expr.NewPropertyFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable { - $$ = expr.NewStaticPropertyFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) + $$ = expr.NewStaticPropertyFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } | new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable { - $$ = expr.NewStaticPropertyFetch($1, $3).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) + $$ = expr.NewStaticPropertyFetch($1, $3).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } ; @@ -1332,16 +1343,16 @@ non_empty_array_pair_list: ; array_pair: - expr T_DOUBLE_ARROW expr { $$ = expr.NewArrayItem($1, $3, false).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $3)) } - | expr { $$ = expr.NewArrayItem(nil, $1, false).SetComments(*$1.Comments()).SetPosition(NewNodePosition($1)) } - | expr T_DOUBLE_ARROW '&' variable { $$ = expr.NewArrayItem($1, $4, true).SetComments(*$1.Comments()).SetPosition(NewNodesPosition($1, $4)) } + expr T_DOUBLE_ARROW expr { $$ = expr.NewArrayItem($1, $3, false).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $3)) } + | expr { $$ = expr.NewArrayItem(nil, $1, false).SetComments($1.Comments()).SetPosition(NewNodePosition($1)) } + | expr T_DOUBLE_ARROW '&' variable { $$ = expr.NewArrayItem($1, $4, true).SetComments($1.Comments()).SetPosition(NewNodesPosition($1, $4)) } | '&' variable { $$ = expr.NewArrayItem(nil, $2, true).SetComments($1.Comments()).SetPosition(NewTokenNodePosition($1, $2)) } | expr T_DOUBLE_ARROW T_LIST '(' array_pair_list ')' { // TODO: Cannot use list() as standalone expression list := expr.NewList($5).SetComments($3.Comments()).SetPosition(NewTokensPosition($3, $6)) $$ = expr.NewArrayItem($1, list, false). - SetComments(*$1.Comments()). + SetComments($1.Comments()). SetPosition(NewNodeTokenPosition($1, $6)) } | T_LIST '(' array_pair_list ')' diff --git a/parser/positions.go b/parser/positions.go index 9b57196..8d3fd39 100644 --- a/parser/positions.go +++ b/parser/positions.go @@ -1,7 +1,6 @@ package parser import ( - "github.com/z7zmey/php-parser/comment" "github.com/z7zmey/php-parser/node" "github.com/z7zmey/php-parser/token" ) @@ -181,13 +180,3 @@ func NewOptionalListTokensPosition(list []node.Node, t token.Token, endToken tok } } } - -func ListGetFirstNodeComments(list []node.Node) []comment.Comment { - if len(list) == 0 { - return nil - } - - node := list[0] - - return *node.Comments() -} diff --git a/parser/scanner.go b/parser/scanner.go index 3065c06..ff2704f 100644 --- a/parser/scanner.go +++ b/parser/scanner.go @@ -32,7 +32,7 @@ const ( var heredocLabel []byte func (l *lexer) Lex(lval *yySymType) int { - l.comments = []comment.Comment{} + l.comments = nil c := l.Enter() yystate0: @@ -8265,10 +8265,10 @@ yyrule126: // ([/][*])|([/][*][*]) lval.token = token.NewToken(l.handleNewLine(l.TokenBytes(nil))) if is_doc_comment { l.phpDocComment = string(l.TokenBytes(nil)) - l.comments = append(l.comments, comment.NewDocComment(string(l.TokenBytes(nil)))) + l.addComment(comment.NewDocComment(string(l.TokenBytes(nil)))) // return T_DOC_COMMENT } else { - l.comments = append(l.comments, comment.NewPlainComment(string(l.TokenBytes(nil)))) + l.addComment(comment.NewPlainComment(string(l.TokenBytes(nil)))) // return T_COMMENT } goto yystate0 diff --git a/parser/scanner.l b/parser/scanner.l index 768504a..fb7506a 100644 --- a/parser/scanner.l +++ b/parser/scanner.l @@ -31,7 +31,7 @@ const ( var heredocLabel []byte func (l *lexer) Lex(lval *yySymType) int { - l.comments = []comment.Comment{} + l.comments = nil c := l.Enter() %} @@ -273,10 +273,10 @@ NEW_LINE (\r|\n|\r\n) lval.token = token.NewToken(l.handleNewLine(l.TokenBytes(nil))) if is_doc_comment { l.phpDocComment = string(l.TokenBytes(nil)) - l.comments = append(l.comments, comment.NewDocComment(string(l.TokenBytes(nil)))) + l.addComment(comment.NewDocComment(string(l.TokenBytes(nil)))) // return T_DOC_COMMENT } else { - l.comments = append(l.comments, comment.NewPlainComment(string(l.TokenBytes(nil)))) + l.addComment(comment.NewPlainComment(string(l.TokenBytes(nil)))) // return T_COMMENT } diff --git a/token/token.go b/token/token.go index 3f6ef9a..55cf52c 100644 --- a/token/token.go +++ b/token/token.go @@ -8,8 +8,8 @@ type TokenInterface interface { GetValue() string GetStartLine() int GetEndLine() int - Comments() []comment.Comment - SetComments(comments []comment.Comment) Token + Comments() *[]comment.Comment + SetComments(comments *[]comment.Comment) Token } type Token struct { @@ -18,7 +18,7 @@ type Token struct { EndLine int StartPos int EndPos int - comments []comment.Comment + comments *[]comment.Comment } func NewToken(value []byte, startLine int, endLine int, startPos int, endPos int) Token { @@ -39,11 +39,11 @@ func (t Token) GetEndLine() int { return t.EndLine } -func (t Token) Comments() []comment.Comment { +func (t Token) Comments() *[]comment.Comment { return t.comments } -func (t Token) SetComments(comments []comment.Comment) Token { +func (t Token) SetComments(comments *[]comment.Comment) Token { t.comments = comments return t }