Merge branch 'use-function' of git://github.com/igorw/php-src into igorw-use-function

diff --cc Zend/zend_compile.c
Simple merge

diff --cc Zend/zend_compile.h
index 5ffd6b485532d7b8459919ebb768ec0d4696e9cb,c1a8e6fcafe970bc354c70da8fb401441e149068..e3f06a001270446349d9754d36cdb73fb53c90ef
--- 1/Zend/zend_compile.h
--- 2/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);
  

diff --cc Zend/zend_language_parser.y
Simple merge