Ignore:
Timestamp:
2011-04-09T13:05:07+02:00 (4 years ago)
Author:
moo
Message:

PHP_6: prepared in literal way for FILE DIR fix up

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/processor.m4

    r716 r721  
    8585#endif
    8686    } while(0);
    87     return;
    8887    ', `
    8988        dnl IFDASM else
     
    323322#endif
    324323
     324#ifdef ZEND_ENGINE_2
     325    STRUCT(HashTable, properties_info, HashTable_zend_property_info)
     326#endif
     327
    325328#ifdef ZEND_ENGINE_2_4
    326329    DISPATCH(int, default_properties_count)
     
    334337    DONE(builtin_functions)
    335338    STRUCT(HashTable, default_properties, HashTable_zval_ptr)
    336 #   ifdef ZEND_ENGINE_2
    337     STRUCT(HashTable, properties_info, HashTable_zend_property_info)
    338 #       ifdef ZEND_ENGINE_2_1
     339#   ifdef ZEND_ENGINE_2_1
    339340    STRUCT(HashTable, default_static_members, HashTable_zval_ptr)
    340341    IFCOPY(`dst->static_members = &dst->default_static_members;')
    341342    DONE(static_members)
    342 #       else
     343#   elif defined(ZEND_ENGINE_2)
    343344    STRUCT_P(HashTable, static_members, HashTable_zval_ptr)
    344 #       endif
    345345#   endif
    346346#endif /* ZEND_ENGINE_2_4 */
     
    486486undefine(`UNION_znode_op')
    487487define(`UNION_znode_op', `dnl {{{
    488     assert(src->$1_type == IS_CONST ||
    489         src->$1_type == IS_VAR ||
    490         src->$1_type == IS_CV ||
    491         src->$1_type == IS_TMP_VAR ||
    492         src->$1_type == IS_UNUSED);
     488    switch ((src->$1_type & ~EXT_TYPE_UNUSED)) {
     489    case IS_CONST:
     490    case IS_VAR:
     491    case IS_CV:
     492    case IS_TMP_VAR:
     493    case IS_UNUSED:
     494        break;
     495
     496    default:
     497        assert(0);
     498    }
     499
    493500    dnl dirty dispatch
    494501    DISABLECHECK(`
    495     switch (src->$1_type) {
     502    switch ((src->$1_type & ~EXT_TYPE_UNUSED)) {
    496503        case IS_CONST:
    497504            dnl TODO: fix me, use literals
     
    659666#endif
    660667        IFRESTORE(`dst->filename = processor->entry_src->filepath;')
     668#ifndef ZEND_ENGINE_2_4
    661669        if (op_array_info->oplineinfo_cnt) {
    662670            gc_opcodes = 1;
    663671            COPY_N_EX(last, zend_op, opcodes)
    664672        }
     673#endif
    665674        if (gc_arg_info || gc_opcodes) {
    666675            xc_gc_op_array_t gc_op_array;
     
    889898#endif
    890899DEF_STRUCT_P_FUNC(`xc_op_array_info_t', , `dnl {{{
     900#ifdef ZEND_ENGINE_2_4
     901    DISPATCH(zend_uint, literalinfo_cnt)
     902    DISPATCH_ARRAY(literalinfo_cnt, int, literalinfos)
     903#else
    891904    DISPATCH(zend_uint, oplineinfo_cnt)
    892905    DISPATCH_ARRAY(oplineinfo_cnt, int, oplineinfos)
     906#endif
    893907')
    894908dnl }}}
Note: See TracChangeset for help on using the changeset viewer.