diff options
| author | Nikita Popov <nikic@php.net> | 2015-07-09 22:59:31 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-07-09 23:02:21 +0200 |
| commit | a49ce7bb91bec02d6f26b3118404371df23242fe (patch) | |
| tree | a6b240dd25820ccd6f1b2109a19814f2bf34f488 /Zend/zend_compile.c | |
| parent | fc5c7e633b35f76df405471b119984fbf6354b41 (diff) | |
| download | php-git-a49ce7bb91bec02d6f26b3118404371df23242fe.tar.gz | |
Don't return T_ERROR from token_get_all()
This turned out to be rather inconvenient after all. Instead just
return the same output we did on PHP 5. If people want to have an
error, use TOKEN_PARSE.
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 4ae27e5a3f..d4b2767940 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1536,6 +1536,10 @@ int zendlex(zend_parser_stack_elem *elem) /* {{{ */ again: ZVAL_UNDEF(&zv); retval = lex_scan(&zv); + if (EG(exception)) { + return T_ERROR; + } + switch (retval) { case T_COMMENT: case T_DOC_COMMENT: |