diff options
| author | Nikita Popov <nikic@php.net> | 2014-08-25 21:59:30 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-08-25 22:04:33 +0200 |
| commit | 899a1ed59a2f7133367dc39f95b143c019822520 (patch) | |
| tree | a8fc518673cf0c94ad363d04bc3474eb3f3bfa66 /Zend/zend_globals.h | |
| parent | af59e92b24c8f624672720d47ef65bd8457728b9 (diff) | |
| parent | 6db293d5e043d35c281a6b11cb68460f5d7188a9 (diff) | |
| download | php-git-POST_AST_MERGE.tar.gz | |
Merge branch 'ast'POST_AST_MERGE
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'Zend/zend_globals.h')
| -rw-r--r-- | Zend/zend_globals.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 758e373ac2..c4a24486d9 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -71,21 +71,11 @@ typedef struct _zend_ini_entry zend_ini_entry; struct _zend_compiler_globals { - zend_stack bp_stack; zend_stack switch_cond_stack; zend_stack foreach_copy_stack; - zend_stack object_stack; - zend_stack declare_stack; zend_class_entry *active_class_entry; - /* variables for list() compilation */ - zend_llist list_llist; - zend_llist dimension_llist; - zend_stack list_stack; - - zend_stack function_call_stack; - zend_string *compiled_filename; int zend_lineno; @@ -112,8 +102,6 @@ struct _zend_compiler_globals { zend_llist open_files; - zend_long catch_begin; - struct _zend_ini_parser_param *ini_parser_param; int interactive; @@ -123,13 +111,11 @@ struct _zend_compiler_globals { znode implementing_class; - uint32_t access_type; - zend_string *doc_comment; uint32_t compiler_options; /* set of ZEND_COMPILE_* constants */ - zval current_namespace; + zend_string *current_namespace; HashTable *current_import; HashTable *current_import_function; HashTable *current_import_const; @@ -154,6 +140,11 @@ struct _zend_compiler_globals { zend_bool detect_unicode; zend_bool encoding_declared; + zend_ast *ast; + zend_arena *ast_arena; + + zend_stack delayed_oplines_stack; + #ifdef ZTS zval **static_members_table; int last_static_member; |