#118 - Add support for yield statement

Author: Jeckerson

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;

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);

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 '@'

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;

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;
 }
@@ -1536,6 +1540,21 @@ 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);