com php-src: Port top level stmt: Zend/zend_compile.c Zen d/zend_compile.h Zend/zend_language_parser.y
| From: | Nikita Popov | Date: | Tue, 22 Jul 2014 11:02:51 +0000 |
| Subject: | com php-src: Port top level stmt: Zend/zend_compile.c Zen d/zend_compile.h Zend/zend_language_parser.y | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80947@lists.php.net to get a copy of this message | ||
Commit: 9c69c41a6420ee3e8bef882d26945ef4930fed9d
Author: Nikita Popov <nikic@php.net> Tue, 22 Jul 2014 13:02:51 +0200
Parents: 8a2ff6b53dd84bd8bff20469fd283f76ae6e60a4
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9c69c41a6420ee3e8bef882d26945ef4930fed9d
Log:
Port top level stmt
Problem: namespace\foo no longer works :/
Changed paths:
M Zend/zend_compile.c
M Zend/zend_compile.h
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 7c0c97c..7af3c4c 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -6499,7 +6499,7 @@ void zend_compile_namespace(zend_ast *ast TSRMLS_DC) {
CG(in_namespace) = 1;
if (stmt_ast) {
- zend_compile_stmt(stmt_ast TSRMLS_CC);
+ zend_compile_top_stmt(stmt_ast TSRMLS_CC);
CG(in_namespace) = 0;
zend_reset_import_tables(TSRMLS_C);
@@ -7350,13 +7350,31 @@ void zend_compile_const_expr(zend_ast **ast_ptr TSRMLS_DC) {
}
}
+/* Same as compile_stmt, but with early binding */
+void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC) {
+ if (!ast) {
+ return;
+ }
+
+ if (ast->kind == ZEND_AST_STMT_LIST) {
+ zend_uint i;
+ for (i = 0; i < ast->children; ++i) {
+ zend_compile_top_stmt(ast->child[i] TSRMLS_CC);
+ }
+ return;
+ }
+
+ zend_compile_stmt(ast TSRMLS_CC);
+ if (ast->kind == ZEND_AST_FUNC_DECL || ast->kind == ZEND_AST_CLASS) {
+ zend_do_early_binding(TSRMLS_C);
+ }
+}
+
void zend_compile_stmt(zend_ast *ast TSRMLS_DC) {
if (!ast) {
return;
}
- // TODO.AST
- zend_uint orig_lineno = CG(zend_lineno);
CG(zend_lineno) = ast->lineno;
switch (ast->kind) {
@@ -7448,8 +7466,6 @@ void zend_compile_stmt(zend_ast *ast TSRMLS_DC) {
if (Z_LVAL(CG(declarables).ticks) && !zend_is_unticked_stmt(ast)) {
zend_emit_tick(TSRMLS_C);
}
-
- CG(zend_lineno) = orig_lineno;
}
void zend_compile_expr(znode *result, zend_ast *ast TSRMLS_DC) {
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 11e3550..70bea8e 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -101,6 +101,7 @@ static inline znode *zend_ast_get_znode(zend_ast *ast) {
}
void zend_ensure_writable_variable(const zend_ast *ast);
+void zend_compile_top_stmt(zend_ast *ast TSRMLS_DC);
void zend_compile_stmt(zend_ast *ast TSRMLS_DC);
void zend_compile_expr(znode *node, zend_ast *ast TSRMLS_DC);
int zend_compile_expr_maybe_ct(znode *node, zend_ast *ast, zend_bool ct_required TSRMLS_DC);
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index 278a885...0d45283 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -221,12 +221,12 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
%% /* Rules */
start:
- top_statement_list { zend_do_end_compilation(TSRMLS_C); }
+ top_statement_list { zend_compile_top_stmt($1.u.ast TSRMLS_CC); zend_ast_destroy($1.u.ast);
zend_do_end_compilation(TSRMLS_C); }
;
top_statement_list:
- top_statement_list { zend_do_extended_info(TSRMLS_C); } top_statement { HANDLE_INTERACTIVE(); }
- | /* empty */
+ top_statement_list top_statement { $$.u.ast = zend_ast_dynamic_add($1.u.ast, $2.u.ast); }
+ | /* empty */ { $$.u.ast = zend_ast_create_dynamic(ZEND_AST_STMT_LIST); }
;
namespace_name:
@@ -245,24 +245,25 @@ name:
{ $$.u.ast = AST_ZVAL(&$2); }
;
+/* TODO.AST early binding! */
top_statement:
- statement { AS($1); zend_verify_namespace(TSRMLS_C); }
- | function_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C);
zend_do_early_binding(TSRMLS_C); }
- | class_declaration_statement { AS($1); zend_verify_namespace(TSRMLS_C);
zend_do_early_binding(TSRMLS_C); }
- | T_HALT_COMPILER '(' ')' ';' {
zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; }
+ statement { $$.u.ast = $1.u.ast; }
+ | function_declaration_statement { $$.u.ast = $1.u.ast; }
+ | class_declaration_statement { $$.u.ast = $1.u.ast; }
+ | T_HALT_COMPILER '(' ')' ';' { AN($$);
zend_do_halt_compiler_register(TSRMLS_C); YYACCEPT; }
| T_NAMESPACE namespace_name ';'
- { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); AS($$); }
- | T_NAMESPACE namespace_name '{' { zend_do_begin_namespace(&$2, 1 TSRMLS_CC); }
- top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); }
- | T_NAMESPACE '{' { zend_do_begin_namespace(NULL, 1 TSRMLS_CC); }
- top_statement_list '}' { zend_do_end_namespace(TSRMLS_C); }
+ { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL); }
+ | T_NAMESPACE namespace_name '{' top_statement_list '}'
+ { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), $4.u.ast); }
+ | T_NAMESPACE '{' top_statement_list '}'
+ { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, NULL, $3.u.ast); }
| T_USE use_declarations ';'
- { $2.u.ast->attr = T_CLASS; AS($2); zend_verify_namespace(TSRMLS_C); }
+ { $$.u.ast = $2.u.ast; $$.u.ast->attr = T_CLASS; }
| T_USE T_FUNCTION use_declarations ';'
- { $3.u.ast->attr = T_FUNCTION; AS($3); zend_verify_namespace(TSRMLS_C); }
+ { $$.u.ast = $3.u.ast; $$.u.ast->attr = T_FUNCTION; }
| T_USE T_CONST use_declarations ';'
- { $3.u.ast->attr = T_CONST; AS($3); zend_verify_namespace(TSRMLS_C); }
- | T_CONST const_list ';' { AS($2); zend_verify_namespace(TSRMLS_C); }
+ { $$.u.ast = $3.u.ast; $$.u.ast->attr = T_CONST; }
+ | T_CONST const_list ';' { $$.u.ast = $2.u.ast; }
;
use_declarations: