X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_struct.c;h=35818b2d557167d2a494ca7cfa8333dbacac393f;hp=a636115d3412087525b29b5dea5556d36c7ccdab;hb=9aeae2c241e303c537d8be18dd6c9f8776b2f044;hpb=6708d7f169e6675203bf63568d40e888a4f4e209

diff --git a/src/types/decl_struct.c b/src/types/decl_struct.c
index a636115..35818b2 100644
--- a/src/types/decl_struct.c
+++ b/src/types/decl_struct.c
@@ -79,29 +79,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;
 	}
 
 	if (!s->size && !psi_plist_count(s->args)) {
+		/* 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_stack_add_struct(type_stack, s->name, s);
+	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)) {
-			psi_validate_stack_del_struct(type_stack, s->name);
+		if (!psi_decl_arg_validate(data, darg, scope)) {
+			psi_validate_scope_del_struct(scope, s->name);
 			return false;
 		}
 
@@ -113,7 +120,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_stack_del_struct(type_stack, s->name);
+				psi_validate_scope_del_struct(scope, s->name);
 				return false;
 			}
 
@@ -149,7 +156,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_stack_del_struct(type_stack, s->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;
@@ -189,6 +196,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);