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.
renesugar · Jul 9, 2015 · a49ce7b · a49ce7b
1 parent fc5c7e6
commit a49ce7b
Show file tree

Hide file tree

Showing 7 changed files with 212 additions and 226 deletions.
diff --git 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: