split Exit and Die nodes

node/expr/n_die.go

@@ -0,0 +1,38 @@
+package expr
+
+import (
+	"github.com/z7zmey/php-parser/node"
+	"github.com/z7zmey/php-parser/walker"
+)
+
+// Die node
+type Die struct {
+	Expr node.Node
+}
+
+// NewDie node constuctor
+func NewDie(Expr node.Node) *Die {
+	return &Die{
+		Expr,
+	}
+}
+
+// Attributes returns node attributes as map
+func (n *Die) Attributes() map[string]interface{} {
+	return nil
+}
+
+// Walk traverses nodes
+// Walk is invoked recursively until v.EnterNode returns true
+func (n *Die) Walk(v walker.Visitor) {
+	if v.EnterNode(n) == false {
+		return
+	}
+
+	if n.Expr != nil {
+		vv := v.GetChildrenVisitor("Expr")
+		n.Expr.Walk(vv)
+	}
+
+	v.LeaveNode(n)
+}

node/expr/n_exit.go

@@ -7,23 +7,19 @@ import (
 
 // Exit node
 type Exit struct {
-	Expr  node.Node
+	Expr node.Node
-	IsDie bool
 }
 
 // NewExit node constuctor
-func NewExit(Expr node.Node, IsDie bool) *Exit {
+func NewExit(Expr node.Node) *Exit {
 	return &Exit{
 		Expr,
-		IsDie,
 	}
 }
 
 // Attributes returns node attributes as map
 func (n *Exit) Attributes() map[string]interface{} {
-	return map[string]interface{}{
+	return nil
-		"IsDie": n.IsDie,
-	}
 }
 
 // Walk traverses nodes

node/expr/t_exit_test.go

@@ -18,9 +18,7 @@ func TestExit(t *testing.T) {
 	expected := &stmt.StmtList{
 		Stmts: []node.Node{
 			&stmt.Expression{
-				Expr: &expr.Exit{
+				Expr: &expr.Exit{},
-					IsDie: false,
-				},
 			},
 		},
 	}
@@ -39,8 +37,7 @@ func TestExitExpr(t *testing.T) {
 		Stmts: []node.Node{
 			&stmt.Expression{
 				Expr: &expr.Exit{
-					IsDie: false,
+					Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
-					Expr:  &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
 				},
 			},
 		},
@@ -59,9 +56,7 @@ func TestDie(t *testing.T) {
 	expected := &stmt.StmtList{
 		Stmts: []node.Node{
 			&stmt.Expression{
-				Expr: &expr.Exit{
+				Expr: &expr.Die{},
-					IsDie: true,
-				},
 			},
 		},
 	}
@@ -79,9 +74,8 @@ func TestDieExpr(t *testing.T) {
 	expected := &stmt.StmtList{
 		Stmts: []node.Node{
 			&stmt.Expression{
-				Expr: &expr.Exit{
+				Expr: &expr.Die{
-					IsDie: true,
+					Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
-					Expr:  &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
 				},
 			},
 		},

node/expr/t_visitor_test.go

@@ -132,11 +132,17 @@ var nodesToTest = []struct {
 	},
 	{
 		&expr.Exit{
-			Expr:  &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
+			Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
-			IsDie: false,
 		},
 		[]string{"Expr"},
-		map[string]interface{}{"IsDie": false},
+		map[string]interface{}{},
+	},
+	{
+		&expr.Die{
+			Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
+		},
+		[]string{"Expr"},
+		map[string]interface{}{},
 	},
 	{
 		&expr.FunctionCall{

php5/php5.y

@@ -2226,7 +2226,11 @@ expr_without_variable:
             }
     |   T_EXIT exit_expr
             {
-                $$ = expr.NewExit($2, strings.EqualFold($1.Value, "die"))
+                if (strings.EqualFold($1.Value, "die")) {
+                    $$ = expr.NewDie($2)
+                } else {
+                    $$ = expr.NewExit($2)
+                }
                 positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
                 comments.AddComments($$, $1.Comments())
             }

php5/php5_test.go

@@ -2119,25 +2119,19 @@ CAD;
 				},
 			},
 			&stmt.Expression{
-				Expr: &expr.Exit{
+				Expr: &expr.Exit{},
-					IsDie: false,
-				},
 			},
 			&stmt.Expression{
 				Expr: &expr.Exit{
-					IsDie: false,
+					Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
-					Expr:  &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
 				},
 			},
 			&stmt.Expression{
-				Expr: &expr.Exit{
+				Expr: &expr.Die{},
-					IsDie: true,
-				},
 			},
 			&stmt.Expression{
-				Expr: &expr.Exit{
+				Expr: &expr.Die{
-					IsDie: true,
+					Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
-					Expr:  &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
 				},
 			},
 			&stmt.Expression{

php7/php7.y

@@ -1844,7 +1844,11 @@ expr_without_variable:
         }
     |   T_EXIT exit_expr
         {
-            $$ = expr.NewExit($2, strings.EqualFold($1.Value, "die"))
+            if (strings.EqualFold($1.Value, "die")) {
+                $$ = expr.NewDie($2)
+            } else {
+                $$ = expr.NewExit($2)
+            }
             positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
             comments.AddComments($$, $1.Comments())
         }

php7/php7_test.go

@@ -2206,25 +2206,19 @@ CAD;
 				},
 			},
 			&stmt.Expression{
-				Expr: &expr.Exit{
+				Expr: &expr.Exit{},
-					IsDie: false,
-				},
 			},
 			&stmt.Expression{
 				Expr: &expr.Exit{
-					IsDie: false,
+					Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
-					Expr:  &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
 				},
 			},
 			&stmt.Expression{
-				Expr: &expr.Exit{
+				Expr: &expr.Die{},
-					IsDie: true,
-				},
 			},
 			&stmt.Expression{
-				Expr: &expr.Exit{
+				Expr: &expr.Die{
-					IsDie: true,
+					Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
-					Expr:  &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
 				},
 			},
 			&stmt.Expression{