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

diff --git a/src/types/decl_arg.c b/src/types/decl_arg.c
index ba77e79..9c57168 100644
--- a/src/types/decl_arg.c
+++ b/src/types/decl_arg.c
@@ -61,6 +61,9 @@ 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);
+		if (arg->type->real.func->func->type->type == PSI_T_FUNCTION) {
+			dprintf(fd, "(");
+		}
 		dprintf(fd, " %s(*%s)",
 				psi_t_indirection(arg->var->pointer_level - !! arg->var->array_size),
 				arg->var->name);
@@ -82,6 +85,26 @@ void psi_decl_arg_dump(int fd, struct psi_decl_arg *arg, unsigned level)
 			}
 		}
 		dprintf(fd, ")");
+		if (arg->type->real.func->func->type->type == PSI_T_FUNCTION) {
+			struct psi_decl *decl = arg->type->real.func->func->type->real.func;
+
+			dprintf(fd, "(");
+			if (decl->args) {
+				size_t i;
+				struct psi_decl_arg *arg;
+
+				for (i = 0; psi_plist_get(decl->args, i, &arg); ++i) {
+					if (i) {
+						dprintf(fd, ", ");
+					}
+					psi_decl_arg_dump(fd, arg, 0);
+				}
+				if (decl->varargs) {
+					dprintf(fd, ", ...");
+				}
+			}
+			dprintf(fd, "))");
+		}
 		if (arg->var->array_size) {
 			dprintf(fd, "[%u]", arg->var->array_size);
 		}
@@ -92,20 +115,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) {
@@ -123,19 +163,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 +175,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 +188,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);
@@ -171,13 +202,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) {
@@ -192,6 +219,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;