Changeset 832 for trunk/processor/processor.m4

Timestamp:

2012-03-23T17:17:34+01:00 (14 months ago)

Author:

moo

Message:

fix DIR FILE handling in literal. path resolve is still in todo

File:

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

trunk/processor/processor.m4

@@ -637 +637 @@
 #endif
     IFCOPY(`
+#ifdef ZEND_ENGINE_2_4
         pushdef(`UNION_znode_op_literal', `
-            if (dst->$1_type == IS_CONST) {
-                IFSTORE(`
-                    dst->$1.constant = src->$1.literal - processor->active_op_array_src->literals;
-                    dst->$1.literal = &processor->active_op_array_dst->literals[dst->$1.constant];
-                ')
+            if (src->$1_type == IS_CONST) {
+                dst->$1.constant = src->$1.literal - processor->active_op_array_src->literals;
+                dst->$1.literal = &processor->active_op_array_dst->literals[dst->$1.constant];
             }
         ')
         UNION_znode_op_literal(op1)
         UNION_znode_op_literal(op2)
+#endif
         popdef(`UNION_znode_op_literal')
         switch (src->opcode) {
@@ -925 +925 @@
 #endif
     } while (0);
-    IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, !shallow_copy, op_array_info TSRMLS_CC);')
+    IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, shallow_copy, op_array_info TSRMLS_CC);')
 
 #ifdef ZEND_ENGINE_2
@@ -991 +991 @@
 dnl }}}
 #endif
+DEF_STRUCT_P_FUNC(`xc_op_array_info_detail_t', , `dnl {{{
+    DISPATCH(zend_uint, index)
+    DISPATCH(zend_uint, info)
+')
+dnl }}}
 DEF_STRUCT_P_FUNC(`xc_op_array_info_t', , `dnl {{{
 #ifdef ZEND_ENGINE_2_4
     DISPATCH(zend_uint, literalinfo_cnt)
-    DISPATCH_ARRAY(literalinfo_cnt, int, literalinfos)
+    STRUCT_ARRAY(literalinfo_cnt, xc_op_array_info_detail_t, literalinfos)
 #else
     DISPATCH(zend_uint, oplineinfo_cnt)
-    DISPATCH_ARRAY(oplineinfo_cnt, int, oplineinfos)
+    STRUCT_ARRAY(oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos)
 #endif
 ')