mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 20:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Port __TRAIT__ and __CLASS__ to AST

Browse Source
This commit is contained in:
Nikita Popov 2014-07-21 17:34:00 +02:00
parent 005315510a
commit 18fd2a1897
4 changed files with 176 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Zend/zend_compile.c
View File

@ -7377,6 +7377,30 @@ void zend_compile_magic_const(znode *result, zend_ast *ast TSRMLS_DC) {
ZVAL_EMPTY_STRING(zv);
}
break;
case T_CLASS_C:
if (ce) {
if (ZEND_CE_IS_TRAIT(ce)) {
zval const_zv;
ZVAL_STRING(&const_zv, "__CLASS__");
zend_ast *const_ast = zend_ast_create_unary(ZEND_AST_CONST,
zend_ast_create_zval(&const_zv));
zend_compile_const(result, const_ast TSRMLS_CC);
efree(const_ast);
zval_ptr_dtor(&const_zv);
} else {
ZVAL_STR(zv, STR_COPY(ce->name));
}
} else {
ZVAL_EMPTY_STRING(zv);
}
break;
case T_TRAIT_C:
if (ce && ZEND_CE_IS_TRAIT(ce)) {
ZVAL_STR(zv, STR_COPY(ce->name));
} else {
ZVAL_EMPTY_STRING(zv);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}

25
Zend/zend_language_parser.y
View File

@ -248,7 +248,7 @@ name:
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 { 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; }
| T_NAMESPACE namespace_name ';' { zend_do_begin_namespace(&$2, 0 TSRMLS_CC); }
| T_NAMESPACE namespace_name '{' { zend_do_begin_namespace(&$2, 1 TSRMLS_CC); }
@ -313,7 +313,7 @@ inner_statement_list:
inner_statement:
statement { $$.u.ast = $1.u.ast; }
| function_declaration_statement { $$.u.ast = $1.u.ast; }
| class_declaration_statement { AN($$); }
| class_declaration_statement { $$.u.ast = $1.u.ast; }
| T_HALT_COMPILER '(' ')' ';'
{ zend_error_noreturn(E_COMPILE_ERROR, "__HALT_COMPILER() can only be used from the outermost scope"); }
;
@ -394,10 +394,6 @@ function_declaration_statement:
Z_STR($3.u.constant), $5.u.ast, NULL, $8.u.ast); }
;
class_declaration_statement:
unticked_class_declaration_statement { DO_TICKS(); }
;
is_reference:
/* empty */ { $$.op_type = 0; }
| '&' { $$.op_type = ZEND_PARAM_REF; }
@ -408,19 +404,19 @@ is_variadic:
| T_ELLIPSIS { $$.op_type = ZEND_PARAM_VARIADIC; }
;
unticked_class_declaration_statement:
class_declaration_statement:
class_entry_type T_STRING extends_from implements_list
{ $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; }
'{' class_statement_list '}'
{ $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num,
CG(zend_lineno), LANG_SCNG(yy_text), $5.u.op.ptr,
Z_STR($2.u.constant), $3.u.ast, $4.u.ast, $7.u.ast); AS($$); }
Z_STR($2.u.constant), $3.u.ast, $4.u.ast, $7.u.ast); }
| interface_entry T_STRING interface_extends_list
{ $$.u.op.ptr = CG(doc_comment); CG(doc_comment) = NULL; }
'{' class_statement_list '}'
{ $$.u.ast = zend_ast_create_decl(ZEND_AST_CLASS, $1.EA, $1.u.op.opline_num,
CG(zend_lineno), LANG_SCNG(yy_text), $4.u.op.ptr,
Z_STR($2.u.constant), NULL, $3.u.ast, $6.u.ast); AS($$); }
Z_STR($2.u.constant), NULL, $3.u.ast, $6.u.ast); }
;
@ -978,18 +974,11 @@ scalar:
| T_LINE { $$.u.ast = AST_ZVAL(&$1); }
| T_FILE { $$.u.ast = AST_ZVAL(&$1); }
| T_DIR { $$.u.ast = AST_ZVAL(&$1); }
| T_TRAIT_C { $$.u.ast = AST_ZVAL(&$1); }
| T_TRAIT_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_TRAIT_C); }
| T_METHOD_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_METHOD_C); }
| T_FUNC_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_FUNC_C); }
| T_NS_C { $$.u.ast = AST_ZVAL(&$1); }
| T_CLASS_C
{ if (Z_TYPE($1.u.constant) == IS_UNDEF) {
zval class_const; ZVAL_STRING(&class_const, "__CLASS__");
$$.u.ast = zend_ast_create_unary(ZEND_AST_CONST,
zend_ast_create_zval(&class_const));
} else {
$$.u.ast = AST_ZVAL(&$1);
} }
| T_CLASS_C { $$.u.ast = zend_ast_create_ex(0, ZEND_AST_MAGIC_CONST, T_CLASS_C); }
| T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC { $$.u.ast = AST_ZVAL(&$2); }
| T_START_HEREDOC T_END_HEREDOC
{ zval empty_str; ZVAL_EMPTY_STRING(&empty_str);

307
Zend/zend_language_scanner.c
View File

File diff suppressed because it is too large Load Diff

17
Zend/zend_language_scanner.l
View File

@ -1595,27 +1595,10 @@ NEWLINE ("\r"|"\n"|"\r\n")
}
<ST_IN_SCRIPTING>"__CLASS__" {
zend_class_entry *ce = CG(active_class_entry);
if (ce && ZEND_ACC_TRAIT == (ce->ce_flags & ZEND_ACC_TRAIT)) {
/* Signal that the __CLASS__ needs to be resolved at runtime */
ZVAL_UNDEF(zendlval);
} else {
if (ce && ce->name) {
ZVAL_STR(zendlval, STR_COPY(ce->name));
} else {
ZVAL_EMPTY_STRING(zendlval);
}
}
return T_CLASS_C;
}
<ST_IN_SCRIPTING>"__TRAIT__" {
zend_class_entry *ce = CG(active_class_entry);
if (ce && ce->name && ZEND_ACC_TRAIT == (ce->ce_flags & ZEND_ACC_TRAIT)) {
ZVAL_STR(zendlval, STR_COPY(ce->name));
} else {
ZVAL_EMPTY_STRING(zendlval);
}
return T_TRAIT_C;
}