maride/php-parser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yield YieldFrom tests

Browse Source
This commit is contained in:
z7zmey 2018-02-10 15:08:54 +02:00
parent 6343404ac5
commit 1e356ee7e4
3 changed files with 341 additions and 220 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
node/expr/t_yield_test.go Normal file
View File

@ -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)
}

448
php5/php5.go
View File

File diff suppressed because it is too large Load Diff

24
php5/php5.y
View File

@ -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())
}