com php-src: Create namespace_name via AST: Zend/zend _ast.h Zend/zend_compile.c Zend/zend_compile.h Zend/zend_language_parser.y
| From: | Nikita Popov | Date: | Sat, 26 Jul 2014 19:53:50 +0000 |
| Subject: | com php-src: Create namespace_name via AST: Zend/zend _ast.h 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-80931@lists.php.net to get a copy of this message | ||
Commit: df42793cd2ceed11cb46288e0f89d4684b885a57
Author: Nikita Popov <nikic@php.net> Sat, 26 Jul 2014 21:53:50 +0200
Parents: c07907121e01ff195266de70b8421af2e6e62f26
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=df42793cd2ceed11cb46288e0f89d4684b885a57
Log:
Create namespace_name via AST
Changed paths:
M Zend/zend_ast.h
M Zend/zend_compile.c
M Zend/zend_compile.h
M Zend/zend_language_parser.y
Diff:
diff --git a/Zend/zend_ast.h b/Zend/zend_ast.h
index d9e096b..414dd3c 100644
--- a/Zend/zend_ast.h
+++ b/Zend/zend_ast.h
@@ -230,7 +230,4 @@ static inline zend_ast *zend_ast_create_cast(zend_uint type, zend_ast *op0) {
return zend_ast_create_ex(1, ZEND_AST_CAST, type, op0);
}
-/* Temporary, for porting */
-#define AST_ZVAL(znode) zend_ast_create_zval(&(znode)->u..constant)
-
#endif
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 8cfaeb4..496392b 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -984,36 +984,6 @@ void zend_release_labels(int temporary TSRMLS_DC) /* {{{ */
}
/* }}} */
-void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member
TSRMLS_DC) /* {{{ */
-{
- zend_uint length;
-
- if (!result) {
- result = prefix;
- } else {
- *result = *prefix;
- }
-
- if (is_class_member) {
- int old_len = Z_STRLEN(result->u.constant);
- length = sizeof("::")-1 + old_len + Z_STRLEN(name->u.constant);
- Z_STR(result->u.constant) = STR_REALLOC(Z_STR(result->u.constant), length, 0);
- Z_TYPE_FLAGS(result->u.constant) = IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE;
- memcpy(&Z_STRVAL(result->u.constant)[old_len], "::", sizeof("::")-1);
- memcpy(&Z_STRVAL(result->u.constant)[old_len + sizeof("::")-1],
Z_STRVAL(name->u.constant), Z_STRLEN(name->u.constant)+1);
- STR_RELEASE(Z_STR(name->u.constant));
- } else {
- int old_len = Z_STRLEN(result->u.constant);
- length = sizeof("\\")-1 + old_len + Z_STRLEN(name->u.constant);
- Z_STR(result->u.constant) = STR_REALLOC(Z_STR(result->u.constant), length, 0);
- Z_TYPE_FLAGS(result->u.constant) = IS_TYPE_REFCOUNTED | IS_TYPE_COPYABLE;
- memcpy(&Z_STRVAL(result->u.constant)[old_len], "\\", sizeof("\\")-1);
- memcpy(&Z_STRVAL(result->u.constant)[old_len + sizeof("\\")-1],
Z_STRVAL(name->u.constant), Z_STRLEN(name->u.constant)+1);
- STR_RELEASE(Z_STR(name->u.constant));
- }
-}
-/* }}} */
-
static zend_bool zend_is_call(zend_ast *ast);
static int generate_free_switch_expr(zend_switch_entry *switch_entry TSRMLS_DC) /* {{{ */
@@ -3240,30 +3210,24 @@ ZEND_API zend_string *zend_get_compiled_variable_name(const zend_op_array
*op_ar
}
/* }}} */
-void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRMLS_DC) /* {{{ */
-{
- if (prefix) {
- *result = *prefix;
- if (Z_TYPE(result->u.constant) == IS_STRING &&
- Z_STRLEN(result->u.constant) == 0) {
- /* namespace\ */
- if (Z_TYPE(CG(current_namespace)) != IS_UNDEF) {
- znode tmp;
+zend_ast *zend_ast_append_str(zend_ast *left_ast, zend_ast *right_ast) {
+ zval *left_zv = zend_ast_get_zval(left_ast);
+ zend_string *left = Z_STR_P(left_zv);
+ zend_string *right = zend_ast_get_str(right_ast);
- zval_dtor(&result->u.constant);
- tmp.op_type = IS_CONST;
- ZVAL_DUP(&tmp.u.constant, &CG(current_namespace));
- zend_do_build_namespace_name(result, NULL, &tmp TSRMLS_CC);
- }
- }
- } else {
- result->op_type = IS_CONST;
- ZVAL_EMPTY_STRING(&result->u.constant);
- }
- /* prefix = result */
- zend_do_build_full_name(NULL, result, name, 0 TSRMLS_CC);
+ zend_string *result;
+ size_t left_len = left->len;
+ size_t len = left_len + right->len + 1; /* left\right */
+
+ result = STR_REALLOC(left, len, 0);
+ result->val[left_len] = '\\';
+ memcpy(&result->val[left_len + 1], right->val, right->len);
+ result->val[len] = '\0';
+ STR_RELEASE(right);
+
+ ZVAL_STR(left_zv, result);
+ return left_ast;
}
-/* }}} */
void zend_verify_namespace(TSRMLS_D) /* {{{ */
{
diff --git a/Zend/zend_compile.h b/Zend/zend_compile.h
index 2f7b2cc..22c0472 100644
--- a/Zend/zend_compile.h
+++ b/Zend/zend_compile.h
@@ -467,12 +467,12 @@ ZEND_API void zend_make_immutable_array(zval *zv TSRMLS_DC);
void zend_discard_doc_comment(TSRMLS_D);
void zend_stop_lexing(TSRMLS_D);
void zend_emit_final_return(zval *zv TSRMLS_DC);
+zend_ast *zend_ast_append_str(zend_ast *left, zend_ast *right);
/* parser-driven code generators */
void zend_do_free(znode *op1 TSRMLS_DC);
int zend_do_verify_access_types(const znode *current_access_type, const znode *new_modifier);
-void zend_do_build_full_name(znode *result, znode *prefix, znode *name, int is_class_member
TSRMLS_DC);
void zend_do_handle_exception(TSRMLS_D);
ZEND_API int do_bind_function(const zend_op_array *op_array, zend_op *opline, HashTable
*function_table, zend_bool compile_time TSRMLS_DC);
@@ -502,7 +502,6 @@ void zend_do_ticks(TSRMLS_D);
void zend_do_abstract_method(const znode *function_name, znode *modifiers, const znode *body
TSRMLS_DC);
-void zend_do_build_namespace_name(znode *result, znode *prefix, znode *name TSRMLS_DC);
void zend_do_end_namespace(TSRMLS_D);
void zend_verify_namespace(TSRMLS_D);
void zend_do_end_compilation(TSRMLS_D);
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index a4ab4e6..f592b04 100644
--- a/Zend/zend_language_parser.y
+++ b/Zend/zend_language_parser.y
@@ -230,17 +230,18 @@ top_statement_list:
;
namespace_name:
- T_STRING { zval zv; ZVAL_COPY_VALUE(&zv, zend_ast_get_zval($1.u.ast)); $1.op_type = IS_CONST;
ZVAL_COPY_VALUE(&$1.u..constant, &zv); $$ = $1; }
- | namespace_name T_NS_SEPARATOR T_STRING { zval zv; ZVAL_COPY_VALUE(&zv,
zend_ast_get_zval($3.u.ast)); $3.op_type = IS_CONST; ZVAL_COPY_VALUE(&$3.u.constant, &zv);
zend_do_build_namespace_name(&$$, &$1, &$3 TSRMLS_CC); }
+ T_STRING { $$.u.ast = $1.u.ast; }
+ | namespace_name T_NS_SEPARATOR T_STRING
+ { $$.u.ast = zend_ast_append_str($1.u.ast, $3.u.ast); }
;
name:
namespace_name
- { $$.u.ast = zend_ast_create_zval_ex(&$1.u.constant, ZEND_NAME_NOT_FQ); }
+ { $$.u.ast = $1.u.ast; $$.u.ast->attr = ZEND_NAME_NOT_FQ; }
| T_NAMESPACE T_NS_SEPARATOR namespace_name
- { $$.u.ast = zend_ast_create_zval_ex(&$3.u.constant, ZEND_NAME_RELATIVE); }
+ { $$.u.ast = $3.u.ast; $$.u.ast->attr = ZEND_NAME_RELATIVE; }
| T_NS_SEPARATOR namespace_name
- { $$.u.ast = zend_ast_create_zval_ex(&$2.u.constant, ZEND_NAME_FQ); }
+ { $$.u.ast = $2.u.ast; $$.u.ast->attr = ZEND_NAME_FQ; }
;
top_statement:
@@ -252,11 +253,11 @@ top_statement:
zend_ast_create_zval_from_long(zend_get_scanned_file_offset(TSRMLS_C)));
zend_stop_lexing(TSRMLS_C); }
| T_NAMESPACE namespace_name ';'
- { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), NULL);
+ { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.u.ast, NULL);
zend_discard_doc_comment(TSRMLS_C); }
| T_NAMESPACE namespace_name { zend_discard_doc_comment(TSRMLS_C); }
'{' top_statement_list '}'
- { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, AST_ZVAL(&$2), $5.u.ast); }
+ { $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, $2.u.ast, $5.u.ast); }
| T_NAMESPACE { zend_discard_doc_comment(TSRMLS_C); }
'{' top_statement_list '}'
{ $$.u.ast = zend_ast_create_binary(ZEND_AST_NAMESPACE, NULL, $4.u.ast); }
@@ -278,13 +279,13 @@ use_declarations:
use_declaration:
namespace_name
- { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$1), NULL); }
+ { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $1.u.ast, NULL); }
| namespace_name T_AS T_STRING
- { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$1), $3.u.ast); }
+ { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $1.u.ast, $3.u.ast); }
| T_NS_SEPARATOR namespace_name
- { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), NULL); }
+ { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $2.u.ast, NULL); }
| T_NS_SEPARATOR namespace_name T_AS T_STRING
- { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, AST_ZVAL(&$2), $4.u.ast); }
+ { $$.u.ast = zend_ast_create_binary(ZEND_AST_USE_ELEM, $2.u.ast, $4.u.ast); }
;
const_list: