do node

node/stmt/do.go

@@ -0,0 +1,41 @@
+package stmt
+
+import (
+	"fmt"
+	"io"
+
+	"github.com/z7zmey/php-parser/node"
+	"github.com/z7zmey/php-parser/token"
+)
+
+type Do struct {
+	node.SimpleNode
+	token token.Token
+	stmts []node.Node
+	cond  node.Node
+}
+
+func NewDo(token token.Token, stmts []node.Node, cond node.Node) node.Node {
+	return Do{
+		node.SimpleNode{Name: "Do", Attributes: make(map[string]string)},
+		token,
+		stmts,
+		cond,
+	}
+}
+
+func (n Do) Print(out io.Writer, indent string) {
+	fmt.Fprintf(out, "\n%v%v [%d %d] %q", indent, n.Name, n.token.StartLine, n.token.EndLine, n.token.Value)
+
+	if n.cond != nil {
+		fmt.Fprintf(out, "\n%vcond:", indent+"  ")
+		n.cond.Print(out, indent+"    ")
+	}
+
+	if n.stmts != nil {
+		fmt.Fprintf(out, "\n%vstmts:", indent+"  ")
+		for _, nn := range n.stmts {
+			nn.Print(out, indent+"    ")
+		}
+	}
+}

parser/parser.y

@@ -360,12 +360,7 @@ statement:
                 Append(node.NewSimpleNode("expr").Append($3)).
                 Append(node.NewSimpleNode("stmt").Append($5));
         }
-    |   T_DO statement T_WHILE '(' expr ')' ';'
+    |   T_DO statement T_WHILE '(' expr ')' ';'         { $$ = stmt.NewDo($1, $2.(node.SimpleNode).Children, $5) }
-        {
-            $$ = node.NewSimpleNode("DoWhile").
-                Append(node.NewSimpleNode("expr").Append($5)).
-                Append(node.NewSimpleNode("stmt").Append($2));
-        }
     |   T_FOR '(' for_exprs ';' for_exprs ';' for_exprs ')' for_statement
             {
                 $$ = node.NewSimpleNode("For").