diff options
| author | Zeev Suraski <zeev@php.net> | 2000-04-29 01:30:17 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-04-29 01:30:17 +0000 |
| commit | e0a48fe623cffe6cae397c40f4b98113f28686cf (patch) | |
| tree | 00082761d0642456d59256b9b642731a9a48c9c4 | |
| parent | 32ffe0ba6fafc27fb47aa54710326e1b7e48bb94 (diff) | |
| download | php-git-e0a48fe623cffe6cae397c40f4b98113f28686cf.tar.gz | |
Beautify
| -rw-r--r-- | Zend/zend-scanner.l | 5 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 2 | ||||
| -rw-r--r-- | Zend/zend_compile.h | 2 | ||||
| -rw-r--r-- | Zend/zend_opcode.c | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/Zend/zend-scanner.l b/Zend/zend-scanner.l index d7425cae2d..2df51dd6d7 100644 --- a/Zend/zend-scanner.l +++ b/Zend/zend-scanner.l @@ -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); diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index ef6437cea9..25005b6c9e 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -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; diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 4551ab1d48..0c1d2de14a 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -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); diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 77474cf3a8..a0820db96b 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -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(); |