Changeset 662 for trunk/processor/struct.m4

Timestamp:

2009-08-03T10:15:53+02:00 (4 years ago)

Author:

moo

Message:

back patch __FILE and __DIR on cache restore

File:

• trunk/processor/struct.m4 (modified) (4 diffs)

trunk/processor/struct.m4

@@ -165 +165 @@
 ')
 dnl }}}
-dnl {{{ STRUCT_ARRAY_I(1:count, 2:type, 3:elm, 4:name=type)
-define(`STRUCT_ARRAY_I', `
-pushdef(`i', `ii')
-STRUCT_ARRAY(`$1', `$2', `$3', `$4')
-popdef(`i')
-')
-dnl }}}
-dnl {{{ STRUCT_ARRAY(1:count, 2:type, 3:elm, 4:name=type)
+dnl {{{ STRUCT_ARRAY(1:count, 2:type, 3:elm, 4:name=type, 5:loopcounter)
 define(`STRUCT_ARRAY', `
     if (src->$3) {
+        ifelse(
+            `$5', `', `int i; pushdef(`LOOPCOUNTER', `i')',
+            `', `', `pushdef(`LOOPCOUNTER', `$5')')
         pushdefFUNC_NAME(`$2', `$4')
         IFDASM(`
@@ -180 +176 @@
             ALLOC_INIT_ZVAL(arr);
             array_init(arr);
-            for (i = 0; i < src->$1; i ++) {
+            for (LOOPCOUNTER = 0; LOOPCOUNTER < src->$1; LOOPCOUNTER ++) {
                 zval *zv;
 
                 ALLOC_INIT_ZVAL(zv);
                 array_init(zv);
-                FUNC_NAME (zv, &(src->$3[i]) TSRMLS_CC);
+                FUNC_NAME (zv, &(src->$3[LOOPCOUNTER]) TSRMLS_CC);
                 add_next_index_zval(arr, zv);
             }
@@ -192 +188 @@
             ALLOC(`dst->$3', `$2', `src->$1')
             ifdef(`AFTER_ALLOC', AFTER_ALLOC)
-            for (i = 0; i < src->$1; i ++) {
+            for (LOOPCOUNTER = 0; LOOPCOUNTER < src->$1; LOOPCOUNTER ++) {
                 DISABLECHECK(`
-                    ifdef(`BEFORE_LOOP', `BEFORE_LOOP')
-                    STRUCT(`$2', `$3[i]', `$4')
+                    STRUCT(`$2', `$3[LOOPCOUNTER]', `$4')
                 ')
             }
@@ -201 +196 @@
         DONE(`$3')
         popdef(`FUNC_NAME')
+        popdef(`LOOPCOUNTER')
     }
     else {