Fixed bug #71724

10 years ago · 860dc17ab7
4 changed files with 238 additions and 216 deletions
--- a/1
+++ b/1
@ -18,6 +18,7 @@ PHP                                                                        NEWS
  . Fixed bug #71470 (Leaked 1 hashtable iterators). (Nikita)
  . Fixed bug #71575 (ISO C does not allow extra ‘;’ outside of a function).
    (asgrim)
+  . Fixed bug #71724 (yield from does not count EOLs). (Nikita)

 - Curl:
  . Fixed bug #71694 (Support constant CURLM_ADDED_ALREADY). (mpyw)
--- a/Zend/tests/bug71724.phpt
+++ b/Zend/tests/bug71724.phpt
@ -0,0 +1,19 @@
+--TEST--
+Bug #71724: yield from does not count EOLs
+--FILE--
+<?php
+
+function test()
+{
+    yield
+
+
+
+
+    from [__LINE__];
+}
+var_dump(test()->current());
+
+?>
+--EXPECT--
+int(10)
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@ -1152,6 +1152,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
 }

 <ST_IN_SCRIPTING>"yield"{WHITESPACE}"from" {
+	HANDLE_NEWLINES(yytext, yyleng);
 	RETURN_TOKEN(T_YIELD_FROM);
 }