X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes%2Fdecl_arg.c;h=46ce8e01942d9dc0b248333d9d79c6d4ecde880c;hp=1c29619862cdb44cdf77c0d90bb2bd0117a79f7c;hb=c9384515a81cb64d345b299908b2852f51bb8e6e;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84

diff --git a/src/types/decl_arg.c b/src/types/decl_arg.c
index 1c29619..46ce8e0 100644
--- a/src/types/decl_arg.c
+++ b/src/types/decl_arg.c
@@ -61,9 +61,10 @@ void psi_decl_arg_dump(int fd, struct psi_decl_arg *arg, unsigned level)
 {
 	if (arg->type->type == PSI_T_FUNCTION) {
 		psi_decl_type_dump(fd, arg->type->real.func->func->type, level);
-		dprintf(fd, " (*");
-		psi_decl_var_dump(fd, arg->var);
-		dprintf(fd, ")(");
+		dprintf(fd, " %s(*%s)",
+				psi_t_indirection(arg->var->pointer_level - !! arg->var->array_size),
+				arg->var->name);
+		dprintf(fd, "(");
 		if (arg->type->real.func->args) {
 			size_t j = 0;
 			struct psi_decl_arg *farg;
@@ -81,6 +82,9 @@ void psi_decl_arg_dump(int fd, struct psi_decl_arg *arg, unsigned level)
 			}
 		}
 		dprintf(fd, ")");
+		if (arg->var->array_size) {
+			dprintf(fd, "[%u]", arg->var->array_size);
+		}
 	} else {
 		psi_decl_type_dump(fd, arg->type, level);
 		dprintf(fd, " ");
@@ -88,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_scope *scope)
 {
-	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, scope)) {
+		 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_scope *scope)
 {
-	if (!psi_decl_type_validate(data, def->type, def)) {
+	if (psi_validate_scope_has_type(scope, def->var->name)) {
+		return true;
+	}
+	psi_validate_scope_add_type(scope, 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, scope)) {
 		const char *pre;
 
 		switch (def->type->type) {
@@ -119,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;
 }
@@ -140,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;
 }
@@ -153,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);
@@ -167,13 +179,9 @@ size_t psi_decl_arg_get_size(struct psi_decl_arg *darg)
 	size_t size;
 	struct psi_decl_type *real = psi_decl_type_get_real(darg->type);
 
-	if (darg->var->array_size) {
-		if (darg->var->pointer_level > 2) {
-			size = psi_t_size(PSI_T_POINTER) * darg->var->array_size;
-		} else {
-			size = psi_t_size(real->type) * darg->var->array_size;
-		}
-	} else if (darg->var->pointer_level) {
+	if (darg->var->array_size && darg->var->pointer_level > 1) {
+		size = psi_t_size(PSI_T_POINTER) * darg->var->array_size;
+	} else if (!darg->var->array_size && darg->var->pointer_level) {
 		size = psi_t_size(PSI_T_POINTER);
 	} else {
 		switch (real->type) {
@@ -188,6 +196,10 @@ size_t psi_decl_arg_get_size(struct psi_decl_arg *darg)
 			size = psi_t_size(real->type);
 			break;
 		}
+
+		if (darg->var->array_size) {
+			size *= darg->var->array_size;
+		}
 	}
 
 	return size;