cvs: ZendEngine2 / zend_compile.c zend_compile.h

andi Sat Nov 23 15:46:39 2002 EDT Modified files: /ZendEngine2 zend_compile.c zend_compile.h Log: - My personal cleanups Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.325 ZendEngine2/zend_compile.c:1.326 --- ZendEngine2/zend_compile.c:1.325 Sat Nov 23 15:44:12 2002 +++ ZendEngine2/zend_compile.c Sat Nov 23 15:46:39 2002 @@ -909,7 +909,7 @@ } } -void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, int fn_flags TSRMLS_DC) +void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, zend_uint fn_flags TSRMLS_DC) { zend_op_array op_array; char *name = function_name->u.constant.value.str.val; @@ -1530,12 +1530,12 @@ } static zend_bool do_inherit_method_check(zend_function *child, zend_function *parent) { - register zend_uint child_flags = child->common.fn_flags; - register zend_uint parent_flags = parent->common.fn_flags; + zend_uint child_flags = child->common.fn_flags; + zend_uint parent_flags = parent->common.fn_flags; /* You cannot change from static to non static and vice versa. */ - if ((child_flags&FN_IS_STATIC) != (parent_flags&FN_IS_STATIC)) { + if ((child_flags & FN_IS_STATIC) != (parent_flags & FN_IS_STATIC)) { if (child->common.fn_flags & FN_IS_STATIC) { zend_error(E_COMPILE_ERROR, "Cannot make non static method %s::%s() static in class %s", FN_SCOPE_NAME(parent), child->common.function_name, FN_SCOPE_NAME(child)); } else { Index: ZendEngine2/zend_compile.h diff -u ZendEngine2/zend_compile.h:1.195 ZendEngine2/zend_compile.h:1.196 --- ZendEngine2/zend_compile.h:1.195 Sat Nov 23 15:44:12 2002 +++ ZendEngine2/zend_compile.h Sat Nov 23 15:46:39 2002 @@ -88,9 +88,9 @@ } zend_brk_cont_element; -#define FN_IS_STATIC 0x00000001 +#define FN_IS_STATIC 0x01 -#define FN_ABSTRACT 0x00000002 +#define FN_ABSTRACT 0x02 struct _zend_op_array { zend_uchar type; /* MUST be the first element of this struct! */ @@ -98,7 +98,7 @@ zend_uchar *arg_types; /* MUST be the second element of this struct! */ char *function_name; /* MUST be the third element of this struct! */ zend_class_entry *scope; /* MUST be the fourth element of this struct! */ - int fn_flags; /* MUST be the fifth element of this struct! */ + zend_uint fn_flags; /* MUST be the fifth element of this struct! */ zend_uint *refcount; @@ -133,7 +133,7 @@ zend_uchar *arg_types; /* MUST be the second element of this struct! */ char *function_name; /* MUST be the third element of this struct! */ zend_class_entry *scope; /* MUST be the fourth element of this struct! */ - int fn_flags; /* MUST be the fifth element of this struct! */ + zend_uint fn_flags; /* MUST be the fifth element of this struct! */ void (*handler)(INTERNAL_FUNCTION_PARAMETERS); } zend_internal_function; @@ -148,7 +148,7 @@ zend_uchar *arg_types; char *function_name; zend_class_entry *scope; - int fn_flags; + zend_uint fn_flags; } common; zend_op_array op_array; @@ -295,7 +295,7 @@ void zend_do_add_string(znode *result, znode *op1, znode *op2 TSRMLS_DC); void zend_do_add_variable(znode *result, znode *op1, znode *op2 TSRMLS_DC); -void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, int fn_flags TSRMLS_DC); +void zend_do_begin_function_declaration(znode *function_token, znode *function_name, int is_method, int return_reference, zend_uint fn_flags TSRMLS_DC); void zend_do_end_function_declaration(znode *function_token TSRMLS_DC); void zend_do_receive_arg(zend_uchar op, znode *var, znode *offset, znode *initialization, zend_uchar pass_type TSRMLS_DC); int zend_do_begin_function_call(znode *function_name TSRMLS_DC);