more verbose context ops

[m6w6/ext-psi] / src / types / decl_struct.c

diff --git a/src/types/decl_struct.c b/src/types/decl_struct.c
index 9ba53e97348a3856dc0d98e806b140a889068bd7..d2a211d5c467596e4c079a96903b5401d6f4b354 100644 (file)
--- a/src/types/decl_struct.c
+++ b/src/types/decl_struct.c
@@ -28,11 +28,11 @@
 
 #include <assert.h>
 
-struct psi_decl_struct* psi_decl_struct_init(const char *name,
+struct psi_decl_struct* psi_decl_struct_init(zend_string *name,
                struct psi_plist *args)
 {
-       struct psi_decl_struct *s = calloc(1, sizeof(*s));
-       s->name = strdup(name);
+       struct psi_decl_struct *s = pecalloc(1, sizeof(*s), 1);
+       s->name = zend_string_copy(name);
        s->args = args;
        return s;
 }
@@ -43,28 +43,23 @@ void psi_decl_struct_free(struct psi_decl_struct **s_ptr)
                struct psi_decl_struct *s = *s_ptr;
 
                *s_ptr = NULL;
-               if (s->token) {
-                       free(s->token);
-               }
+               psi_token_free(&s->token);
                if (s->args) {
                        psi_plist_free(s->args);
                }
-               if (s->engine.type && s->engine.dtor) {
-                       s->engine.dtor(s->engine.type);
-               }
-               free(s->name);
+               zend_string_release(s->name);
                free(s);
        }
 }
 
-void psi_decl_struct_dump(int fd, struct psi_decl_struct *strct)
+void psi_decl_struct_dump(struct psi_dump *dump, struct psi_decl_struct *strct)
 {
-       dprintf(fd, "struct %s::(%zu, %zu)", strct->name, strct->align,
+       PSI_DUMP(dump, "struct %s::(%zu, %zu)", strct->name->val, strct->align,
                        strct->size);
        if (psi_plist_count(strct->args)) {
-               psi_decl_type_dump_args_with_layout(fd, strct->args, 0);
+               psi_decl_type_dump_args_with_layout(dump, strct->args, 0);
        } else {
-               dprintf(fd, ";");
+               PSI_DUMP(dump, ";");
        }
 }
 
@@ -79,29 +74,36 @@ struct psi_decl_arg *psi_decl_struct_get_arg(struct psi_decl_struct *s,
 }
 
 bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
-               struct psi_validate_stack *type_stack)
+               struct psi_validate_scope *scope)
 {
-       size_t i, pos, len, size, align;
+       size_t i, pos = 0, len = 0;
        struct psi_decl_arg *darg, *prev_arg;
 
        if (!s) {
                return false;
        }
-       if (psi_validate_stack_has_struct(type_stack, s->name)) {
+       if (psi_validate_scope_has_struct(scope, s->name)) {
                return true;
        }
-       psi_validate_stack_add_struct(type_stack, s->name, s);
 
        if (!s->size && !psi_plist_count(s->args)) {
-               data->error(data, s->token, PSI_WARNING,
-                               "Cannot compute size of empty struct '%s'", s->name);
+               /* TODO: return true and check those structs are only used by address */
+               /* suppress needless warning
+               data->error(data, s->token, PSI_WARNING, "Empty struct %s",
+                               s->name);
+                               */
                return false;
        }
 
+       psi_validate_scope_add_struct(scope, s->name, s);
+
        for (i = 0; psi_plist_get(s->args, i, &darg); ++i) {
+               size_t align;
+
                darg->var->arg = darg;
 
-               if (!psi_decl_arg_validate(data, darg, type_stack)) {
+               if (!psi_decl_arg_validate(data, darg, scope)) {
+                       psi_validate_scope_del_struct(scope, s->name);
                        return false;
                }
 
@@ -112,7 +114,9 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
                        if (!align) {
                                data->error(data, darg->token, PSI_WARNING,
                                                "Computed zero alignment of %s.%s of type '%s'",
-                                               len, s->name, darg->var->name, darg->type->name);
+                                               len, s->name->val, darg->var->name->val,
+                                               darg->type->name->val);
+                               psi_validate_scope_del_struct(scope, s->name);
                                return false;
                        }
 
@@ -120,14 +124,15 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
                                data->error(data, darg->token, PSI_WARNING,
                                                "Computed size %zu of %s.%s does not match"
                                                " pre-defined size %zu of type '%s'",
-                                               len, s->name, darg->var->name, darg->layout->len,
-                                               darg->type->name);
+                                               len, s->name->val, darg->var->name->val,
+                                               darg->layout->len, darg->type->name->val);
                        }
                        if (darg->layout->pos != pos) {
                                data->error(data, darg->token, PSI_WARNING,
                                                "Computed offset %zu of %s.%s does not match"
                                                " pre-defined offset %zu",
-                                               pos, s->name, darg->var->name, darg->layout->pos);
+                                               pos, s->name->val, darg->var->name->val,
+                                               darg->layout->pos);
                        }
                } else {
                        if (i) {
@@ -147,7 +152,9 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
                                                break;
                                        default:
                                                data->error(data, darg->token, PSI_WARNING,
-                                                               "Unsupported type for bit field: %s", real->name);
+                                                               "Unsupported type for bit field: %s",
+                                                               real->name->val);
+                                               psi_validate_scope_del_struct(scope, s->name);
                                                return false;
                                        }
                                        darg->layout->bfw->pos = prev_arg->layout->bfw->pos + prev_arg->layout->bfw->len;
@@ -167,11 +174,12 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
                        align = psi_decl_arg_align(darg, &pos, &len);
 
                        if (darg->layout) {
-                               if (darg->layout->pos != pos) {
+                               if (darg->layout->pos != pos && !darg->layout->bfw) {
                                        data->error(data, darg->token, PSI_WARNING,
                                                        "Computed offset %zu of %s.%s does not match"
                                                        " pre-defined offset %zu",
-                                                       pos, s->name, darg->var->name, darg->layout->pos);
+                                                       pos, s->name->val, darg->var->name->val,
+                                                       darg->layout->pos);
                                }
                                darg->layout->pos = pos;
                                darg->layout->len = len;
@@ -187,6 +195,8 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
        }
 
        if (psi_plist_count(s->args)) {
+               size_t size;
+
                psi_plist_sort(s->args, psi_layout_sort_cmp, NULL);
                psi_plist_get(s->args, psi_plist_count(s->args) - 1, &darg);
 
@@ -196,6 +206,8 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
                }
        }
 
+       assert(s->size);
+
        return true;
 }