X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_type.c;h=73e89595a36717288a516697d37908a96cab1777;hb=31cfe5e5e1bd44d408c5869e63fcc7419e81c294;hp=590c8eea126896150c512456c6cb88272118d9a1;hpb=42f44eb5bf4ecd36e26e051fada79d861d0f92d2;p=m6w6%2Fext-psi

diff --git a/src/types/decl_type.c b/src/types/decl_type.c
index 590c8ee..73e8959 100644
--- a/src/types/decl_type.c
+++ b/src/types/decl_type.c
@@ -213,36 +213,53 @@ bool psi_decl_type_get_decl(struct psi_decl_type *type, struct psi_plist *decls)
 }
 
 bool psi_decl_type_validate(struct psi_data *data, struct psi_decl_type *type,
-		struct psi_decl_arg *def)
+		struct psi_validate_stack *type_stack)
 {
 	if (psi_decl_type_is_weak(type)) {
 		if (!psi_decl_type_get_alias(type, data->types)) {
-			return false;
+			if (!psi_validate_stack_has_type(type_stack, type->name)) {
+				return false;
+			}
+			type->real.def = psi_validate_stack_get_type(type_stack, type->name);
 		}
 		if (type->real.def) {
 			return psi_decl_type_validate(data, type->real.def->type,
-					type->real.def);
+					type_stack);
 		}
 		return true;
 	}
 
 	switch (type->type) {
 	case PSI_T_STRUCT:
-		if (!psi_decl_type_get_struct(type, data->structs) && !def) {
-			data->error(data, type->token, PSI_WARNING,
-					"Unknown struct '%s'", type->name);
+		if (!psi_decl_type_get_struct(type, data->structs)) {
+			if (psi_validate_stack_has_struct(type_stack, type->name)) {
+				type->real.strct = psi_validate_stack_get_struct(type_stack, type->name);
+			} else {
+				data->error(data, type->token, PSI_WARNING,
+						"Unknown struct '%s'", type->name);
+				return false;
+			}
+		}
+		if (!psi_decl_struct_validate(data, type->real.strct, type_stack)) {
 			return false;
 		}
 		break;
 	case PSI_T_UNION:
-		if (!psi_decl_type_get_union(type, data->unions) && !def) {
-			data->error(data, type->token, PSI_WARNING,
-					"Unknown union '%s'", type->name);
+		if (!psi_decl_type_get_union(type, data->unions)) {
+			if (psi_validate_stack_has_union(type_stack, type->name)) {
+				type->real.unn = psi_validate_stack_get_union(type_stack, type->name);
+			} else {
+				data->error(data, type->token, PSI_WARNING,
+						"Unknown union '%s'", type->name);
+				return false;
+			}
+		}
+		if (!psi_decl_union_validate(data, type->real.unn, type_stack)) {
 			return false;
 		}
 		break;
 	case PSI_T_ENUM:
-		if (!psi_decl_type_get_enum(type, data->enums) && !def) {
+		if (!psi_decl_type_get_enum(type, data->enums)) {
 			data->error(data, type->token, PSI_WARNING,
 					"Unknown enum '%s'", type->name);
 			return false;
@@ -254,11 +271,14 @@ bool psi_decl_type_validate(struct psi_data *data, struct psi_decl_type *type,
 					"Unknown decl '%s'", type->name);
 			return false;
 		}
-		if (!psi_decl_validate_nodl(data, type->real.func)) {
+		if (!psi_decl_validate_nodl(data, type->real.func, type_stack)) {
 			return false;
 		}
 		break;
+	default:
+		break;
 	}
+
 	return true;
 }
 
@@ -275,6 +295,9 @@ void psi_decl_type_dump_args_with_layout(int fd, struct psi_plist *args,
 		while (psi_plist_get(args, i++, &sarg)) {
 			dprintf(fd, "%s", psi_t_indent(level));
 			psi_decl_arg_dump(fd, sarg, level);
+			if (sarg->layout->bfw) {
+				dprintf(fd, ":%zu", sarg->layout->bfw->len);
+			}
 			dprintf(fd, "::(%zu, %zu);\n", sarg->layout->pos,
 					sarg->layout->len);
 		}