cvs: ZendEngine2 / zend_compile.c zend_globals.h

andi Wed Jul 2 12:52:07 2003 EDT Modified files: /ZendEngine2 zend_compile.c zend_globals.h Log: - Nuke CG(in_clone_method) Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.431 ZendEngine2/zend_compile.c:1.432 --- ZendEngine2/zend_compile.c:1.431 Mon Jun 30 16:24:26 2003 +++ ZendEngine2/zend_compile.c Wed Jul 2 12:52:07 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.c,v 1.431 2003/06/30 20:24:26 sterling Exp $ */ +/* $Id: zend_compile.c,v 1.432 2003/07/02 16:52:07 andi Exp $ */ #include "zend_language_parser.h" #include "zend.h" @@ -89,7 +89,6 @@ CG(start_lineno) = 0; init_compiler_declarables(TSRMLS_C); CG(throw_list) = NULL; - CG(in_clone_method) = 0; zend_hash_apply(CG(auto_globals), (apply_func_t) zend_auto_global_arm TSRMLS_CC); } @@ -1048,7 +1047,6 @@ CG(active_class_entry)->destructor = (zend_function *) CG(active_op_array); } else if ((function_name->u.constant.value.str.len == sizeof(ZEND_CLONE_FUNC_NAME)-1) && (!memcmp(function_name->u.constant.value.str.val, ZEND_CLONE_FUNC_NAME, sizeof(ZEND_CLONE_FUNC_NAME)))) { CG(active_class_entry)->clone = (zend_function *) CG(active_op_array); - CG(in_clone_method) = 1; } else if ((function_name->u.constant.value.str.len == sizeof(ZEND_CALL_FUNC_NAME)-1) && (!memcmp(function_name->u.constant.value.str.val, ZEND_CALL_FUNC_NAME, sizeof(ZEND_CALL_FUNC_NAME)))) { CG(active_class_entry)->__call = (zend_function *) CG(active_op_array); } else if ((function_name->u.constant.value.str.len == sizeof(ZEND_GET_FUNC_NAME)-1) && (!memcmp(function_name->u.constant.value.str.val, ZEND_GET_FUNC_NAME, sizeof(ZEND_GET_FUNC_NAME)))) { @@ -1116,8 +1114,6 @@ zend_stack_del_top(&CG(foreach_copy_stack)); CG(throw_list) = function_token->throw_list; - - CG(in_clone_method) = 0; } Index: ZendEngine2/zend_globals.h diff -u ZendEngine2/zend_globals.h:1.125 ZendEngine2/zend_globals.h:1.126 --- ZendEngine2/zend_globals.h:1.125 Tue Jun 10 16:03:25 2003 +++ ZendEngine2/zend_globals.h Wed Jul 2 12:52:07 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_globals.h,v 1.125 2003/06/10 20:03:25 imajes Exp $ */ +/* $Id: zend_globals.h,v 1.126 2003/07/02 16:52:07 andi Exp $ */ #ifndef ZEND_GLOBALS_H #define ZEND_GLOBALS_H @@ -119,7 +119,6 @@ int interactive; zend_uint start_lineno; - zend_bool in_clone_method; zend_bool increment_lineno; zend_llist import_commands;