Changeset 504 for trunk/processor

Timestamp:

01/05/2008 03:42:14 AM (12 months ago)

Author:

moo

Message:

PHP_6: updated support

Location:

trunk/processor

Files:

• hashtable.m4 (modified) (1 diff)
• main.m4 (modified) (1 diff)
• processor.m4 (modified) (2 diffs)
• string.m4 (modified) (2 diffs)

trunk/processor/hashtable.m4

@@ -60 +60 @@
                     }
                 }
-                add_u_assoc_zval_ex(dst, BUCKET_KEY_TYPE(b), buf, keysize, zv);
+                add_u_assoc_zval_ex(dst, BUCKET_KEY_TYPE(b), ZSTR(buf), keysize, zv);
             }
             ')

trunk/processor/main.m4

@@ -111 +111 @@
         IFSTORE(`$1 = (zend_class_entry *) xc_get_class_num(processor, $2);')
         IFRESTORE(`$1 = xc_get_class(processor, (zend_ulong) $2);')
-        IFDASM(`add_assoc_stringl_ex(dst, ZEND_STRS("$3"), $2->name, strlen($2->name), 1);')
+        IFDASM(`add_assoc_unicodel_ex(dst, ZEND_STRS("$3"), ZSTR_U($2->name), $2->name_length, 1);')
     }
     else {

trunk/processor/processor.m4

@@ -57 +57 @@
 DEF_STRUCT_P_FUNC(`zend_brk_cont_element', , `
 #ifdef ZEND_ENGINE_2_2
-#ifndef IS_UNICODE
     DISPATCH(int, start)
-#endif
 #endif
     DISPATCH(int, cont)
@@ -283 +281 @@
 #endif
     dnl isnt in php6 yet
-#if defined(ZEND_ENGINE_2_2) && !defined(IS_UNICODE)
+#if defined(ZEND_ENGINE_2_2)
     PROC_CLASS_ENTRY_P(ce)
 #endif

trunk/processor/string.m4

@@ -39 +39 @@
 
                 INIT_ZVAL(zv);
-                ZVAL_UNICODEL(&zv, (UChar *) ($2), $3 - 1, 1);
+                ZVAL_UNICODEL(&zv, ZSTR_U($2), $3 - 1, 1);
                 zend_make_printable_zval(&zv, &reszv, &usecopy);
                 fprintf(stderr, "string:%s:\t\"", "$1");
@@ -64 +64 @@
         FIXPOINTER_EX(`PTRTYPE', DSTPTR)
         IFDASM(`
-                ifelse(STRTYPE,zstr_uchar, `
-                    add_assoc_unicodel_ex(dst, ZEND_STRS("$4"), $2, $3-1, 1);
-                    ', ` dnl else
-                    add_assoc_stringl_ex(dst, ZEND_STRS("$4"), $2, $3-1, 1);')
+            ifelse(STRTYPE,zstr_uchar, `
+                add_assoc_unicodel_ex(dst, ZEND_STRS("$4"), ZSTR_U($2), $3-1, 1);
+                ', ` dnl else
+                ifelse(STRTYPE,zstr_char, `
+                    add_assoc_stringl_ex(dst, ZEND_STRS("$4"), ZSTR_S($2), $3-1, 1);
+                    ', `
+                    add_assoc_stringl_ex(dst, ZEND_STRS("$4"), $2, $3-1, 1);
                 ')
+            ')
+        ')
     }
     popdef(`DSTPTR')