return NULL;
}
-bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
+bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u,
+ struct psi_validate_scope *scope)
{
size_t i, pos, len, size = 0, align;
struct psi_decl_arg *darg;
+ if (psi_validate_scope_has_union(scope, u->name)) {
+ return true;
+ }
+
if (!u->size && !psi_plist_count(u->args)) {
data->error(data, u->token, PSI_WARNING,
"Cannot compute size of empty union %s", u->name);
return false;
}
+ psi_validate_scope_add_union(scope, u->name, u);
+
for (i = 0; psi_plist_get(u->args, i, &darg); ++i) {
darg->var->arg = darg;
- if (!psi_decl_arg_validate(data, darg)) {
+ if (!psi_decl_arg_validate(data, darg, scope)) {
+ psi_validate_scope_del_union(scope, u->name);
return false;
}
u->size = psi_align(size, u->align);
}
+ assert(u->size);
+
return true;
}