diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2013-11-28 13:41:42 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2013-11-28 13:41:42 +0100 |
| commit | d36cf9029110268e8ae7f700f620823dcaab5d8e (patch) | |
| tree | 1b672c324c667d2ec56f26b2f2526a0584f2b0c2 /Zend/zend_compile.h | |
| parent | 9d060e8d48bd6b2cc8c2a30f3b0eeeb4d867d934 (diff) | |
| parent | 152898ff2872f2bdf2123a52c37f6e64c18ab88a (diff) | |
| download | php-git-d36cf9029110268e8ae7f700f620823dcaab5d8e.tar.gz | |
Merge branch 'const_scalar_exprs' into PHP-5.6
Conflicts:
Zend/zend_extensions.h
Diffstat (limited to 'Zend/zend_compile.h')
| -rw-r--r-- | Zend/zend_compile.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h index 5e284880e1..5ffd6b4855 100644 --- a/Zend/zend_compile.h +++ b/Zend/zend_compile.h @@ -23,6 +23,7 @@ #define ZEND_COMPILE_H #include "zend.h" +#include "zend_ast.h" #ifdef HAVE_STDARG_H # include <stdarg.h> @@ -92,6 +93,7 @@ typedef struct _znode { /* used only during compilation */ znode_op op; zval constant; /* replaced by literal/zv */ zend_op_array *op_array; + zend_ast *ast; } u; zend_uint EA; /* extended attributes */ } znode; @@ -641,6 +643,7 @@ void zend_do_end_namespace(TSRMLS_D); void zend_verify_namespace(TSRMLS_D); void zend_do_use(znode *name, znode *new_name, int is_global TSRMLS_DC); void zend_do_end_compilation(TSRMLS_D); +void zend_do_constant_expression(znode *result, zend_ast *ast TSRMLS_DC); void zend_do_resolve_class_name(znode *result, znode *class_name, int is_static TSRMLS_DC); |