Changeset 103 for trunk/processor/processor.m4

Timestamp:

2006-08-27T07:09:02+02:00 (7 years ago)

Author:

moo

Message:

PHP_6: builds again with php6. update UChar/void ptr to zstr.

File:

• trunk/processor/processor.m4 (modified) (16 diffs)

trunk/processor/processor.m4

@@ -19 +19 @@
 DEF_STRUCT_P_FUNC(`zend_compiled_variable', , `
     DISPATCH(int, name_len)
-    PROC_USTRING_L(, name, name_len)
+    PROC_ZSTRING_L(, name, name_len)
     DISPATCH(ulong, hash_value)
 ')
@@ -115 +115 @@
             case IS_UNICODE:
 proc_unicode:
-                DISPATCH(int32_t, value.ustr.len)
-                PROC_USTRING_L(1, value.ustr.val, value.ustr.len)
+                DISPATCH(int32_t, value.uni.len)
+                PROC_ZSTRING_L(1, value.uni.val, value.uni.len)
                 break;
 #endif
@@ -200 +200 @@
 DEF_STRUCT_P_FUNC(`zend_arg_info', , `
     DISPATCH(zend_uint, name_len)
-    PROC_USTRING_L(, name, name_len)
+    PROC_ZSTRING_L(, name, name_len)
     DISPATCH(zend_uint, class_name_len)
-    PROC_USTRING_L(, class_name, class_name_len)
+    PROC_ZSTRING_L(, class_name, class_name_len)
     DISPATCH(zend_bool, array_type_hint)
     DISPATCH(zend_bool, allow_null)
@@ -216 +216 @@
     DISPATCH(int, flags)
     DISPATCH(uint, name_len)
-    PROC_STRING_L(name, name_len)
+    PROC_ZSTRING_L(, name, name_len)
     zstr name;
     DISPATCH(int, module_number)
@@ -248 +248 @@
     DISPATCH(zend_uint, flags)
     DISPATCH(int, name_length)
-    PROC_USTRING_L(, name, name_length)
+    PROC_ZSTRING_L(, name, name_length)
     DISPATCH(ulong, h)
 #ifdef ZEND_ENGINE_2_1
     DISPATCH(int, doc_comment_len)
-    PROC_USTRING_L(, doc_comment, doc_comment_len)
+    PROC_STRING_L(doc_comment, doc_comment_len)
 #endif
     dnl isnt in php6 yet
@@ -268 +268 @@
     DISPATCH(char, type)
     DISPATCH(zend_uint, name_length)
-    PROC_USTRING_L(, name, name_length)
+    PROC_ZSTRING_L(, name, name_length)
     IFRESTORE(`
 #ifndef ZEND_ENGINE_2
@@ -344 +344 @@
 #ifdef ZEND_ENGINE_2_1
     DISPATCH(zend_uint, doc_comment_len)
-    PROC_USTRING_L(, doc_comment, doc_comment_len)
+    PROC_STRING_L(doc_comment, doc_comment_len)
 #endif
     /* # NOT DONE */
@@ -370 +370 @@
 #endif
     COPY(__call)
-#ifdef IS_UNICODE
-    SETNULL(u_twin)
-#endif
     /* # NOT DONE */
     COPY(module)
@@ -498 +495 @@
     /* Common elements */
     DISPATCH(zend_uchar, type)
-    PROC_USTRING(, function_name)
+    PROC_ZSTRING(, function_name)
 #ifdef ZEND_ENGINE_2
     IFRESTORE(`
@@ -517 +514 @@
                  && zend_u_hash_find(&(processor->active_class_entry_dst->parent->function_table),
                         UG(unicode) ? IS_UNICODE : IS_STRING,
-                        src->function_name, strlen(src->function_name) + 1,
+                        src->function_name, xc_zstrlen(UG(unicode), src->function_name) + 1,
                         (void **) &parent) == SUCCESS) {
                     /* see do_inherit_method_check() */
@@ -574 +571 @@
     /* END of common elements */
 #ifdef IS_UNICODE
-    SETNULL(u_twin)
+    dnl SETNULL(u_twin)
 #endif
 
@@ -632 +629 @@
     DISPATCH(zend_uint, line_end)
     DISPATCH(int, doc_comment_len)
-    PROC_USTRING_L(, doc_comment, doc_comment_len)
+    PROC_STRING_L(doc_comment, doc_comment_len)
 #endif
 
@@ -651 +648 @@
 #endif
     IFRESTORE(`COPY(key)', `
-        PROC_USTRING_N(type, key, key_size)
+        PROC_ZSTRING_N(type, key, key_size)
     ')
     STRUCT(zend_constant, constant)
@@ -663 +660 @@
 #endif
     IFRESTORE(`COPY(key)', `
-        PROC_USTRING_N(type, key, key_size)
+        PROC_ZSTRING_N(type, key, key_size)
     ')
     STRUCT(zend_function, func)
@@ -674 +671 @@
 #endif
     IFRESTORE(`COPY(key)', `
-        PROC_USTRING_N(type, key, key_size)
+        PROC_ZSTRING_N(type, key, key_size)
     ')
 #ifdef ZEND_ENGINE_2
@@ -765 +762 @@
         DISPATCH(int, name.str.len)
 #endif
-        IFRESTORE(`COPY(name.str.val)', `PROC_USTRING_L(name_type, name.str.val, name.str.len)')
+        IFRESTORE(`COPY(name.str.val)', `
+#ifdef IS_UNICODE
+            PROC_ZSTRING_L(name_type, name.uni.val, name.uni.len)
+#else
+            PROC_STRING_L(name.str.val, name.str.len)
+#endif
+        ')
     ')
     DONE(name)