summaryrefslogtreecommitdiff
path: root/Zend/zend_language_scanner.l
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2015-04-14 17:58:58 +0200
committerBob Weinand <bobwei9@hotmail.com>2015-04-14 17:58:58 +0200
commitf3e124d58dc4627eb89625a7c264cb009130f725 (patch)
treec256b36decc201ef6eb780b4ff80f5a97c7b5b42 /Zend/zend_language_scanner.l
parent4f07330e798a4e7b12bcc1811c3c71d17b71f22c (diff)
parentb4a142ab974747be2fd03d055b30c63286a687fd (diff)
downloadphp-git-f3e124d58dc4627eb89625a7c264cb009130f725.tar.gz
Merge branch 'coroutineDelegation' of https://github.com/bwoebi/php-src
Diffstat (limited to 'Zend/zend_language_scanner.l')
-rw-r--r--Zend/zend_language_scanner.l4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 5e46d5142a..205eef1b3a 100644
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -1116,6 +1116,10 @@ NEWLINE ("\r"|"\n"|"\r\n")
return T_RETURN;
}
+<ST_IN_SCRIPTING>"yield"{WHITESPACE}"from" {
+ return T_YIELD_FROM;
+}
+
<ST_IN_SCRIPTING>"yield" {
return T_YIELD;
}