diff --git a/node/expr/post_dec.go b/node/expr/post_dec.go new file mode 100644 index 0000000..eb217fa --- /dev/null +++ b/node/expr/post_dec.go @@ -0,0 +1,29 @@ +package expr + +import ( + "fmt" + "io" + + "github.com/z7zmey/php-parser/node" +) + +type PostDec struct { + node.SimpleNode + variable node.Node +} + +func NewPostDec(variableession node.Node) node.Node { + return PostDec{ + node.SimpleNode{Name: "PostDec", Attributes: make(map[string]string)}, + variableession, + } +} + +func (n PostDec) Print(out io.Writer, indent string) { + fmt.Fprintf(out, "\n%v%v [- -]", indent, n.Name) + + if n.variable != nil { + fmt.Fprintf(out, "\n%vvariable:", indent+" ") + n.variable.Print(out, indent+" ") + } +} diff --git a/node/expr/post_inc.go b/node/expr/post_inc.go new file mode 100644 index 0000000..89652b7 --- /dev/null +++ b/node/expr/post_inc.go @@ -0,0 +1,29 @@ +package expr + +import ( + "fmt" + "io" + + "github.com/z7zmey/php-parser/node" +) + +type PostInc struct { + node.SimpleNode + variable node.Node +} + +func NewPostInc(variableession node.Node) node.Node { + return PostInc{ + node.SimpleNode{Name: "PostInc", Attributes: make(map[string]string)}, + variableession, + } +} + +func (n PostInc) Print(out io.Writer, indent string) { + fmt.Fprintf(out, "\n%v%v [- -]", indent, n.Name) + + if n.variable != nil { + fmt.Fprintf(out, "\n%vvariable:", indent+" ") + n.variable.Print(out, indent+" ") + } +} diff --git a/node/expr/pre_dec.go b/node/expr/pre_dec.go new file mode 100644 index 0000000..ff2f3fd --- /dev/null +++ b/node/expr/pre_dec.go @@ -0,0 +1,29 @@ +package expr + +import ( + "fmt" + "io" + + "github.com/z7zmey/php-parser/node" +) + +type PreDec struct { + node.SimpleNode + variable node.Node +} + +func NewPreDec(variableession node.Node) node.Node { + return PreDec{ + node.SimpleNode{Name: "PreDec", Attributes: make(map[string]string)}, + variableession, + } +} + +func (n PreDec) Print(out io.Writer, indent string) { + fmt.Fprintf(out, "\n%v%v [- -]", indent, n.Name) + + if n.variable != nil { + fmt.Fprintf(out, "\n%vvariable:", indent+" ") + n.variable.Print(out, indent+" ") + } +} diff --git a/node/expr/pre_inc.go b/node/expr/pre_inc.go new file mode 100644 index 0000000..735575a --- /dev/null +++ b/node/expr/pre_inc.go @@ -0,0 +1,29 @@ +package expr + +import ( + "fmt" + "io" + + "github.com/z7zmey/php-parser/node" +) + +type PreInc struct { + node.SimpleNode + variable node.Node +} + +func NewPreInc(variableession node.Node) node.Node { + return PreInc{ + node.SimpleNode{Name: "PreInc", Attributes: make(map[string]string)}, + variableession, + } +} + +func (n PreInc) Print(out io.Writer, indent string) { + fmt.Fprintf(out, "\n%v%v [- -]", indent, n.Name) + + if n.variable != nil { + fmt.Fprintf(out, "\n%vvariable:", indent+" ") + n.variable.Print(out, indent+" ") + } +} diff --git a/parser/parser.go b/parser/parser.go index c935dbc..bf05bd0 100644 --- a/parser/parser.go +++ b/parser/parser.go @@ -3903,25 +3903,25 @@ yydefault: yyDollar = yyS[yypt-2 : yypt+1] //line parser/parser.y:841 { - yyVAL.node = node.NewSimpleNode("PostIncrement").Append(yyDollar[1].node) + yyVAL.node = expr.NewPostInc(yyDollar[1].node) } case 311: yyDollar = yyS[yypt-2 : yypt+1] //line parser/parser.y:842 { - yyVAL.node = node.NewSimpleNode("PreIncrement").Append(yyDollar[2].node) + yyVAL.node = expr.NewPreInc(yyDollar[2].node) } case 312: yyDollar = yyS[yypt-2 : yypt+1] //line parser/parser.y:843 { - yyVAL.node = node.NewSimpleNode("PostDecrement").Append(yyDollar[1].node) + yyVAL.node = expr.NewPostDec(yyDollar[1].node) } case 313: yyDollar = yyS[yypt-2 : yypt+1] //line parser/parser.y:844 { - yyVAL.node = node.NewSimpleNode("PreDecrement").Append(yyDollar[2].node) + yyVAL.node = expr.NewPreDec(yyDollar[2].node) } case 314: yyDollar = yyS[yypt-3 : yypt+1] diff --git a/parser/parser.y b/parser/parser.y index 37f557f..144298d 100644 --- a/parser/parser.y +++ b/parser/parser.y @@ -838,10 +838,10 @@ expr_without_variable: | variable T_XOR_EQUAL expr { $$ = assign_op.NewBitwiseXor($1, $3) } | variable T_SL_EQUAL expr { $$ = assign_op.NewShiftLeft($1, $3) } | variable T_SR_EQUAL expr { $$ = assign_op.NewShiftRight($1, $3) } - | variable T_INC { $$ = node.NewSimpleNode("PostIncrement").Append($1) } - | T_INC variable { $$ = node.NewSimpleNode("PreIncrement").Append($2) } - | variable T_DEC { $$ = node.NewSimpleNode("PostDecrement").Append($1) } - | T_DEC variable { $$ = node.NewSimpleNode("PreDecrement").Append($2) } + | variable T_INC { $$ = expr.NewPostInc($1) } + | T_INC variable { $$ = expr.NewPreInc($2) } + | variable T_DEC { $$ = expr.NewPostDec($1) } + | T_DEC variable { $$ = expr.NewPreDec($2) } | expr T_BOOLEAN_OR expr { $$ = binary_op.NewBooleanOr($1, $3) } | expr T_BOOLEAN_AND expr { $$ = binary_op.NewBooleanAnd($1, $3) } | expr T_LOGICAL_OR expr { $$ = binary_op.NewLogicalOr($1, $3) }