diff options
Diffstat (limited to 'Zend/zend_globals.h')
| -rw-r--r-- | Zend/zend_globals.h | 38 |
1 files changed, 15 insertions, 23 deletions
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 31dd9af619..ee9c1a2f33 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -85,7 +85,7 @@ struct _zend_compiler_globals { zend_stack function_call_stack; - char *compiled_filename; + zend_string *compiled_filename; int zend_lineno; @@ -124,12 +124,11 @@ struct _zend_compiler_globals { zend_uint access_type; - char *doc_comment; - zend_uint doc_comment_len; + zend_string *doc_comment; zend_uint compiler_options; /* set of ZEND_COMPILE_* constants */ - zval *current_namespace; + zval current_namespace; HashTable *current_import; HashTable *current_import_function; HashTable *current_import_const; @@ -141,14 +140,7 @@ struct _zend_compiler_globals { zend_compiler_context context; zend_stack context_stack; - /* interned strings */ - char *interned_strings_start; - char *interned_strings_end; - char *interned_strings_top; - char *interned_strings_snapshot_top; -#ifndef ZTS - char *interned_empty_string; -#endif + zend_string *empty_string; HashTable interned_strings; @@ -166,13 +158,10 @@ struct _zend_compiler_globals { struct _zend_executor_globals { - zval **return_value_ptr_ptr; +//??? zval **return_value_ptr_ptr; zval uninitialized_zval; - zval *uninitialized_zval_ptr; - zval error_zval; - zval *error_zval_ptr; /* symbol table cache */ HashTable *symtable_cache[SYMTABLE_CACHE_SIZE]; @@ -182,7 +171,7 @@ struct _zend_executor_globals { zend_op **opline_ptr; HashTable *active_symbol_table; - HashTable symbol_table; /* main symbol table */ + zend_array symbol_table; /* main symbol table */ HashTable included_files; /* files already included */ @@ -201,7 +190,7 @@ struct _zend_executor_globals { zend_class_entry *scope; zend_class_entry *called_scope; /* Scope of the calling class */ - zval *This; + zval This; long precision; @@ -226,11 +215,11 @@ struct _zend_executor_globals { zend_vm_stack argument_stack; int user_error_handler_error_reporting; - zval *user_error_handler; - zval *user_exception_handler; + zval user_error_handler; + zval user_exception_handler; zend_stack user_error_handlers_error_reporting; - zend_ptr_stack user_error_handlers; - zend_ptr_stack user_exception_handlers; + zend_stack user_error_handlers; + zend_stack user_exception_handlers; zend_error_handling_t error_handling; zend_class_entry *exception_class; @@ -245,7 +234,7 @@ struct _zend_executor_globals { zend_ini_entry *error_reporting_ini_entry; zend_objects_store objects_store; - zval *exception, *prev_exception; + zend_object *exception, *prev_exception; zend_op *opline_before_exception; zend_op exception_op[3]; @@ -313,6 +302,9 @@ struct _zend_php_scanner_globals { zend_encoding_filter input_filter; zend_encoding_filter output_filter; const zend_encoding *script_encoding; + + /* initial string length after scanning to first variable */ + int scanned_string_len; }; #endif /* ZEND_GLOBALS_H */ |