- FN_IS_STATIC -> FN_STATIC

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 30c510bfa2c16a442ebce92457147372998059de..aea3399293cb9bc9ce6623d57b21558798ec30cb 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -1535,8 +1535,8 @@ static zend_bool do_inherit_method_check(zend_function *child, zend_function *pa
 
        /* 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));

diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index a84d70d115cc5f95f9ee69d8905bde1c1f81de1e..d712f5f965705f0ebd90302cc6dce00d7753fe4c 100644 (file)
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -88,7 +88,7 @@ typedef struct _zend_brk_cont_element {
 } zend_brk_cont_element;
 
 
-#define FN_IS_STATIC 0x01
+#define FN_STATIC 0x01
 
 #define FN_ABSTRACT  0x02
 

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index d918f8e5d7e2b8c3280270016a46b71eea70334b..e4570e9b36a6ff681e3dbc2b68c033de0c544d64 100644 (file)
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -2276,7 +2276,7 @@ int zend_init_method_call_handler(ZEND_OPCODE_HANDLER_ARGS)
                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 @@ int zend_init_static_method_call_handler(ZEND_OPCODE_HANDLER_ARGS)
 
        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))) {

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 43d878993dc620a3dfcb47bd51db8eb7ea93d6dc..45b2b78bc065205e0678120a5e0e1f0153d22906 100644 (file)
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -447,7 +447,7 @@ class_statement:
 ;
 
 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; }
 ;