Fixed inconsistent whitespace.

# Belongs to svn rev. 318793.

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index ec00feefc940d48d30377fa080b9858f2293ba99..421a849255219ddf2e5a1437cfd6a4781f493168 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3617,19 +3617,19 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args
                        /* if it is an abstract method, there is no collision */
                        if (other_trait_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
                                /* Make sure they are compatible */
-        if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
-          /* In case both are abstract, just check prototype, but need to do that in both directions */
-          if (   !zend_do_perform_implementation_check(fn, other_trait_fn TSRMLS_CC)
-              || !zend_do_perform_implementation_check(other_trait_fn, fn TSRMLS_CC)) {
-            zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s", //ZEND_FN_SCOPE_NAME(fn), fn->common.function_name, //::%s()
-              zend_get_function_declaration(fn TSRMLS_CC),
-              zend_get_function_declaration(other_trait_fn TSRMLS_CC));
-          }
-        }
-        else {
-          /* otherwise, do the full check */
-          do_inheritance_check_on_method(fn, other_trait_fn TSRMLS_CC);
-        }
+                               if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
+                                       /* In case both are abstract, just check prototype, but need to do that in both directions */
+                                       if (   !zend_do_perform_implementation_check(fn, other_trait_fn TSRMLS_CC)
+                                               || !zend_do_perform_implementation_check(other_trait_fn, fn TSRMLS_CC)) {
+                                               zend_error(E_COMPILE_ERROR, "Declaration of %s must be compatible with %s", //ZEND_FN_SCOPE_NAME(fn), fn->common.function_name, //::%s()
+                                                                                                       zend_get_function_declaration(fn TSRMLS_CC),
+                                                                                                       zend_get_function_declaration(other_trait_fn TSRMLS_CC));
+                                       }
+                               }
+                               else {
+                                       /* otherwise, do the full check */
+                                       do_inheritance_check_on_method(fn, other_trait_fn TSRMLS_CC);
+                               }
                                
                                /* we can savely free and remove it from other table */
                                zend_function_dtor(other_trait_fn);
