Changeset 491 in svn


Ignore:
Timestamp:
2007-12-29T03:44:16Z (8 years ago)
Author:
Xuefer
Message:

PHP_5_3: support for new zvalue_value.type

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/const_string.c

    r485 r491  
    4848    /* 8 */ "IS_CONSTANT",
    4949    /* 9 */ "IS_CONSTANT_ARRAY",
    50     /* 10 */ "IS_UNICODE",
    51 #if 0
    52     /* 11 */ "",
    53     /* 12 */ "",
    54     /* 13 */ "",
    55     /* 14 */ "",
    56     /* 15 */ "", "", "", "", "",
    57 
    58 /* IS_CONSTANT_INDEX */
    59     /* 20 */ "CIDX IS_NULL",
    60     /* 21 */ "CIDX IS_LONG",
    61     /* 22 */ "CIDX IS_DOUBLE",
    62     /* 23 */ "CIDX IS_BOOL",
    63     /* 24 */ "CIDX IS_ARRAY",
    64     /* 25 */ "CIDX IS_OBJECT",
    65     /* 26 */ "CIDX IS_STRING",
    66     /* 27 */ "CIDX IS_RESOURCE",
    67     /* 28 */ "CIDX IS_CONSTANT",
    68     /* 29 */ "CIDX IS_CONSTANT_ARRAY"
    69     /* 20 */ "CIDX IS_UNICODE",
    70 #endif
     50    /* 10 */ "IS_UNICODE"
    7151};
    7252
     
    7858const char *xc_get_data_type(zend_uchar data_type)
    7959{
    80 #if 0
    81     if (data_type & IS_CONSTANT_INDEX) {
    82         data_type = (data_type & ~IS_CONSTANT_INDEX) + 20;
    83     }
    84 #endif
    85     data_type &= ~IS_CONSTANT_INDEX;
    86     return data_type_names[data_type];
     60    return data_type_names[(data_type & IS_CONSTANT_TYPE_MASK)];
    8761}
    8862/* }}} */
  • trunk/processor/processor.m4

    r487 r491  
    9696dnl {{{ zvalue_value
    9797        DISABLECHECK(`
    98         switch (src->type & ~IS_CONSTANT_INDEX) {
     98        switch ((Z_TYPE_P(src) & IS_CONSTANT_TYPE_MASK)) {
    9999            case IS_LONG:
    100100            case IS_RESOURCE:
  • trunk/xcache.h

    r485 r491  
    5555#ifndef Z_SET_REFCOUNT
    5656#   define Z_SET_REFCOUNT(z, rc) (z).refcount = rc;
     57#endif
     58#ifndef IS_CONSTANT_TYPE_MASK
     59#   define IS_CONSTANT_TYPE_MASK 0xf
    5760#endif
    5861
Note: See TracChangeset for help on using the changeset viewer.