clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Renamed zend_do_fetch_class_name() to zend_do_build_full_name() (It is not used only for classes)

Browse Source 
- Moved zend_resolve_class_name prototype to zend_compile.h
This commit is contained in:
Felipe Pena 2008-03-22 19:10:20 +00:00
parent c0619c6523
commit c3ca82f363
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Zend/zend_compile.c
View File

@ -30,8 +30,6 @@
ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC); ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC);
ZEND_API zend_op_array *(*zend_compile_string)(zval *source_string, char *filename TSRMLS_DC); ZEND_API zend_op_array *(*zend_compile_string)(zval *source_string, char *filename TSRMLS_DC);
void zend_resolve_class_name(znode *class_name, ulong *fetch_type, int check_ns_name TSRMLS_DC);
#ifndef ZTS #ifndef ZTS
ZEND_API zend_compiler_globals compiler_globals; ZEND_API zend_compiler_globals compiler_globals;
ZEND_API zend_executor_globals executor_globals; ZEND_API zend_executor_globals executor_globals;
@ -1832,28 +1830,28 @@ void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC) /* {{{ */
} }
/* }}} */ /* }}} */
void zend_do_fetch_class_name(znode *result, znode *class_name_entry, znode *class_name TSRMLS_DC) /* {{{ */ void zend_do_build_full_name(znode *result, znode *prefix, znode *name TSRMLS_DC) /* {{{ */
{ {
zend_uint length; zend_uint length;
if (!result) { if (!result) {
result = class_name_entry; result = prefix;
} else { } else {
*result = *class_name_entry; *result = *prefix;
} }
length = sizeof("::")-1 + Z_UNILEN(result->u.constant) + Z_UNILEN(class_name->u.constant); length = sizeof("::")-1 + Z_UNILEN(result->u.constant) + Z_UNILEN(name->u.constant);
if (Z_TYPE(result->u.constant) == IS_UNICODE) { if (Z_TYPE(result->u.constant) == IS_UNICODE) {
Z_USTRVAL(result->u.constant) = erealloc(Z_USTRVAL(result->u.constant), UBYTES(length+1)); Z_USTRVAL(result->u.constant) = erealloc(Z_USTRVAL(result->u.constant), UBYTES(length+1));
Z_USTRVAL(result->u.constant)[Z_USTRLEN(result->u.constant)] = ':'; Z_USTRVAL(result->u.constant)[Z_USTRLEN(result->u.constant)] = ':';
Z_USTRVAL(result->u.constant)[Z_USTRLEN(result->u.constant)+1] = ':'; Z_USTRVAL(result->u.constant)[Z_USTRLEN(result->u.constant)+1] = ':';
memcpy(&Z_USTRVAL(result->u.constant)[Z_USTRLEN(result->u.constant) + sizeof("::")-1], Z_STRVAL(class_name->u.constant), UBYTES(Z_USTRLEN(class_name->u.constant)+1)); memcpy(&Z_USTRVAL(result->u.constant)[Z_USTRLEN(result->u.constant) + sizeof("::")-1], Z_STRVAL(name->u.constant), UBYTES(Z_USTRLEN(name->u.constant)+1));
STR_FREE(Z_USTRVAL(class_name->u.constant)); STR_FREE(Z_USTRVAL(name->u.constant));
} else { } else {
Z_STRVAL(result->u.constant) = erealloc(Z_STRVAL(result->u.constant), length+1); Z_STRVAL(result->u.constant) = erealloc(Z_STRVAL(result->u.constant), length+1);
memcpy(&Z_STRVAL(result->u.constant)[Z_STRLEN(result->u.constant)], "::", sizeof("::")-1); memcpy(&Z_STRVAL(result->u.constant)[Z_STRLEN(result->u.constant)], "::", sizeof("::")-1);
memcpy(&Z_STRVAL(result->u.constant)[Z_STRLEN(result->u.constant) + sizeof("::")-1], Z_STRVAL(class_name->u.constant), Z_STRLEN(class_name->u.constant)+1); memcpy(&Z_STRVAL(result->u.constant)[Z_STRLEN(result->u.constant) + sizeof("::")-1], Z_STRVAL(name->u.constant), Z_STRLEN(name->u.constant)+1);
STR_FREE(Z_STRVAL(class_name->u.constant)); STR_FREE(Z_STRVAL(name->u.constant));
} }
Z_UNILEN(result->u.constant) = length; Z_UNILEN(result->u.constant) = length;
} }
@ -3912,7 +3910,7 @@ void zend_do_fetch_constant(znode *result, znode *constant_container, znode *con
} else if (ZEND_FETCH_CLASS_DEFAULT == type) { } else if (ZEND_FETCH_CLASS_DEFAULT == type) {
zend_resolve_class_name(constant_container, &fetch_type, 1 TSRMLS_CC); zend_resolve_class_name(constant_container, &fetch_type, 1 TSRMLS_CC);
} }
zend_do_fetch_class_name(NULL, constant_container, constant_name TSRMLS_CC); zend_do_build_full_name(NULL, constant_container, constant_name TSRMLS_CC);
*result = *constant_container; *result = *constant_container;
result->u.constant.type = IS_CONSTANT | fetch_type; result->u.constant.type = IS_CONSTANT | fetch_type;
} else if (fetch_type || !zend_constant_ct_subst(result, &constant_name->u.constant TSRMLS_CC)) { } else if (fetch_type || !zend_constant_ct_subst(result, &constant_name->u.constant TSRMLS_CC)) {
@ -5239,7 +5237,7 @@ void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRM
Z_UNILEN(result->u.constant) = 0; Z_UNILEN(result->u.constant) = 0;
} }
/* prefix = result */ /* prefix = result */
zend_do_fetch_class_name(NULL, result, name TSRMLS_CC); zend_do_build_full_name(NULL, result, name TSRMLS_CC);
} }
/* }}} */ /* }}} */

