com php-src: __autoload error: Zend/zend_compile. c
| From: | Nikita Popov | Date: | Sat, 19 Jul 2014 10:57:31 +0000 |
| Subject: | com php-src: __autoload error: Zend/zend_compile. c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80986@lists.php.net to get a copy of this message | ||
Commit: 74dba7e4dbac69531ed1fe896dcc20177247d02f
Author: Nikita Popov <nikic@php.net> Sat, 19 Jul 2014 12:57:31 +0200
Parents: 547331d24d8df741b6b18a2e437729b8fabc2c29
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=74dba7e4dbac69531ed1fe896dcc20177247d02f
Log:
__autoload error
Changed paths:
M Zend/zend_compile.c
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index a4bd629..ef0f878 100644
--- a/Zend/zend_compile..c
+++ b/Zend/zend_compile.c
@@ -6709,6 +6709,11 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) {
}
}
+ if (zend_str_equals(lcname, ZEND_AUTOLOAD_FUNC_NAME) && fn->params->children != 1)
{
+ zend_error_noreturn(E_COMPILE_ERROR, "%s() must take exactly 1 argument",
+ ZEND_AUTOLOAD_FUNC_NAME);
+ }
+
if (is_closure) {
opline = emit_op_tmp(result, ZEND_DECLARE_LAMBDA_FUNCTION, NULL, NULL TSRMLS_CC);
} else {
@@ -6775,8 +6780,6 @@ void zend_compile_func_decl(znode *result, zend_ast *ast TSRMLS_DC) {
pass_two(CG(active_op_array) TSRMLS_CC);
zend_release_labels(0 TSRMLS_CC);
- // TODO.AST __autoload
-
/* Pop the switch and foreach separators */
zend_stack_del_top(&CG(switch_cond_stack));
zend_stack_del_top(&CG(foreach_copy_stack));