Changeset 504 for trunk/processor/string.m4

Timestamp:

2008-01-05T04:42:14+01:00 (5 years ago)

Author:

moo

Message:

PHP_6: updated support

File:

• trunk/processor/string.m4 (modified) (2 diffs)

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')