Changeset 180


Ignore:
Timestamp:
2006-09-18T08:20:18+02:00 (8 years ago)
Author:
moo
Message:

merged [178]

Location:
branches/1.0/processor
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.0/processor/head.m4

    r97 r180  
    5050#define MAX_DUP_STR_LEN 256 
    5151dnl }}} 
    52 /* export: typedef struct _processor_t processor_t; :export {{{ */ 
    53 struct _processor_t { 
     52/* export: typedef struct _xc_processor_t xc_processor_t; :export {{{ */ 
     53struct _xc_processor_t { 
    5454    char *p; 
    5555    zend_uint size; 
     
    8484/* {{{ xc_calc_string_n */ 
    8585REDEF(`KIND', `calc') 
    86 static inline void xc_calc_string_n(processor_t *processor, zend_uchar type, char *str, long size IFASSERT(`, int relayline')) { 
     86static inline void xc_calc_string_n(xc_processor_t *processor, zend_uchar type, char *str, long size IFASSERT(`, int relayline')) { 
    8787    pushdef(`__LINE__', `relayline') 
    8888    int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size); 
     
    105105/* {{{ xc_store_string_n */ 
    106106REDEF(`KIND', `store') 
    107 static inline char *xc_store_string_n(processor_t *processor, zend_uchar type, char *str, long size IFASSERT(`, int relayline')) { 
     107static inline char *xc_store_string_n(xc_processor_t *processor, zend_uchar type, char *str, long size IFASSERT(`, int relayline')) { 
    108108    pushdef(`__LINE__', `relayline') 
    109109    int realsize = UNISW(size, (type == IS_UNICODE) ? UBYTES(size) : size); 
     
    130130 * return class_index + 1 
    131131 */ 
    132 static zend_uint xc_get_class_num(processor_t *processor, zend_class_entry *ce) { 
     132static zend_uint xc_get_class_num(xc_processor_t *processor, zend_class_entry *ce) { 
    133133    zend_uint i; 
    134134    const xc_entry_t *xce = processor->xce_src; 
     
    152152/* {{{ xc_get_class */ 
    153153#ifdef ZEND_ENGINE_2 
    154 static zend_class_entry *xc_get_class(processor_t *processor, zend_uint class_num) { 
     154static zend_class_entry *xc_get_class(xc_processor_t *processor, zend_uint class_num) { 
    155155    /* must be parent or currrent class */ 
    156156    assert(class_num <= processor->active_class_num); 
     
    161161#ifdef ZEND_ENGINE_2 
    162162/* fix method on store */ 
    163 static void xc_fix_method(processor_t *processor, zend_op_array *dst) /* {{{ */ 
     163static void xc_fix_method(xc_processor_t *processor, zend_op_array *dst) /* {{{ */ 
    164164{ 
    165165    zend_function *zf = (zend_function *) dst; 
     
    214214xc_entry_t *xc_processor_store_xc_entry_t(xc_entry_t *src TSRMLS_DC) { 
    215215    xc_entry_t *dst; 
    216     processor_t processor; 
     216    xc_processor_t processor; 
    217217 
    218218    memset(&processor, 0, sizeof(processor)); 
     
    288288/* export: xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC); :export {{{ */ 
    289289xc_entry_t *xc_processor_restore_xc_entry_t(xc_entry_t *dst, const xc_entry_t *src, zend_bool readonly_protection TSRMLS_DC) { 
    290     processor_t processor; 
     290    xc_processor_t processor; 
    291291 
    292292    memset(&processor, 0, sizeof(processor)); 
     
    299299/* export: zval *xc_processor_restore_zval(zval *dst, const zval *src TSRMLS_DC); :export {{{ */ 
    300300zval *xc_processor_restore_zval(zval *dst, const zval *src TSRMLS_DC) { 
    301     processor_t processor; 
     301    xc_processor_t processor; 
    302302 
    303303    memset(&processor, 0, sizeof(processor)); 
  • branches/1.0/processor/struct.m4

    r29 r180  
    99    FUNC_NAME`'( 
    1010        IFDPRINT( `const $1 * const src, int indent') 
    11         IFCALC(   `processor_t *processor, const $1 * const src') 
    12         IFSTORE(  `processor_t *processor, $1 *dst, const $1 * const src') 
    13         IFRESTORE(`processor_t *processor, $1 *dst, const $1 * const src') 
     11        IFCALC(   `xc_processor_t *processor, const $1 * const src') 
     12        IFSTORE(  `xc_processor_t *processor, $1 *dst, const $1 * const src') 
     13        IFRESTORE(`xc_processor_t *processor, $1 *dst, const $1 * const src') 
    1414        IFDASM(   `zval *dst, const $1 * const src') 
    1515        IFASM(    `$1 *dst, const $1 * const src') 
Note: See TracChangeset for help on using the changeset viewer.