Changeset a7ad7cb in git

Timestamp:

2012-03-22T18:18:05Z (8 years ago)

Author:

Xuefer <xuefer@…>

Branches:

3.0, 3.1, 3.2, master, trunk

Children:

5cafdce

Parents:

ade1c47

Message:

PHP_5_4: improve handling traits yet still need review. values of default_properties_table is nullable

git-svn-id: ​svn://svn.lighttpd.net/xcache/trunk@825 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Location:

processor

Files:

• head.m4 (modified) (2 diffs)
• processor.m4 (modified) (6 diffs)

processor/head.m4

@@ -29 +29 @@
 define(`SIZEOF_zval_ptr', `sizeof(zval_ptr)')
 define(`COUNTOF_zval_ptr', `1')
+define(`SIZEOF_zval_ptr_nullable', `sizeof(zval_ptr_nullable)')
+define(`COUNTOF_zval_ptr_nullable', `1')
 define(`SIZEOF_xc_entry_name_t', `sizeof(xc_entry_name_t)')
 define(`COUNTOF_xc_entry_name_t', `1')
@@ -49 +51 @@
 
 typedef zval *zval_ptr;
+typedef zval *zval_ptr_nullable;
 typedef zend_uchar zval_data_type;
 #ifdef IS_UNICODE

processor/processor.m4

@@ -3 +3 @@
 DECL_STRUCT_P_FUNC(`zval')
 DECL_STRUCT_P_FUNC(`zval_ptr')
+DECL_STRUCT_P_FUNC(`zval_ptr_nullable')
 DECL_STRUCT_P_FUNC(`zend_op_array')
 DECL_STRUCT_P_FUNC(`zend_class_entry')
@@ -65 +66 @@
 dnl }}}
 DEF_HASH_TABLE_FUNC(`HashTable_zval_ptr',           `zval_ptr')
+DEF_HASH_TABLE_FUNC(`HashTable_zval_ptr_nullable',  `zval_ptr_nullable')
 DEF_HASH_TABLE_FUNC(`HashTable_zend_function',      `zend_function')
 #ifdef ZEND_ENGINE_2
@@ -215 +217 @@
 ')
 dnl }}}
+DEF_STRUCT_P_FUNC(`zval_ptr_nullable', , `dnl {{{
+    if (src[0]) {
+        STRUCT_P_EX(zval_ptr, dst, src, `', `', ` ')
+    }
+    else {
+        IFCOPY(`COPYNULL_EX(src[0], src)')
+    }
+    DONE_SIZE(sizeof(zval_ptr_nullable))
+')
+dnl }}}
 dnl {{{ zend_arg_info
 #ifdef ZEND_ENGINE_2
@@ -328 +340 @@
 #ifdef ZEND_ENGINE_2_4
     DISPATCH(int, default_properties_count)
-    STRUCT_ARRAY(default_properties_count, zval_ptr, default_properties_table)
+    STRUCT_ARRAY(default_properties_count, zval_ptr_nullable, default_properties_table)
     DISPATCH(int, default_static_members_count)
-    STRUCT_ARRAY(default_static_members_count, zval_ptr, default_static_members_table)
+    STRUCT_ARRAY(default_static_members_count, zval_ptr_nullable, default_static_members_table)
     IFCOPY(`dst->static_members_table = dst->default_static_members_table;')
     DONE(static_members_table)
@@ -355 +367 @@
             CALLOC(dst->interfaces, zend_class_entry*, src->num_interfaces)
             DONE(`interfaces')
+        }
+        else {
+            COPYNULL(`interfaces')
+        }
 #   ifdef ZEND_ENGINE_2_4
+        if (src->num_traits) {
             CALLOC(dst->traits, zend_class_entry*, src->num_traits)
             DONE(`traits')
             DONE(`trait_aliases')
             DONE(`trait_precedences')
-#   endif
         }
         else {
-            COPYNULL(`interfaces')
-#   ifdef ZEND_ENGINE_2_4
             COPYNULL(`traits')
             COPYNULL(`trait_aliases')
             COPYNULL(`trait_precedences')
+        }
 #   endif
-        }
     ')
     IFDASM(`
@@ -386 +400 @@
             */
             DONE(`interfaces')
+        }
+        else {
+            COPYNULL(`interfaces')
+        }
 #   ifdef ZEND_ENGINE_2_4
+        if (src->num_traits) {
             DONE(`traits')
             DONE(`trait_aliases')
             DONE(`trait_precedences')
-#   endif
         }
         else {
-            COPYNULL(`interfaces')
-#   ifdef ZEND_ENGINE_2_4
             COPYNULL(`traits')
             COPYNULL(`trait_aliases')
             COPYNULL(`trait_precedences')
+        }
 #   endif
-        }
     ')
     IFRESTORE(`', `