cvs: ZendEngine2 / zend_compile.c zend_compile.h zend_execute.c zend_language_parser.y

andi Sun Nov 24 15:32:50 2002 EDT Modified files: /ZendEngine2 zend_compile.c zend_compile.h zend_execute.c zend_language_parser.y Log: - FN_IS_STATIC -> FN_STATIC Index: ZendEngine2/zend_compile.c diff -u ZendEngine2/zend_compile.c:1.326 ZendEngine2/zend_compile.c:1.327 --- ZendEngine2/zend_compile.c:1.326 Sat Nov 23 15:46:39 2002 +++ ZendEngine2/zend_compile.c Sun Nov 24 15:32:49 2002 @@ -1535,8 +1535,8 @@ /* You cannot change from static to non static and vice versa. */ - if ((child_flags & FN_IS_STATIC) != (parent_flags & FN_IS_STATIC)) { - if (child->common.fn_flags & FN_IS_STATIC) { + if ((child_flags & FN_STATIC) != (parent_flags & FN_STATIC)) { + if (child->common.fn_flags & FN_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 { zend_error(E_COMPILE_ERROR, "Cannot make static method %s::%s() non static in class %s", FN_SCOPE_NAME(parent), child->common.function_name, FN_SCOPE_NAME(child)); Index: ZendEngine2/zend_compile.h diff -u ZendEngine2/zend_compile.h:1.196 ZendEngine2/zend_compile.h:1.197 --- ZendEngine2/zend_compile.h:1.196 Sat Nov 23 15:46:39 2002 +++ ZendEngine2/zend_compile.h Sun Nov 24 15:32:49 2002 @@ -88,7 +88,7 @@ } zend_brk_cont_element; -#define FN_IS_STATIC 0x01 +#define FN_STATIC 0x01 #define FN_ABSTRACT 0x02 Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.398 ZendEngine2/zend_execute.c:1.399 --- ZendEngine2/zend_execute.c:1.398 Sat Nov 23 15:44:12 2002 +++ ZendEngine2/zend_execute.c Sun Nov 24 15:32:49 2002 @@ -2276,7 +2276,7 @@ zend_error(E_ERROR, "Call to a member function %s() on a non-object", function_name_strval); } - if (EX(fbc)->common.fn_flags & FN_IS_STATIC) { + if (EX(fbc)->common.fn_flags & FN_STATIC) { EX(object) = NULL; } else { if (!PZVAL_IS_REF(EX(object))) { @@ -2346,7 +2346,7 @@ EX(fbc) = function; - if (function->common.fn_flags & FN_IS_STATIC) { + if (function->common.fn_flags & FN_STATIC) { EX(object) = NULL; } else { if ((EX(object) = EG(This))) { Index: ZendEngine2/zend_language_parser.y diff -u ZendEngine2/zend_language_parser.y:1.78 ZendEngine2/zend_language_parser.y:1.79 --- ZendEngine2/zend_language_parser.y:1.78 Sat Nov 23 15:44:12 2002 +++ ZendEngine2/zend_language_parser.y Sun Nov 24 15:32:49 2002 @@ -447,7 +447,7 @@ ; is_static: - T_STATIC { $$.u.constant.value.lval = FN_IS_STATIC; } + T_STATIC { $$.u.constant.value.lval = FN_STATIC; } | /* empty */ { $$.u.constant.value.lval = 0; } ;