@@ -3639,7 +3639,7 @@ static int zend_traits_merge_functions(zend_function *fn TSRMLS_DC, int num_args
                                /* if fn is an abstract method */
                                if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
                                        /* Make sure they are compatible.
-             Here, we already know other_trait_fn cannot be abstract, full check ok. */
+                                          Here, we already know other_trait_fn cannot be abstract, full check ok. */
                                        do_inheritance_check_on_method(other_trait_fn, fn TSRMLS_CC);
                                        
                                        /* just mark as solved, will be added if its own trait is processed */
@@ -3810,7 +3810,7 @@ static void zend_traits_duplicate_function(zend_function *fe, zend_class_entry *
        fe->op_array.try_catch_array = (zend_try_catch_element*)estrndup((char*)fe->op_array.try_catch_array, sizeof(zend_try_catch_element) * fe->op_array.last_try_catch);
 
        fe->op_array.brk_cont_array = (zend_brk_cont_element*)estrndup((char*)fe->op_array.brk_cont_array, sizeof(zend_brk_cont_element) * fe->op_array.last_brk_cont);
-  
+
 }
 /* }}} */
 
@@ -3856,7 +3856,7 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
        zend_function* existing_fn = NULL;
        zend_function fn_copy, *fn_copy_p;
        zend_function* prototype = NULL;  /* is used to determine the prototype according to the inheritance chain */
-  
+
        if (zend_hash_quick_find(&ce->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void**) &existing_fn) == FAILURE) {
                add = 1; /* not found */
        } else if (existing_fn->common.scope != ce) {
@@ -3869,7 +3869,7 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
                        prototype = parent_function; /* ->common.fn_flags |= ZEND_ACC_ABSTRACT; */
                        
                        /* we got that method in the parent class, and are going to override it,
-       except, if the trait is just asking to have an abstract method implemented. */
+                          except, if the trait is just asking to have an abstract method implemented. */
                        if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
                                /* then we clean up an skip this method */
                                zend_function_dtor(fn);
@@ -3881,14 +3881,14 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
                fn->common.prototype = prototype;
     
                if (prototype
-        && (prototype->common.fn_flags & ZEND_ACC_IMPLEMENTED_ABSTRACT
-            || prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
-          fn->common.fn_flags |= ZEND_ACC_IMPLEMENTED_ABSTRACT;
-        } else if (fn->common.fn_flags & ZEND_ACC_IMPLEMENTED_ABSTRACT) {
-          /* remove ZEND_ACC_IMPLEMENTED_ABSTRACT flag, think it shouldn't be copied to class */
-          fn->common.fn_flags = fn->common.fn_flags - ZEND_ACC_IMPLEMENTED_ABSTRACT;
-        }
-    
+                       && (prototype->common.fn_flags & ZEND_ACC_IMPLEMENTED_ABSTRACT
+                               || prototype->common.fn_flags & ZEND_ACC_ABSTRACT)) {
+                               fn->common.fn_flags |= ZEND_ACC_IMPLEMENTED_ABSTRACT;
+                       } else if (fn->common.fn_flags & ZEND_ACC_IMPLEMENTED_ABSTRACT) {
+                               /* remove ZEND_ACC_IMPLEMENTED_ABSTRACT flag, think it shouldn't be copied to class */
+                               fn->common.fn_flags = fn->common.fn_flags - ZEND_ACC_IMPLEMENTED_ABSTRACT;
+                       }
+
                /* check whether the trait method fullfills the inheritance requirements */
                if (prototype) {
                        do_inheritance_check_on_method(fn, prototype TSRMLS_CC);
@@ -3919,18 +3919,18 @@ static int zend_traits_merge_functions_to_class(zend_function *fn TSRMLS_DC, int
                }
                fn_copy = *fn;
                zend_traits_duplicate_function(&fn_copy, ce, estrdup(fn->common.function_name) TSRMLS_CC);
-    
+
                if (zend_hash_quick_update(&ce->function_table, hash_key->arKey, hash_key->nKeyLength, hash_key->h, &fn_copy, sizeof(zend_function), (void**)&fn_copy_p)==FAILURE) {
                        zend_error(E_COMPILE_ERROR, "Trait method %s has not been applied, because failure occured during updating class method table", hash_key->arKey);
                }
-    
+
                zend_add_magic_methods(ce, hash_key->arKey, hash_key->nKeyLength, fn_copy_p TSRMLS_CC);
-    
+
                zend_function_dtor(fn);
        } else {
                zend_function_dtor(fn);
        }
-  
+
        return ZEND_HASH_APPLY_REMOVE;
 }
 /* }}} */
@@ -3951,7 +3951,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int num_args,
        target_ce     = va_arg(args, zend_class_entry*);
        aliases       = va_arg(args, zend_trait_alias**);
        exclude_table = va_arg(args, HashTable*);
-  
+
        fnname_len = strlen(fn->common.function_name);
 
        /* apply aliases which are qualified with a class name, there should not be any ambiguity */
@@ -4186,8 +4186,8 @@ static void zend_do_traits_property_binding(zend_class_entry *ce TSRMLS_DC) /* {
        zend_bool prop_found;
        zend_bool not_compatible;
        zval* prop_value;
-  
-  
+
+
        /* In the following steps the properties are inserted into the property table
         * for that, a very strict approach is applied:
         * - check for compatibility, if not compatible with any property in class -> fatal
@@ -4291,7 +4291,7 @@ ZEND_API void zend_do_bind_traits(zend_class_entry *ce TSRMLS_DC) /* {{{ */
 
        /* verify that all abstract methods from traits have been implemented */
        zend_verify_abstract_class(ce TSRMLS_CC);
-  
+
        /* now everything should be fine and an added ZEND_ACC_IMPLICIT_ABSTRACT_CLASS should be removed */
        if (ce->ce_flags & ZEND_ACC_IMPLICIT_ABSTRACT_CLASS) {
                ce->ce_flags -= ZEND_ACC_IMPLICIT_ABSTRACT_CLASS;