summaryrefslogtreecommitdiff
path: root/Zend/zend_compile.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2012-05-19 18:49:27 +0200
committerNikita Popov <nikic@php.net>2012-05-19 18:49:27 +0200
commitfd2a109f86d18b93d29153c2ddfa605651c7df05 (patch)
treefc605300bc557a5ff64a7f4ea253b5343450989e /Zend/zend_compile.c
parent9b51a3b96d89dc10d4ea65ceacaad22fa3420ea7 (diff)
downloadphp-git-fd2a109f86d18b93d29153c2ddfa605651c7df05.tar.gz
Add error if yield is used outside a generator
The yield statement can only be used in generator functions, which are marked with an asterix.
Diffstat (limited to 'Zend/zend_compile.c')
-rw-r--r--Zend/zend_compile.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 0d3ea109bf..d2b3536788 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2660,7 +2660,11 @@ void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC) /* {{{ */
void zend_do_yield(znode *expr TSRMLS_DC) /* {{{ */
{
- /* do nothing for now */
+ if ((CG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) == 0) {
+ zend_error(E_COMPILE_ERROR, "The \"yield\" statement can only be used inside a generator function");
+ }
+
+ /* do nothing for now */
}
/* }}} */