mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

avoid using 'class' in exported functions - it annoys c++

Browse Source
This commit is contained in:
Stanislav Malyshev 2002-11-05 17:21:23 +00:00
parent 6d57337cda
commit 3a9eeea213
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zend/zend_compile.c
View File

@ -304,7 +304,7 @@ void fetch_simple_variable(znode *result, znode *varname, int bp TSRMLS_DC)
fetch_simple_variable_ex(result, varname, bp, ZEND_FETCH_W TSRMLS_CC);
}
void zend_do_fetch_static_member(znode *class TSRMLS_DC)
void zend_do_fetch_static_member(znode *class_znode TSRMLS_DC)
{
zend_llist *fetch_list_ptr;
zend_llist_element *le;
@ -314,7 +314,7 @@ void zend_do_fetch_static_member(znode *class TSRMLS_DC)
le = fetch_list_ptr->head;
opline_ptr = (zend_op *)le->data;
opline_ptr->op2 = *class;
opline_ptr->op2 = *class_znode;
opline_ptr->op2.u.EA.type = ZEND_FETCH_STATIC_MEMBER;
}
@ -2692,7 +2692,7 @@ void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC
}
void zend_do_is_class(znode *result, znode *expr, znode *class, int type TSRMLS_DC)
void zend_do_is_class(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC)
{
zend_op *opline = get_next_op(CG(active_op_array) TSRMLS_CC);
@ -2701,7 +2701,7 @@ void zend_do_is_class(znode *result, znode *expr, znode *class, int type TSRMLS_
opline->result.u.var = get_temporary_variable(CG(active_op_array));
opline->op1 = *expr;
opline->op2 = *class;
opline->op2 = *class_znode;
*result = opline->result;
}

4
Zend/zend_compile.h
View File

@ -262,7 +262,7 @@ void zend_do_fetch_global_or_static_variable(znode *varname, znode *static_assig
void fetch_array_begin(znode *result, znode *varname, znode *first_dim TSRMLS_DC);
void fetch_array_dim(znode *result, znode *parent, znode *dim TSRMLS_DC);
void fetch_string_offset(znode *result, znode *parent, znode *offset TSRMLS_DC);
void zend_do_fetch_static_member(znode *class TSRMLS_DC);
void zend_do_fetch_static_member(znode *class_znode TSRMLS_DC);
void zend_do_print(znode *result, znode *arg TSRMLS_DC);
void zend_do_echo(znode *arg TSRMLS_DC);
typedef int (*unary_op_type)(zval *, zval *);
@ -371,7 +371,7 @@ void zend_do_include_or_eval(int type, znode *result, znode *op1 TSRMLS_DC);
void zend_do_unset(znode *variable TSRMLS_DC);
void zend_do_isset_or_isempty(int type, znode *result, znode *variable TSRMLS_DC);
void zend_do_is_class(znode *result, znode *expr, znode *class, int type TSRMLS_DC);
void zend_do_is_class(znode *result, znode *expr, znode *class_znode, int type TSRMLS_DC);
void zend_do_foreach_begin(znode *foreach_token, znode *array, znode *open_brackets_token, znode *as_token, int variable TSRMLS_DC);
void zend_do_foreach_cont(znode *value, znode *key, znode *as_token TSRMLS_DC);