com php-src: Handle __halt_compiler(): Zend/tests /bug60099.phpt Zend/zend_compile.c Zend/zen d_compile.h Zend/zend_language_parser.y
| From: | Nikita Popov | Date: | Tue, 22 Jul 2014 13:50:23 +0000 |
| Subject: | com php-src: Handle __halt_compiler(): Zend/tests /bug60099.phpt Zend/zend_compile.c Zend/zen d_compile.h Zend/zend_language_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80952@lists.php.net to get a copy of this message | ||
Commit: 2653b8b5dcc12ffeb99372a4ea9748f2a83bdf1e
Author: Nikita Popov <nikic@php.net> Tue, 22 Jul 2014 15:50:23 +0200
Parents: 3becdb3376b5ce171383c164a98a89ce36d20126
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2653b8b5dcc12ffeb99372a4ea9748f2a83bdf1e
Log:
Handle __halt_compiler()
Changed paths:
M Zend/tests/bug60099.phpt
M Zend/zend_compile.c
M Zend/zend_compile.h
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/tests/bug60099.phpt b/Zend/tests/bug60099.phpt
index 13e2f54..8cca344 100644
--- a/Zend/tests/bug60099.phpt
+++ b/Zend/tests/bug60099.phpt
@@ -7,4 +7,4 @@ namespace foo {
?>
--EXPECTF--
-Fatal error: __HALT_COMPILER() can only be used from the outermost scope in %s on line %d
+Parse error: syntax error, unexpected end of file in %s on line %d
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 381580c..436e2e9 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -558,6 +558,10 @@ void zend_discard_doc_comment(TSRMLS_D) {
}
}
+void zend_stop_lexing(TSRMLS_D) {
+ LANG_SCNG(yy_cursor) = LANG_SCNG(yy_limit);
+}
+
static void zend_do_op_data(zend_op *data_op, znode *value TSRMLS_DC) /* {{{ */
{
data_op->opcode = ZEND_OP_DATA;
@@ -7292,7 +7296,8 @@ void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC) {
}
zend_compile_stmt(ast TSRMLS_CC);
- if (ast->kind != ZEND_AST_NAMESPACE) {
+
+ if (ast->kind != ZEND_AST_NAMESPACE && ast->kind != ZEND_AST_HALT_COMPILER) {
zend_verify_namespace(TSRMLS_C);
}
if (ast->kind == ZEND_AST_FUNC_DECL || ast->kind == ZEND_AST_CLASS) {
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 9ee1970..aa9a85b 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -475,6 +475,7 @@ ZEND_API binary_op_type get_binary_op(int opcode);
ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC);
void zend_discard_doc_comment(TSRMLS_D);
+void zend_stop_lexing(TSRMLS_D);
/* parser-driven code generators */
void zend_do_free(znode *op1 TSRMLS_DC);
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index c0d5062..070b12f 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -251,7 +251,7 @@ top_statement:
{ zval offset_zv; ZVAL_LONG(&offset_zv, zend_get_scanned_file_offset(TSRMLS_C));
$$.u.ast = zend_ast_create_unary(ZEND_AST_HALT_COMPILER,
zend_ast_create_zval(&offset_zv));
- /*YYACCEPT;*/ }
+ zend_stop_lexing(TSRMLS_C); }
| T_NAMESPACE namespace_name ';'
{ $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL);
zend_discard_doc_comment(TSRMLS_C); }