Yield YieldFrom tests

node/expr/t_yield_test.go

@@ -0,0 +1,89 @@
+package expr_test
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/z7zmey/php-parser/node/expr"
+
+	"github.com/z7zmey/php-parser/node"
+	"github.com/z7zmey/php-parser/node/stmt"
+	"github.com/z7zmey/php-parser/php5"
+	"github.com/z7zmey/php-parser/php7"
+)
+
+func TestYield(t *testing.T) {
+	src := `<? yield;`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Expression{
+				Expr: &expr.Yield{},
+			},
+		},
+	}
+
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}
+
+func TestYieldVal(t *testing.T) {
+	src := `<? yield $a;`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Expression{
+				Expr: &expr.Yield{
+					Value: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
+				},
+			},
+		},
+	}
+
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}
+
+func TestYieldKeyVal(t *testing.T) {
+	src := `<? yield $a => $b;`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Expression{
+				Expr: &expr.Yield{
+					Key:   &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
+					Value: &expr.Variable{VarName: &node.Identifier{Value: "$b"}},
+				},
+			},
+		},
+	}
+
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+
+	actual, _, _ = php5.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}
+
+func TestYieldFrom(t *testing.T) {
+	src := `<? yield from $a;`
+
+	expected := &stmt.StmtList{
+		Stmts: []node.Node{
+			&stmt.Expression{
+				Expr: &expr.YieldFrom{
+					Expr: &expr.Variable{VarName: &node.Identifier{Value: "$a"}},
+				},
+			},
+		},
+	}
+
+	actual, _, _ := php7.Parse(bytes.NewBufferString(src), "test.php")
+	assertEqual(t, expected, actual)
+}

php5/php5.y

@@ -2276,25 +2276,41 @@ expr_without_variable:
 yield_expr:
         T_YIELD expr_without_variable
             {
-                $$ = expr.NewYield(nil, $2)
+                yield := expr.NewYield(nil, $2)
+                positions.AddPosition(yield, positionBuilder.NewTokenNodePosition($1, $2))
+                comments.AddComments(yield, $1.Comments())
+
+                $$ = stmt.NewExpression(yield)
                 positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
                 comments.AddComments($$, $1.Comments())
             }
     |   T_YIELD variable
             {
-                $$ = expr.NewYield(nil, $2)
+                yield := expr.NewYield(nil, $2)
+                positions.AddPosition(yield, positionBuilder.NewTokenNodePosition($1, $2))
+                comments.AddComments(yield, $1.Comments())
+
+                $$ = stmt.NewExpression(yield)
                 positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $2))
                 comments.AddComments($$, $1.Comments())
             }
     |   T_YIELD expr T_DOUBLE_ARROW expr_without_variable
             {
-                $$ = expr.NewYield($2, $4)
+                yield := expr.NewYield($2, $4)
+                positions.AddPosition(yield, positionBuilder.NewTokenNodePosition($1, $4))
+                comments.AddComments(yield, $1.Comments())
+
+                $$ = stmt.NewExpression(yield)
                 positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $4))
                 comments.AddComments($$, $1.Comments())
             }
     |   T_YIELD expr T_DOUBLE_ARROW variable
             {
-                $$ = expr.NewYield($2, $4)
+                yield := expr.NewYield($2, $4)
+                positions.AddPosition(yield, positionBuilder.NewTokenNodePosition($1, $4))
+                comments.AddComments(yield, $1.Comments())
+
+                $$ = stmt.NewExpression(yield)
                 positions.AddPosition($$, positionBuilder.NewTokenNodePosition($1, $4))
                 comments.AddComments($$, $1.Comments())
             }