X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_arg.c;h=0423c9728fb4ab6355bb821a2a23f4e55b5323b3;hp=ba77e791bcdaa6b118148ac2decbd0f3c4238aa2;hb=9cb932e13dc98db9d72ac37f6ed11cd76634d37b;hpb=42f44eb5bf4ecd36e26e051fada79d861d0f92d2

diff --git a/src/types/decl_arg.c b/src/types/decl_arg.c
index ba77e79..0423c97 100644
--- a/src/types/decl_arg.c
+++ b/src/types/decl_arg.c
@@ -92,20 +92,37 @@ void psi_decl_arg_dump(int fd, struct psi_decl_arg *arg, unsigned level)
 	}
 }
 
-bool psi_decl_arg_validate(struct psi_data *data, struct psi_decl_arg *arg)
+bool psi_decl_arg_validate(struct psi_data *data, struct psi_decl_arg *arg,
+		struct psi_validate_stack *type_stack)
 {
-	if (!psi_decl_type_validate(data, arg->type, NULL)) {
-		data->error(data, arg->type->token, PSI_WARNING,
-				"Cannot use '%s' as type for '%s': %s", arg->type->name,
-				arg->var->name, data->last_error);
-		return false;
+	if (!psi_decl_type_validate(data, arg->type, arg->var->pointer_level, type_stack)) {
+		 if (!arg->var->pointer_level) {
+			data->error(data, arg->type->token, PSI_WARNING,
+					"Cannot use '%s' as type for '%s'%s%s", arg->type->name,
+					arg->var->name, *data->last_error ? ": " : "", data->last_error);
+			return false;
+		 }
 	}
 	return true;
 }
 
-bool psi_decl_arg_validate_typedef(struct psi_data *data, struct psi_decl_arg *def)
+bool psi_decl_arg_validate_typedef(struct psi_data *data,
+		struct psi_decl_arg *def, struct psi_validate_stack *type_stack)
 {
-	if (!psi_decl_type_validate(data, def->type, def)) {
+	if (psi_validate_stack_has_type(type_stack, def->var->name)) {
+		return true;
+	}
+	psi_validate_stack_add_type(type_stack, def->var->name, def);
+
+	if (def->type->type == PSI_T_VOID) {
+		if (def->var->pointer_level) {
+			def->type->type = PSI_T_POINTER;
+		} else {
+			data->error(data, def->token, PSI_WARNING,
+					"Type '%s' cannot be aliased to 'void'", def->type->name);
+			return false;
+		}
+	} else if (!psi_decl_type_validate(data, def->type, def->var->pointer_level, type_stack)) {
 		const char *pre;
 
 		switch (def->type->type) {
@@ -123,19 +140,10 @@ bool psi_decl_arg_validate_typedef(struct psi_data *data, struct psi_decl_arg *d
 			break;
 		}
 		data->error(data, def->token, PSI_WARNING,
-				"Type '%s' cannot be aliased to '%s%s': %s", def->var->name, pre,
-				def->type->name, data->last_error);
+				"Type '%s' cannot be aliased to '%s%s'%s%s", def->var->name, pre,
+				def->type->name, *data->last_error ? ": " : "", data->last_error);
 		return false;
 	}
-	if (def->type->type == PSI_T_VOID) {
-		if (def->var->pointer_level) {
-			def->type->type = PSI_T_POINTER;
-		} else {
-			data->error(data, def->token, PSI_WARNING,
-					"Type '%s' cannot be aliased to 'void'", def->type->name);
-			return false;
-		}
-	}
 
 	return true;
 }
@@ -144,10 +152,10 @@ size_t psi_decl_arg_align(struct psi_decl_arg *darg, size_t *pos, size_t *len)
 {
 	size_t align = psi_decl_arg_get_align(darg);
 
-	assert(align > 0);
-
-	*len = psi_decl_arg_get_size(darg);
-	*pos = psi_align(align, *pos);
+	if (align) {
+		*len = psi_decl_arg_get_size(darg);
+		*pos = psi_align(align, *pos);
+	}
 
 	return align;
 }
@@ -157,7 +165,7 @@ size_t psi_decl_arg_get_align(struct psi_decl_arg *darg)
 	size_t align;
 
 	if (darg->var->pointer_level
-			&& (!darg->var->array_size || darg->var->pointer_level > 2)) {
+			&& (!darg->var->array_size || darg->var->pointer_level > 1)) {
 		align = psi_t_alignment(PSI_T_POINTER);
 	} else {
 		align = psi_decl_type_get_align(darg->type);
@@ -172,7 +180,7 @@ size_t psi_decl_arg_get_size(struct psi_decl_arg *darg)
 	struct psi_decl_type *real = psi_decl_type_get_real(darg->type);
 
 	if (darg->var->array_size) {
-		if (darg->var->pointer_level > 2) {
+		if (darg->var->pointer_level > 1) {
 			size = psi_t_size(PSI_T_POINTER) * darg->var->array_size;
 		} else {
 			size = psi_t_size(real->type) * darg->var->array_size;