diff options
| author | Marcus Boerger <helly@php.net> | 2006-05-09 23:53:23 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2006-05-09 23:53:23 +0000 |
| commit | 637a40423cd7632b2800814c2ba3ad9b95bbd2f4 (patch) | |
| tree | 485f1dd7cf12d0bfe693961120360b965d66c195 /Zend/zend_compile.h | |
| parent | 57184454e9e3ccecb2b55dc71cd7dc1aa65a3ad3 (diff) | |
| download | php-git-637a40423cd7632b2800814c2ba3ad9b95bbd2f4.tar.gz | |
- MFH as discussed
. zend_exception_get_default() -> zend_exception_get_default(TSRMLS_D)
. zend_get_error_exception() -> zend_get_error_exception(TSRMLS_D)
. added E_RECOVERABLE_ERROR
. added ZEND_TOSTRING_FUNC_NAME
. added __tostring function cache to zend_class_entry
. added ZEND_NAMED_ME
. modified ZEND_ME_MAPPING to support method flags
. added ZEND_MN
. method entries now use prefix "zim_" instead of "zif_"
. drop EG(ze1_compatibility_mode)
. changed cast handler, now without (int should_free):
typedef int (*zend_object_cast_t)(zval *readobj, zval *retval, int type TSRMLS_DC);
. changed get_iterator, now receives whether value is by ref:
zend_object_iterator *(*get_iterator)(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC);
. added zend_objects_store_add_ref_by_handle
. added zend_objects_store_del_ref_by_handle
. convert_to_explicit_type(pzv, type)
Diffstat (limited to 'Zend/zend_compile.h')
| -rw-r--r-- | Zend/zend_compile.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 4ceaf18988..4bb9fd9845 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -226,9 +226,9 @@ struct _zend_op_array { typedef struct _zend_internal_function { /* Common elements */ zend_uchar type; - char *function_name; + char * function_name; zend_class_entry *scope; - zend_uint fn_flags; + zend_uint fn_flags; union _zend_function *prototype; zend_uint num_args; zend_uint required_num_args; @@ -238,6 +238,7 @@ typedef struct _zend_internal_function { /* END of common elements */ void (*handler)(INTERNAL_FUNCTION_PARAMETERS); + struct _zend_module_entry *module; } zend_internal_function; #define ZEND_FN_SCOPE_NAME(function) ((function) && (function)->common.scope ? (function)->common.scope->name : "") @@ -257,7 +258,7 @@ typedef union _zend_function { zend_bool pass_rest_by_reference; unsigned char return_reference; } common; - + zend_op_array op_array; zend_internal_function internal_function; } zend_function; @@ -507,7 +508,7 @@ ZEND_API void function_add_ref(zend_function *function); /* helper functions in zend_language_scanner.l */ ZEND_API zend_op_array *compile_file(zend_file_handle *file_handle, int type TSRMLS_DC); -ZEND_API zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC); +ZEND_API zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC); ZEND_API zend_op_array *compile_filename(int type, zval *filename TSRMLS_DC); ZEND_API int zend_execute_scripts(int type TSRMLS_DC, zval **retval, int file_count, ...); ZEND_API int open_file_for_scanning(zend_file_handle *file_handle TSRMLS_DC); @@ -705,9 +706,10 @@ END_EXTERN_C() #define ZEND_DESTRUCTOR_FUNC_NAME "__destruct" #define ZEND_GET_FUNC_NAME "__get" #define ZEND_SET_FUNC_NAME "__set" -#define ZEND_UNSET_FUNC_NAME "__unset" -#define ZEND_ISSET_FUNC_NAME "__isset" +#define ZEND_UNSET_FUNC_NAME "__unset" +#define ZEND_ISSET_FUNC_NAME "__isset" #define ZEND_CALL_FUNC_NAME "__call" +#define ZEND_TOSTRING_FUNC_NAME "__tostring" #define ZEND_AUTOLOAD_FUNC_NAME "__autoload" #endif /* ZEND_COMPILE_H */ |