Fix #371: Cannot use yield in ternary operator.

Author: dim-s

jphp-core/src/org/develnext/jphp/core/syntax/generators/manually/SimpleExprGenerator.java

@@ -14,6 +14,7 @@
 import org.develnext.jphp.core.tokenizer.token.SemicolonToken;
 import org.develnext.jphp.core.tokenizer.token.Token;
 import org.develnext.jphp.core.tokenizer.token.expr.*;
+import org.develnext.jphp.core.tokenizer.token.expr.BraceExprToken.Kind;
 import org.develnext.jphp.core.tokenizer.token.expr.operator.*;
 import org.develnext.jphp.core.tokenizer.token.expr.operator.cast.CastExprToken;
 import org.develnext.jphp.core.tokenizer.token.expr.operator.cast.UnsetCastExprToken;
@@ -508,7 +509,7 @@ protected CallExprToken processCall(Token previous, Token current, ListIterator<
         return result;
     }
 
-    protected Token processYield(Token current, Token next, ListIterator<Token> iterator, BraceExprToken.Kind closedBrace) {
+    protected Token processYield(Token current, Token next, ListIterator<Token> iterator, Separator separator, Kind closedBrace) {
         if (analyzer.getFunction() == null) {
             analyzer.getEnvironment().error(
                     current.toTraceInfo(analyzer.getContext()), Messages.ERR_YIELD_CAN_ONLY_INSIDE_FUNCTION.fetch()
@@ -529,7 +530,7 @@ protected Token processYield(Token current, Token next, ListIterator<Token> iter
             result.setValue(null);
         } else {
             ExprStmtToken value = analyzer.generator(SimpleExprGenerator.class).getNextExpression(
-                    nextToken(iterator), iterator, BraceExprToken.Kind.ANY
+                    nextToken(iterator), iterator, separator, BraceExprToken.Kind.ANY
             );
             result.setValue(value);
         }
@@ -1025,7 +1026,7 @@ protected Token processSimpleToken(Token current, Token previous, Token next, Li
         }
 
         if (current instanceof YieldExprToken) {
-            return processYield(current, next, iterator, closedBraceKind);
+            return processYield(current, next, iterator, separator, closedBraceKind);
         }
 
         if (current instanceof ImportExprToken) {

jphp-core/tests/org/develnext/jphp/core/compiler/jvm/GeneratorsTest.java

@@ -223,4 +223,9 @@ public void testBug262() {
     public void testBug369() {
         check("generators/bug369.phpt");
     }
+
+    @Test
+    public void testBug371() {
+        check("generators/bug371.phpt");
+    }
 }

jphp-core/tests/resources/generators/bug371.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Test yield syntax in ternary operator
+--FILE--
+<?php
+
+function a() {
+    true ? yield : yield;
+    true ?: yield;
+    true ?? yield;
+}
+
+echo "OK";
+
+?>
+--EXPECT--
+OK