Changeset 618 in svn for branches/1.3/const_string.c


Ignore:
Timestamp:
2009-07-05T08:34:06+02:00 (6 years ago)
Author:
Xuefer
Message:

merged r487,r491,r492,r495 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/const_string.c

    r617 r618  
    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/* }}} */
Note: See TracChangeset for help on using the changeset viewer.