X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_union.c;h=5d0f1631a8f77788221a6f77e72d283abc854ced;hp=1d24f95e5f9d3dd45a989de69eb67a3f151639b9;hb=c9384515a81cb64d345b299908b2852f51bb8e6e;hpb=18ca609e4fa08a1c8fcdbb58e9aeb5fe55538b3c

diff --git a/src/types/decl_union.c b/src/types/decl_union.c
index 1d24f95..5d0f163 100644
--- a/src/types/decl_union.c
+++ b/src/types/decl_union.c
@@ -75,15 +75,14 @@ struct psi_decl_arg *psi_decl_union_get_arg(struct psi_decl_union *u,
 }
 
 bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u,
-		struct psi_validate_stack *type_stack)
+		struct psi_validate_scope *scope)
 {
 	size_t i, pos, len, size = 0, align;
 	struct psi_decl_arg *darg;
 
-	if (psi_validate_stack_has_union(type_stack, u->name)) {
+	if (psi_validate_scope_has_union(scope, u->name)) {
 		return true;
 	}
-	psi_validate_stack_add_union(type_stack, u->name, u);
 
 	if (!u->size && !psi_plist_count(u->args)) {
 		data->error(data, u->token, PSI_WARNING,
@@ -91,10 +90,13 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u,
 		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, type_stack)) {
+		if (!psi_decl_arg_validate(data, darg, scope)) {
+			psi_validate_scope_del_union(scope, u->name);
 			return false;
 		}
 
@@ -147,6 +149,8 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u,
 		u->size = psi_align(size, u->align);
 	}
 
+	assert(u->size);
+
 	return true;
 }