archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Beautify

Browse source
This commit is contained in:
Zeev Suraski 2000-04-29 01:30:17 +00:00
parent 32ffe0ba6f
commit e0a48fe623
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Zend/zend-scanner.l
View file

@ -348,7 +348,7 @@ ZEND_API zend_op_array *v_compile_files(int type CLS_DC, int file_count, va_list
retval_znode.u.constant.is_ref = 0;
retval_znode.u.constant.refcount = 1;
init_op_array(op_array, INITIAL_OP_ARRAY_SIZE);
init_op_array(op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE);
save_lexical_state(&original_lex_state CLS_CC);
retval = op_array; /* success oriented */
@ -486,8 +486,7 @@ zend_op_array *compile_string(zval *source_string CLS_DC)
convert_to_string(&tmp);
source_string = &tmp;
init_op_array(op_array, INITIAL_OP_ARRAY_SIZE);
op_array->type = ZEND_EVAL_CODE;
init_op_array(op_array, ZEND_EVAL_CODE, INITIAL_OP_ARRAY_SIZE);
save_lexical_state(&original_lex_state CLS_CC);
if (prepare_string_for_scanning(source_string CLS_CC)==FAILURE) {
destroy_op_array(op_array);

2
Zend/zend_compile.c
View file

@ -715,7 +715,7 @@ void do_begin_function_declaration(znode *function_token, znode *function_name,
function_token->u.op_array = CG(active_op_array);
zend_str_tolower(name, name_len);
init_op_array(&op_array, INITIAL_OP_ARRAY_SIZE);
init_op_array(&op_array, ZEND_USER_FUNCTION, INITIAL_OP_ARRAY_SIZE);
op_array.function_name = name;
op_array.arg_types = NULL;

2
Zend/zend_compile.h
View file

@ -373,7 +373,7 @@ ZEND_API zend_op_array *v_compile_files(int type CLS_DC, int file_count, va_list
ZEND_API zend_op_array *compile_string(zval *source_string CLS_DC);
ZEND_API zend_op_array *compile_filename(int type, zval *filename CLS_DC ELS_DC);
ZEND_API int open_file_for_scanning(zend_file_handle *file_handle CLS_DC);
ZEND_API void init_op_array(zend_op_array *op_array, int initial_ops_size);
ZEND_API void init_op_array(zend_op_array *op_array, int type, int initial_ops_size);
ZEND_API void destroy_op_array(zend_op_array *op_array);
ZEND_API void zend_close_file_handle(zend_file_handle *file_handle CLS_DC);
ZEND_API void zend_open_file_dtor(zend_file_handle *fh);

4
Zend/zend_opcode.c
View file

@ -58,9 +58,9 @@ static void op_array_alloc_ops(zend_op_array *op_array)
void init_op_array(zend_op_array *op_array, int initial_ops_size)
void init_op_array(zend_op_array *op_array, int type, int initial_ops_size)
{
op_array->type = ZEND_USER_FUNCTION;
op_array->type = type;
#if SUPPORT_INTERACTIVE
{
ELS_FETCH();