com php-src: Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function: Zend/zend_compile.c Zend/zend_ compile.h
Zend/zend_language_parser.y
| From: | Ferenc Kovacs | Date: | Fri, 06 Dec 2013 04:39:49 +0000 |
| Subject: | com php-src: Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function: Zend/zend_compile.c Zend/zend_ compile.h Zend/zend_language_parser.y |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74273@lists.php.net to get a copy of this message | ||
Commit: 562fa252ad932f321131ab6f65ffaef8d62fc73a
Author: Ferenc Kovacs <tyra3l@gmail.com> Fri, 6 Dec 2013 05:39:49 +0100
Parents: f0248bdce598a382899056d348d204c9d61746df 611da37617749c81ab22b1e44a0cc1f294cc493a
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=562fa252ad932f321131ab6f65ffaef8d62fc73a
Log:
Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function
Changed paths:
MM Zend/zend_compile.c
MM Zend/zend_compile.h
MM Zend/zend_language_parser.y
Diff:
diff --cc Zend/zend_compile.h
index 5ffd6b4,c1a8e6f..e3f06a0
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@@ -642,8 -639,10 +644,11 @@@ void zend_do_begin_namespace(const znod
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_use_non_class(znode *ns_name, znode *new_name, int is_global, int is_function,
zend_bool case_sensitive, HashTable *current_import_sub, HashTable *lookup_table TSRMLS_DC);
+ void zend_do_use_function(znode *name, znode *new_name, int is_global TSRMLS_DC);
+ void zend_do_use_const(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);