Ignore:
Timestamp:
2012-03-23T17:17:34+01:00 (2 years ago)
Author:
moo
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/processor.m4

    r830 r832  
    637637#endif 
    638638    IFCOPY(` 
     639#ifdef ZEND_ENGINE_2_4 
    639640        pushdef(`UNION_znode_op_literal', ` 
    640             if (dst->$1_type == IS_CONST) { 
    641                 IFSTORE(` 
    642                     dst->$1.constant = src->$1.literal - processor->active_op_array_src->literals; 
    643                     dst->$1.literal = &processor->active_op_array_dst->literals[dst->$1.constant]; 
    644                 ') 
     641            if (src->$1_type == IS_CONST) { 
     642                dst->$1.constant = src->$1.literal - processor->active_op_array_src->literals; 
     643                dst->$1.literal = &processor->active_op_array_dst->literals[dst->$1.constant]; 
    645644            } 
    646645        ') 
    647646        UNION_znode_op_literal(op1) 
    648647        UNION_znode_op_literal(op2) 
     648#endif 
    649649        popdef(`UNION_znode_op_literal') 
    650650        switch (src->opcode) { 
     
    925925#endif 
    926926    } while (0); 
    927     IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, !shallow_copy, op_array_info TSRMLS_CC);') 
     927    IFRESTORE(`xc_fix_op_array_info(processor->entry_src, processor->php_src, dst, shallow_copy, op_array_info TSRMLS_CC);') 
    928928 
    929929#ifdef ZEND_ENGINE_2 
     
    991991dnl }}} 
    992992#endif 
     993DEF_STRUCT_P_FUNC(`xc_op_array_info_detail_t', , `dnl {{{ 
     994    DISPATCH(zend_uint, index) 
     995    DISPATCH(zend_uint, info) 
     996') 
     997dnl }}} 
    993998DEF_STRUCT_P_FUNC(`xc_op_array_info_t', , `dnl {{{ 
    994999#ifdef ZEND_ENGINE_2_4 
    9951000    DISPATCH(zend_uint, literalinfo_cnt) 
    996     DISPATCH_ARRAY(literalinfo_cnt, int, literalinfos) 
     1001    STRUCT_ARRAY(literalinfo_cnt, xc_op_array_info_detail_t, literalinfos) 
    9971002#else 
    9981003    DISPATCH(zend_uint, oplineinfo_cnt) 
    999     DISPATCH_ARRAY(oplineinfo_cnt, int, oplineinfos) 
     1004    STRUCT_ARRAY(oplineinfo_cnt, xc_op_array_info_detail_t, oplineinfos) 
    10001005#endif 
    10011006') 
Note: See TracChangeset for help on using the changeset viewer.