Skip to content

Reworked Parsing & Support for repeated Attributes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 5, 2020
Merged

Reworked Parsing & Support for repeated Attributes #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e367e00
Reworked grammar and compiler. Fixed all memory leaks.
kooldev Apr 4, 2020
13db356
Implemented access to multi & param attributes.
kooldev Apr 4, 2020
214c435
Added support for empty arg list. Added AST evaluation test case.
kooldev Apr 5, 2020
34a8904
Fixed property attributes. Added attribute placement a test case.
kooldev Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 29 additions & 96 deletions Zend/zend_ast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ ZEND_API zend_ast * ZEND_FASTCALL zend_ast_create_class_const_or_name(zend_ast *
}

ZEND_API zend_ast *zend_ast_create_decl(
zend_ast_kind kind, uint32_t flags, uint32_t start_lineno, zend_string *doc_comment, HashTable *attributes,
zend_ast_kind kind, uint32_t flags, uint32_t start_lineno, zend_string *doc_comment,
zend_string *name, zend_ast *child0, zend_ast *child1, zend_ast *child2, zend_ast *child3
) {
zend_ast_decl *ast;
Expand All @@ -126,7 +126,7 @@ ZEND_API zend_ast *zend_ast_create_decl(
ast->flags = flags;
ast->lex_pos = LANG_SCNG(yy_text);
ast->doc_comment = doc_comment;
ast->attributes = attributes;
ast->attributes = NULL;
ast->name = name;
ast->child[0] = child0;
ast->child[1] = child1;
Expand Down Expand Up @@ -859,7 +859,7 @@ ZEND_API void ZEND_FASTCALL zend_ast_destroy(zend_ast *ast)
zend_string_release_ex(decl->doc_comment, 0);
}
if (decl->attributes) {
zend_array_ptr_dtor(decl->attributes);
zend_ast_destroy(decl->attributes);
}
zend_ast_destroy(decl->child[0]);
zend_ast_destroy(decl->child[1]);
Expand Down Expand Up @@ -1545,6 +1545,9 @@ static ZEND_COLD void zend_ast_export_ex(smart_str *str, zend_ast *ast, int prio
case ZEND_AST_CLASS_CONST_DECL:
smart_str_appends(str, "const ");
goto simple_list;
case ZEND_AST_CLASS_CONST_DECL_ATTRIBUTES:
zend_ast_export_ex(str, ast->child[0], 0, indent);
break;
case ZEND_AST_NAME_LIST:
zend_ast_export_name_list(str, (zend_ast_list*)ast, indent);
break;
Expand Down Expand Up @@ -2116,101 +2119,31 @@ ZEND_API ZEND_COLD zend_string *zend_ast_export(const char *prefix, zend_ast *as
return str.s;
}

ZEND_API void zend_ast_convert_to_object(zval *p, zend_ast *ast, zend_class_entry *ce)
{
if (ast->kind == ZEND_AST_CONSTANT) {
zend_string *name = zend_ast_get_constant_name(ast);
zval *zv = zend_get_constant_ex(name, ce, ast->attr);
if (UNEXPECTED(zv == NULL)) {
return;
}

ZVAL_COPY_OR_DUP(p, zv);
} else {
zval tmp;

if (UNEXPECTED(zend_ast_evaluate(&tmp, ast, ce) != SUCCESS)) {
return;
}

ZVAL_COPY_VALUE(p, &tmp);
}
}

zval *zend_ast_convert_attributes(HashTable *attributes, zend_class_entry *ce)
zend_ast * ZEND_FASTCALL zend_ast_with_attributes(zend_ast *ast, zend_ast *attr)
{
zval *val, tmp;
zval *res = emalloc(sizeof(zval));

array_init(res);

ZEND_HASH_FOREACH_VAL(attributes, val) {
if (Z_TYPE_P(val) == IS_CONSTANT_AST) {
zend_ast_convert_to_object(&tmp, Z_ASTVAL_P(val), ce);
zend_hash_next_index_insert(Z_ARRVAL_P(res), &tmp);
break;
} else {
if (Z_REFCOUNTED_P(val)) {
Z_ADDREF_P(val);
}
zend_hash_next_index_insert(Z_ARRVAL_P(res), val);
}
} ZEND_HASH_FOREACH_END();

return res;
}
ZEND_ASSERT(attr->kind == ZEND_AST_ATTRIBUTE_LIST);

void zend_ast_add_attribute(zend_ast *name, zend_ast *value) /* {{{ */
{
zval *val, tmp;
zend_string *key;

zval *zv = zend_ast_get_zval(name);
key = Z_STR_P(zv);

if (!CG(attributes)) {
ALLOC_HASHTABLE(CG(attributes));
zend_hash_init(CG(attributes), 8, NULL, ZVAL_PTR_DTOR, 0);
}

ZVAL_NULL(&tmp);
val = zend_hash_add(CG(attributes), key, &tmp);

if (!val) {
zend_error_noreturn(E_COMPILE_ERROR, "Redeclared attribute %s", ZSTR_VAL(key));
}

if (value) {
if (value->kind == ZEND_AST_ZVAL) {
zval *zv = zend_ast_get_zval(value);

ZVAL_COPY_VALUE(val, zv);
} else {
zend_const_expr_to_zval(&tmp, value);
ZVAL_COPY_VALUE(val, &tmp);
}
} else {
array_init(val);
}
}
/* }}} */

zend_ast *zend_ast_add_attribute_value(zend_ast *list_ast, zend_ast *val_ast) /* {{{ */
{
zval *list, *val, arr;

if (list_ast->kind == ZEND_AST_ZVAL) {
list = zend_ast_get_zval(list_ast);
if (Z_TYPE_P(list) != IS_ARRAY) {
array_init(&arr);
zend_hash_next_index_insert_new(Z_ARRVAL(arr), list);
ZVAL_ARR(list, Z_ARR(arr));
}

val = zend_ast_get_zval(val_ast);
zend_hash_next_index_insert_new(Z_ARRVAL_P(list), val);
switch (ast->kind) {
case ZEND_AST_FUNC_DECL:
case ZEND_AST_CLOSURE:
case ZEND_AST_METHOD:
case ZEND_AST_CLASS:
case ZEND_AST_ARROW_FUNC:
((zend_ast_decl *) ast)->attributes = attr;
break;
case ZEND_AST_PROP_GROUP:
ast->child[2] = attr;
break;
case ZEND_AST_PARAM:
ast->child[3] = attr;
break;
case ZEND_AST_CLASS_CONST_DECL:
ast = zend_ast_create(ZEND_AST_CLASS_CONST_DECL_ATTRIBUTES, ast, attr);
ast->lineno = ast->child[0]->lineno;
break;
default:
zend_error_noreturn(E_COMPILE_ERROR, "Invalid use of attributes");
}

return list_ast;
return ast;
}
/* }}} */
20 changes: 11 additions & 9 deletions Zend/zend_ast.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ enum _zend_ast_kind {
ZEND_AST_TRAIT_ADAPTATIONS,
ZEND_AST_USE,
ZEND_AST_TYPE_UNION,
ZEND_AST_ATTRIBUTE_LIST,

/* 0 child nodes */
ZEND_AST_MAGIC_CONST = 0 << ZEND_AST_NUM_CHILDREN_SHIFT,
Expand Down Expand Up @@ -138,7 +139,8 @@ enum _zend_ast_kind {
ZEND_AST_USE_ELEM,
ZEND_AST_TRAIT_ALIAS,
ZEND_AST_GROUP_USE,
ZEND_AST_PROP_GROUP,
ZEND_AST_CLASS_CONST_DECL_ATTRIBUTES,
ZEND_AST_ATTRIBUTE,

/* 3 child nodes */
ZEND_AST_METHOD_CALL = 3 << ZEND_AST_NUM_CHILDREN_SHIFT,
Expand All @@ -147,13 +149,14 @@ enum _zend_ast_kind {

ZEND_AST_TRY,
ZEND_AST_CATCH,
ZEND_AST_PARAM,
ZEND_AST_PROP_GROUP,
ZEND_AST_PROP_ELEM,
ZEND_AST_CONST_ELEM,

/* 4 child nodes */
ZEND_AST_FOR = 4 << ZEND_AST_NUM_CHILDREN_SHIFT,
ZEND_AST_FOREACH,
ZEND_AST_PROP_ELEM,
ZEND_AST_CONST_ELEM,
ZEND_AST_PARAM,
};

typedef uint16_t zend_ast_kind;
Expand Down Expand Up @@ -191,7 +194,7 @@ typedef struct _zend_ast_decl {
uint32_t flags;
unsigned char *lex_pos;
zend_string *doc_comment;
HashTable *attributes;
zend_ast *attributes;
zend_string *name;
zend_ast *child[4];
} zend_ast_decl;
Expand Down Expand Up @@ -270,7 +273,7 @@ ZEND_API zend_ast *zend_ast_create_list(uint32_t init_children, zend_ast_kind ki
ZEND_API zend_ast * ZEND_FASTCALL zend_ast_list_add(zend_ast *list, zend_ast *op);

ZEND_API zend_ast *zend_ast_create_decl(
zend_ast_kind kind, uint32_t flags, uint32_t start_lineno, zend_string *doc_comment, HashTable *attributes,
zend_ast_kind kind, uint32_t flags, uint32_t start_lineno, zend_string *doc_comment,
zend_string *name, zend_ast *child0, zend_ast *child1, zend_ast *child2, zend_ast *child3
);

Expand Down Expand Up @@ -354,7 +357,6 @@ static zend_always_inline zend_ast *zend_ast_list_rtrim(zend_ast *ast) {
return ast;
}

void zend_ast_add_attribute(zend_ast *name, zend_ast *value);
zend_ast *zend_ast_add_attribute_value(zend_ast *list_ast, zend_ast *val_ast);
zval *zend_ast_convert_attributes(HashTable *attributes, zend_class_entry *ce);
zend_ast * ZEND_FASTCALL zend_ast_with_attributes(zend_ast *ast, zend_ast *attr);

#endif
Loading