mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.0'

Browse Source 
Conflicts:
	Zend/zend_language_scanner.c
This commit is contained in:
Nikita Popov 2016-03-06 21:39:20 +01:00
commit 35b34d7235
3 changed files with 237 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Zend/tests/bug71724.phpt Normal file
View File

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

433
Zend/zend_language_scanner.c
View File

File diff suppressed because it is too large Load Diff

1
Zend/zend_language_scanner.l
View File

@ -1128,6 +1128,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
}
<ST_IN_SCRIPTING>"yield"{WHITESPACE}"from" {
HANDLE_NEWLINES(yytext, yyleng);
RETURN_TOKEN(T_YIELD_FROM);
}