Changeset 1492 in svn for trunk

Timestamp:

2014-05-28T16:24:54Z (4 years ago)

Author:

Xuefer

Message:

disassembler: fix support for assoc/next

Location:

trunk/processor

Files:

• main.m4 (modified) (1 diff)
• process.m4 (modified) (1 diff)

trunk/processor/main.m4

@@ -165 +165 @@
 dnl }}}
 dnl {{{ SETNULL_EX
-define(`SETNULL_EX', `IFCOPY(`$1 = NULL;')')
+define(`SETNULL_EX', `
+    IFDASM(`
+        ifelse(`$2', `[]', `
+            add_next_index_null(DST());
+        ', `
+            add_assoc_null_ex(DST(), XCACHE_STRS("ifelse(`$2', `', `$1', `$2')"));
+        ')
+    ')
+    IFCOPY(`$1 = NULL;')
+')
 define(`SETNULL', `SETNULL_EX(`DST(`$1')')DONE(`$1')')
 dnl }}}
 dnl {{{ COPYNULL_EX(1:dst, 2:elm-name)
 define(`COPYNULL_EX', `
-    IFDASM(`add_assoc_null_ex(DST(), XCACHE_STRS("$2"));')
+    IFDASM(`
+        ifelse(`$2', `[]', `
+            add_next_index_null(DST());
+        ', `
+            add_assoc_null_ex(DST(), XCACHE_STRS("ifelse(`$2', `', `$1', `$2')"));
+        ')
+    ')
     IFNOTMEMCPY(`IFCOPY(`$1 = NULL;')')
     assert(patsubst($1, DST(), SRC()) == NULL);

trunk/processor/process.m4

@@ -94 +94 @@
                 pushdef(`dst', `arr')
                 pushdef(`SRC', `ifelse(`$4', `', `', `($2)')' defn(`SRC') `[LOOPCOUNTER]')
-                popdef(`add_assoc_bool_ex', `add_next_index_bool($1, $3)')
-                popdef(`add_assoc_string_ex', `add_next_index_string($1, $3)')
-                popdef(`add_assoc_long_ex', `add_next_index_long($1, $3)')
-                popdef(`add_assoc_zval_ex', `add_next_index_zval($1, $3)')
+                pushdef(`add_assoc_bool_ex', `add_next_index_bool($1, $3)')
+                pushdef(`add_assoc_string_ex', `add_next_index_string($1, $3)')
+                pushdef(`add_assoc_long_ex', `add_next_index_long($1, $3)')
+                pushdef(`add_assoc_zval_ex', `add_next_index_zval($1, $3)')
                 DISABLECHECK(`
                     PROCESS(`$2', `$3')