4
Zend/zend_compile.h
View File

@ -334,6 +334,8 @@ void init_compiler(TSRMLS_D);
void shutdown_compiler(TSRMLS_D); void shutdown_compiler(TSRMLS_D);
void zend_init_compiler_data_structures(TSRMLS_D); void zend_init_compiler_data_structures(TSRMLS_D);
void zend_resolve_class_name(znode *class_name, ulong *fetch_type, int check_ns_name TSRMLS_DC);
extern ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC); extern ZEND_API zend_op_array *(*zend_compile_file)(zend_file_handle *file_handle, int type TSRMLS_DC);
extern ZEND_API zend_op_array *(*zend_compile_string)(zval *source_string, char *filename TSRMLS_DC); extern ZEND_API zend_op_array *(*zend_compile_string)(zval *source_string, char *filename TSRMLS_DC);
@ -421,7 +423,7 @@ void zend_do_begin_method_call(znode *left_bracket TSRMLS_DC);
void zend_do_clone(znode *result, znode *expr TSRMLS_DC); void zend_do_clone(znode *result, znode *expr TSRMLS_DC);
void zend_do_begin_dynamic_function_call(znode *function_name, int prefix_len TSRMLS_DC); void zend_do_begin_dynamic_function_call(znode *function_name, int prefix_len TSRMLS_DC);
void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC); void zend_do_fetch_class(znode *result, znode *class_name TSRMLS_DC);
void zend_do_fetch_class_name(znode *result, znode *class_entry, znode *class_name TSRMLS_DC); void zend_do_build_full_name(znode *result, znode *prefix, znode *name TSRMLS_DC);
int zend_do_begin_class_member_function_call(znode *class_name, znode *method_name TSRMLS_DC); int zend_do_begin_class_member_function_call(znode *class_name, znode *method_name TSRMLS_DC);
void zend_do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method, int is_dynamic_fcall TSRMLS_DC); void zend_do_end_function_call(znode *function_name, znode *result, znode *argument_list, int is_method, int is_dynamic_fcall TSRMLS_DC);
void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC); void zend_do_return(znode *expr, int do_end_vparse TSRMLS_DC);