Merge pull request #122 from zephir-lang/#118-yield-statement

#118 - Add support for `yield` statement
zephir-lang · Sep 18, 2021 · fa799a0 · fa799a0
2 parents 5ff6c22 + 1dc8955
commit fa799a0
Show file tree

Hide file tree

Showing 11 changed files with 1,196 additions and 3 deletions.
diff --git a/parser/base.c b/parser/base.c
@@ -178,6 +178,9 @@ void xx_parse_program(zval *return_value, char *program, size_t program_length,
 			case XX_T_RETURN:
 				xx_(xx_parser, XX_RETURN, NULL, parser_status);
 				break;
+			case XX_T_YIELD:
+				xx_(xx_parser, XX_YIELD, NULL, parser_status);
+				break;
 			case XX_T_REQUIRE_ONCE:
 				xx_(xx_parser, XX_REQUIRE_ONCE, NULL, parser_status);
 				break;

diff --git a/parser/parser.h b/parser/parser.h
@@ -899,6 +899,28 @@ static void xx_ret_return_statement(zval *ret, zval *expr, xx_scanner_state *sta
 	parser_add_int(ret, "char", state->active_char);
 }
 
+static void xx_ret_yield_statement(zval *ret, zval *expr, zval *K, zval *V, xx_scanner_state *state)
+{
+	array_init(ret);
+
+	parser_add_str(ret, "type", "yield");
+	if (expr) {
+		parser_add_zval(ret, "expr", expr);
+	}
+
+	if (K) {
+		parser_add_zval(ret, "key", K);
+	}
+
+	if (V) {
+		parser_add_zval(ret, "value", V);
+	}
+
+	parser_add_str(ret, "file", state->active_file);
+	parser_add_int(ret, "line", state->active_line);
+	parser_add_int(ret, "char", state->active_char);
+}
+
 static void xx_ret_require_once_statement(zval *ret, zval *expr, xx_scanner_state *state)
 {
 	array_init(ret);

diff --git a/parser/scanner.h b/parser/scanner.h
@@ -99,6 +99,7 @@
 #define XX_T_CATCH 398
 #define XX_T_DEPRECATED 399
 #define XX_T_REQUIRE_ONCE 459
+#define XX_T_YIELD 460
 
 /* Operators */
 #define XX_T_AT '@'

diff --git a/parser/scanner.re b/parser/scanner.re
@@ -363,6 +363,12 @@ int xx_get_token(xx_scanner_state *s, xx_scanner_token *token) {
 			return 0;
 		}
 
+		'yield' {
+			s->active_char += sizeof("yield")-1;
+			token->opcode = XX_T_YIELD;
+			return 0;
+		}
+
 		'require' {
 			s->active_char += sizeof("require")-1;
 			token->opcode = XX_T_REQUIRE;

diff --git a/parser/zephir.lemon b/parser/zephir.lemon
@@ -986,6 +986,10 @@ xx_statement(R) ::= xx_return_statement(S) . {
 	R = S;
 }
 
+xx_statement(R) ::= xx_yield_statement(S) . {
+	R = S;
+}
+
 xx_statement(R) ::= xx_require_once_statement(S) . {
 	R = S;
 }
@@ -1526,16 +1530,31 @@ xx_fetch_statement(R) ::= xx_fetch_expr(E) DOTCOMMA . {
 	xx_ret_fetch_statement(&R, &E, status->scanner_state);
 }
 
-/* return statement */
+/* return var; */
 xx_return_statement(R) ::= RETURN xx_common_expr(E) DOTCOMMA . {
 	xx_ret_return_statement(&R, &E, status->scanner_state);
 }
 
-/* return statement */
+/* return; */
 xx_return_statement(R) ::= RETURN DOTCOMMA . {
 	xx_ret_return_statement(&R, NULL, status->scanner_state);
 }
 
+/* yield var; */
+xx_yield_statement(R) ::= YIELD xx_common_expr(E) DOTCOMMA . {
+	xx_ret_yield_statement(&R, &E, NULL, NULL, status->scanner_state);
+}
+
+/* yield key, val; */
+xx_yield_statement(R) ::= YIELD xx_common_expr(K) COMMA xx_common_expr(V) DOTCOMMA . {
+	xx_ret_yield_statement(&R, NULL, &K, &V, status->scanner_state);
+}
+
+/* yield; */
+xx_yield_statement(R) ::= YIELD DOTCOMMA . {
+	xx_ret_yield_statement(&R, NULL, NULL, NULL, status->scanner_state);
+}
+
 /* require_once statement */
 xx_require_once_statement(R) ::= REQUIRE_ONCE xx_common_expr(E) DOTCOMMA . {
 	xx_ret_require_once_statement(&R, &E, status->scanner_state);
@@ -1906,7 +1925,7 @@ xx_common_expr(R) ::= NULL . {
 	xx_ret_literal(&R, XX_T_NULL, NULL, status->scanner_state);
 }
 
-/* y = false */
+/* y = true */
 xx_common_expr(R) ::= TRUE . {
 	xx_ret_literal(&R, XX_T_TRUE, NULL, status->scanner_state);
 }

diff --git a/tests/statements/yield/empty-yield.phpt b/tests/statements/yield/empty-yield.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Empty yield statement
+--SKIPIF--
+<?php include(__DIR__ . '/../../skipif.inc'); ?>
+--FILE--
+<?php
+$code =<<<ZEP
+function test() {
+	yield;
+}
+ZEP;
+
+$ir = zephir_parse_file($code, '(eval code)');
+var_dump($ir[0]["statements"][0]);
+?>
+--EXPECT--
+array(4) {
+  ["type"]=>
+  string(5) "yield"
+  ["file"]=>
+  string(11) "(eval code)"
+  ["line"]=>
+  int(3)
+  ["char"]=>
+  int(1)
+}
diff --git a/tests/statements/yield/yield-array.phpt b/tests/statements/yield/yield-array.phpt
@@ -0,0 +1,119 @@
+--TEST--
+Array yield statement
+--SKIPIF--
+<?php include(__DIR__ . '/../../skipif.inc'); ?>
+--FILE--
+<?php
+$code =<<<ZEP
+function test() {
+	yield ['key': 'value', 'another', 'val'];
+}
+ZEP;
+
+$ir = zephir_parse_file($code, '(eval code)');
+var_dump($ir[0]["statements"][0]);
+?>
+--EXPECT--
+array(5) {
+  ["type"]=>
+  string(5) "yield"
+  ["expr"]=>
+  array(5) {
+    ["type"]=>
+    string(5) "array"
+    ["left"]=>
+    array(3) {
+      [0]=>
+      array(5) {
+        ["key"]=>
+        array(5) {
+          ["type"]=>
+          string(4) "char"
+          ["value"]=>
+          string(3) "key"
+          ["file"]=>
+          string(11) "(eval code)"
+          ["line"]=>
+          int(2)
+          ["char"]=>
+          int(13)
+        }
+        ["value"]=>
+        array(5) {
+          ["type"]=>
+          string(4) "char"
+          ["value"]=>
+          string(5) "value"
+          ["file"]=>
+          string(11) "(eval code)"
+          ["line"]=>
+          int(2)
+          ["char"]=>
+          int(21)
+        }
+        ["file"]=>
+        string(11) "(eval code)"
+        ["line"]=>
+        int(2)
+        ["char"]=>
+        int(21)
+      }
+      [1]=>
+      array(4) {
+        ["value"]=>
+        array(5) {
+          ["type"]=>
+          string(4) "char"
+          ["value"]=>
+          string(7) "another"
+          ["file"]=>
+          string(11) "(eval code)"
+          ["line"]=>
+          int(2)
+          ["char"]=>
+          int(31)
+        }
+        ["file"]=>
+        string(11) "(eval code)"
+        ["line"]=>
+        int(2)
+        ["char"]=>
+        int(31)
+      }
+      [2]=>
+      array(4) {
+        ["value"]=>
+        array(5) {
+          ["type"]=>
+          string(4) "char"
+          ["value"]=>
+          string(3) "val"
+          ["file"]=>
+          string(11) "(eval code)"
+          ["line"]=>
+          int(2)
+          ["char"]=>
+          int(37)
+        }
+        ["file"]=>
+        string(11) "(eval code)"
+        ["line"]=>
+        int(2)
+        ["char"]=>
+        int(37)
+      }
+    }
+    ["file"]=>
+    string(11) "(eval code)"
+    ["line"]=>
+    int(2)
+    ["char"]=>
+    int(38)
+  }
+  ["file"]=>
+  string(11) "(eval code)"
+  ["line"]=>
+  int(3)
+  ["char"]=>
+  int(1)
+}