}
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;
}
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;
}
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;
}
}
+ 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);
}