Merge branch 'slimconfigure'

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

diff --git a/src/types/decl_struct.c b/src/types/decl_struct.c
index 973f6333537163134e900ceda726596858c60720..d5309b9cb041d95337bfe3cbd3db0286bed78f5b 100644 (file)
--- a/src/types/decl_struct.c
+++ b/src/types/decl_struct.c
@@ -79,26 +79,29 @@ 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;
        struct psi_decl_arg *darg, *prev_arg;
 
-       if (psi_validate_stack_has_struct(type_stack, s->name)) {
+       if (!s) {
+               return false;
+       }
+       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);
                return false;
        }
 
+       psi_validate_scope_add_struct(scope, s->name, s);
+
        for (i = 0; psi_plist_get(s->args, i, &darg); ++i) {
                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;
                }
 
@@ -110,6 +113,7 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
                                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);
+                               psi_validate_scope_del_struct(scope, s->name);
                                return false;
                        }
 
@@ -128,7 +132,7 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
                        }
                } else {
                        if (i) {
-                               if (prev_arg->layout->bfw && darg->layout->bfw) {
+                               if (prev_arg->layout && prev_arg->layout->bfw && darg->layout && darg->layout->bfw) {
                                        struct psi_decl_type *real = NULL;
                                        size_t max_bfw = 8 * psi_decl_type_get_size(prev_arg->type, &real);
 
@@ -145,6 +149,7 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
                                        default:
                                                data->error(data, darg->token, PSI_WARNING,
                                                                "Unsupported type for bit field: %s", real->name);
+                                               psi_validate_scope_del_struct(scope, s->name);
                                                return false;
                                        }
                                        darg->layout->bfw->pos = prev_arg->layout->bfw->pos + prev_arg->layout->bfw->len;
@@ -193,11 +198,16 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
                }
        }
 
+       assert(s->size);
+
        return true;
 }
 
 size_t psi_decl_struct_get_align(struct psi_decl_struct *s)
 {
+       if (!s) {
+               return 0;
+       }
        if (!s->align) {
                s->align = psi_decl_type_get_args_align(s->args);
        }