X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext_validate.c;h=56d7b2ea43eab6caad086c2cdd1dea03be010b09;hp=01dbfb7eca2cfc81f98d163cc6ef7f271d076ea9;hb=8b652242a4ef920f2ab82bfb822596de25bc5a63;hpb=ed5ebb3caac1ac8bf6a4b32eabfb523f23de8576

diff --git a/src/context_validate.c b/src/context_validate.c
index 01dbfb7..56d7b2e 100644
--- a/src/context_validate.c
+++ b/src/context_validate.c
@@ -1,4 +1,4 @@
-	#ifdef HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
@@ -28,13 +28,13 @@ static int validate_lib(PSI_Data *data, void **dlopened) {
 	} else if (!strchr(ptr, '/')) {
 		len = snprintf(lib, MAXPATHLEN, "lib%s.%s", ptr, PHP_PSI_SHLIB_SUFFIX);
 		if (MAXPATHLEN == len) {
-			data->error(NULL, PSI_WARNING, "Library name too long: '%s'", ptr);
+			data->error(data, NULL, PSI_WARNING, "Library name too long: '%s'", ptr);
 		}
 		lib[len] = 0;
 		ptr = lib;
 	}
 	if (!(*dlopened = dlopen(ptr, RTLD_LAZY|RTLD_LOCAL))) {
-		data->error(NULL, PSI_WARNING, "Could not open library '%s': %s.",
+		data->error(data, NULL, PSI_WARNING, "Could not open library '%s': %s.",
 				data->psi.file.ln, dlerror());
 		return 0;
 	}
@@ -148,12 +148,15 @@ static inline int validate_decl_type(PSI_Data *data, decl_type *type) {
 }
 static inline int validate_decl_typedef(PSI_Data *data, decl_arg *def) {
 	if (!validate_decl_type(data, def->type)) {
-		data->error(def->token, PSI_WARNING,
+		data->error(data, def->token, PSI_WARNING,
 			"Type '%s' cannot be aliased to %s'%s'",
 			def->type->name, def->type->type == PSI_T_STRUCT?"struct ":"",
 			def->var->name);
 		return 0;
 	}
+	if (def->type->type == PSI_T_VOID && def->var->pointer_level) {
+		def->type->type = PSI_T_POINTER;
+	}
 	return 1;
 }
 
@@ -164,7 +167,7 @@ static inline int validate_constant(PSI_Data *data, constant *c) {
 
 static inline int validate_decl_arg(PSI_Data *data, decl_arg *arg) {
 	if (!validate_decl_type(data, arg->type)) {
-		data->error(arg->type->token, PSI_WARNING,
+		data->error(data, arg->type->token, PSI_WARNING,
 			"Cannot use '%s' as type for '%s'",
 			arg->type->name, arg->var->name);
 		return 0;
@@ -201,22 +204,31 @@ static inline void psi_sort_struct_args(void **args, size_t count) {
 			psi_sort_struct_arg_cmp, psi_sort_struct_arg_swp);
 }
 
-static inline int validate_decl_struct_darg(PSI_Data *data, decl_arg *darg) {
+static inline int validate_decl_struct_darg(PSI_Data *data, decl_arg *darg, void *current) {
 	decl_type *real = real_decl_type(darg->type);
 
 	/* pre-validate any structs/unions/enums */
 	switch (real->type) {
 	case PSI_T_STRUCT:
+		if (current && current == real->strct) {
+			return 1;
+		}
 		if (!validate_decl_struct(data, real->strct)) {
 			return 0;
 		}
 		break;
 	case PSI_T_UNION:
+		if (current && current == real->unn) {
+			return 1;
+		}
 		if (!validate_decl_union(data, real->unn)) {
 			return 0;
 		}
 		break;
 	case PSI_T_ENUM:
+		if (current && current == real->enm) {
+			return 1;
+		}
 		if (!validate_decl_enum(data, real->enm)) {
 			return 0;
 		}
@@ -253,30 +265,81 @@ static inline size_t sizeof_decl_arg(decl_arg *darg) {
 		}
 	}
 
+	ZEND_ASSERT(size);
+
 	return size;
 }
 
-static inline size_t align_decl_arg(decl_arg *darg, size_t *pos, size_t *len) {
+static inline size_t alignof_decl_type(decl_type *t);
+static inline size_t alignof_decl_arg(decl_arg *darg);
+static inline size_t alignof_decl_union(decl_union *u);
+static inline size_t alignof_decl_struct(decl_struct *s);
+
+static inline size_t alignof_decl_args(decl_args *args) {
+	size_t i, maxalign = 0;
+
+	for (i = 0; i < args->count; ++i) {
+		decl_arg *darg = args->args[i];
+		size_t align = alignof_decl_arg(darg);
+
+		if (align > maxalign) {
+			maxalign = align;
+		}
+	}
+
+	return maxalign;
+}
+
+static inline size_t alignof_decl_struct(decl_struct *s) {
+	if (!s->align) {
+		s->align = alignof_decl_args(s->args);
+	}
+	return s->align;
+}
+
+static inline size_t alignof_decl_union(decl_union *u) {
+	if (!u->align) {
+		u->align = alignof_decl_args(u->args);
+	}
+	return u->align;
+}
+
+static inline size_t alignof_decl_type(decl_type *t) {
+	decl_type *real = real_decl_type(t);
+	size_t align;
+
+	switch (real->type) {
+	case PSI_T_STRUCT:
+		align = alignof_decl_struct(real->strct);
+		break;
+	case PSI_T_UNION:
+		align = alignof_decl_union(real->unn);
+		break;
+	case PSI_T_ENUM:
+	default:
+		align = psi_t_alignment(real->type);
+	}
+
+	return align;
+}
+
+static inline size_t alignof_decl_arg(decl_arg *darg) {
 	size_t align;
 
 	if (darg->var->pointer_level && (!darg->var->array_size || darg->var->pointer_level > 2)) {
 		align = psi_t_alignment(PSI_T_POINTER);
 	} else {
-		decl_type *real = real_decl_type(darg->type);
-
-		switch (real->type) {
-		case PSI_T_STRUCT:
-			align = real->strct->align;
-			break;
-		case PSI_T_UNION:
-			align = real->unn->align;
-			break;
-		default:
-			align = psi_t_alignment(real->type);
-			break;
-		}
+		align = alignof_decl_type(darg->type);
 	}
 
+	return align;
+}
+
+static inline size_t align_decl_arg(decl_arg *darg, size_t *pos, size_t *len) {
+	size_t align = alignof_decl_arg(darg);
+
+	ZEND_ASSERT(align);
+
 	*len = sizeof_decl_arg(darg);
 	*pos = psi_align(align, *pos);
 
@@ -287,7 +350,7 @@ static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
 	size_t i, pos, len, size, align;
 
 	if (!s->size && !s->args->count) {
-		data->error(s->token, PSI_WARNING,
+		data->error(data, s->token, PSI_WARNING,
 				"Cannot compute size of empty struct %s",
 				s->name);
 		return 0;
@@ -303,29 +366,27 @@ static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
 		ZEND_ASSERT(!darg->var->arg || darg->var->arg == darg);
 		darg->var->arg = darg;
 
-		if (darg->layout) {
+		if (!validate_decl_struct_darg(data, darg, s)) {
+			return 0;
+		} else if (darg->layout) {
 			pos = darg->layout->pos;
 
 			align = align_decl_arg(darg, &pos, &len);
 
 			if (darg->layout->len != len) {
-				data->error(darg->token, PSI_WARNING,
+				data->error(data, darg->token, PSI_WARNING,
 						"Computed size %zu of %s.%s does not match"
 						" pre-defined size %zu of type '%s'",
-						darg->layout->len, s->name, darg->var->name, len,
+						len, s->name, darg->var->name, darg->layout->len,
 						darg->type->name);
-				return 0;
 			}
 			if (darg->layout->pos != pos) {
-				data->error(darg->token, PSI_WARNING,
+				data->error(data, darg->token, PSI_WARNING,
 						"Computed offset %zu of %s.%s does not match"
 						" pre-defined offset %zu",
-						darg->layout->len, s->name, darg->var->name, len);
-				return 0;
+						pos, s->name, darg->var->name, darg->layout->pos);
 			}
-		} else if (!validate_decl_struct_darg(data, darg)) {
-			return 0;
-		} else {
+		} else  {
 			if (i) {
 				pos = s->args->args[i-1]->layout->pos +
 						s->args->args[i-1]->layout->len;
@@ -357,10 +418,10 @@ static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
 }
 
 static inline int validate_decl_union(PSI_Data *data, decl_union *u) {
-	size_t i, pos, len, size, align;
+	size_t i, pos, len, size = 0, align;
 
 	if (!u->size && !u->args->count) {
-		data->error(u->token, PSI_WARNING,
+		data->error(data, u->token, PSI_WARNING,
 				"Cannot compute size of empty union %s",
 				u->name);
 		return 0;
@@ -376,27 +437,26 @@ static inline int validate_decl_union(PSI_Data *data, decl_union *u) {
 		ZEND_ASSERT(!darg->var->arg || darg->var->arg == darg);
 		darg->var->arg = darg;
 
-		if (darg->layout) {
+		if (!validate_decl_struct_darg(data, darg, u)) {
+			return 0;
+		} else if (darg->layout) {
 			pos = darg->layout->pos;
 
 			align = align_decl_arg(darg, &pos, &len);
 
 			if (darg->layout->pos != 0) {
-				data->error(darg->token, PSI_WARNING,
-						"Offset of %s.%s must be 0",
+				data->error(data, darg->token, PSI_WARNING,
+						"Offset of %s.%s should be 0",
 						u->name, darg->var->name);
-				return 0;
+				darg->layout->pos = 0;
 			}
 			if (darg->layout->len != len) {
-				data->error(darg->token, PSI_WARNING,
+				data->error(data, darg->token, PSI_WARNING,
 						"Computed size %zu of %s.%s does not match"
 						" pre-defined size %zu of type '%s'",
-						darg->layout->len, u->name, darg->var->name, size,
+						len, u->name, darg->var->name, darg->layout->len,
 						darg->type->name);
-				return 0;
 			}
-		} else if (!validate_decl_struct_darg(data, darg)) {
-			return 0;
 		} else {
 			pos = 0;
 
@@ -444,7 +504,7 @@ static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_
 	struct psi_func_redir *redir;
 
 	if (!strcmp(func->var->name, "dlsym")) {
-		data->error(func->token, PSI_WARNING, "Cannot dlsym dlsym (sic!)");
+		data->error(data, func->token, PSI_WARNING, "Cannot dlsym dlsym (sic!)");
 		return 0;
 	}
 
@@ -462,7 +522,7 @@ static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_
 #endif
 		decl->call.sym = dlsym(dl ?: RTLD_NEXT, func->var->name);
 		if (!decl->call.sym) {
-			data->error(func->token, PSI_WARNING,
+			data->error(data, func->token, PSI_WARNING,
 				"Failed to locate symbol '%s': %s",
 				func->var->name, dlerror() ?: "not found");
 		}
@@ -472,7 +532,7 @@ static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_
 
 static inline int validate_decl(PSI_Data *data, void *dl, decl *decl) {
 	if (!validate_decl_abi(data, decl->abi)) {
-		data->error(decl->abi->token, PSI_WARNING,
+		data->error(data, decl->abi->token, PSI_WARNING,
 				"Invalid calling convention: '%s'", decl->abi->token->text);
 		return 0;
 	}
@@ -581,7 +641,7 @@ static inline int validate_num_exp(PSI_Data *data, num_exp *exp, decl_args *darg
 	case PSI_T_NAME:
 		if (!locate_decl_var_arg(exp->u.dvar, dargs, func)) {
 			if (!locate_num_exp_enum_item(exp, data->enums) && !locate_num_exp_enum_item_ex(exp, enm)) {
-				data->error(exp->token, PSI_WARNING, "Unknown variable '%s' in numeric expression",
+				data->error(data, exp->token, PSI_WARNING, "Unknown variable '%s' in numeric expression",
 						exp->u.dvar->name);
 				return 0;
 			}
@@ -589,7 +649,7 @@ static inline int validate_num_exp(PSI_Data *data, num_exp *exp, decl_args *darg
 		return 1;
 	case PSI_T_NSNAME:
 		if (!locate_num_exp_constant(exp, data->consts)) {
-			data->error(exp->token, PSI_WARNING, "Unknown constant '%s' in numeric expression",
+			data->error(data, exp->token, PSI_WARNING, "Unknown constant '%s' in numeric expression",
 					exp->u.numb);
 			return 0;
 		}
@@ -606,7 +666,7 @@ static inline int validate_decl_enum(PSI_Data *data, decl_enum *e) {
 	size_t j;
 
 	if (!e->items || !e->items->count) {
-		data->error(e->token, PSI_WARNING, "Empty enum '%s'", e->name);
+		data->error(data, e->token, PSI_WARNING, "Empty enum '%s'", e->name);
 		return 0;
 	}
 
@@ -661,7 +721,6 @@ static inline int validate_set_value_handler(set_value *set) {
 		if (set->outer.set && set->outer.set->func->type == PSI_T_TO_ARRAY) {
 			set->func->handler = psi_to_recursive;
 			set->inner = set->outer.set->inner;
-			set->count = set->outer.set->count;
 			break;
 		}
 		/* no break */
@@ -689,14 +748,14 @@ static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg
 	decl_var *set_var = set->vars->vars[0];
 
 	if (!validate_set_value_handler(set)) {
-		data->error(set->func->token, PSI_WARNING, "Invalid cast '%s' in `set` statement", set->func->name);
+		data->error(data, set->func->token, PSI_WARNING, "Invalid cast '%s' in `set` statement", set->func->name);
 		return 0;
 	}
 
 	for (i = 0; i < set->vars->count; ++i) {
 		decl_var *svar = set->vars->vars[i];
 		if (!svar->arg && !locate_decl_var_arg(svar, ref_list, NULL)) {
-			data->error(svar->token, PSI_WARNING, "Unknown variable '%s' in `set` statement", svar->name);
+			data->error(data, svar->token, PSI_WARNING, "Unknown variable '%s' in `set` statement", svar->name);
 			return 0;
 		}
 	}
@@ -706,12 +765,12 @@ static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg
 	}
 	ref_type = real_decl_type(ref->type);
 
-	if (set->count) {
+	if (set->inner && set->inner->count) {
 		int is_to_array = (set->func->type == PSI_T_TO_ARRAY);
 		int is_pointer_to_struct = (ref_type->type == PSI_T_STRUCT && ref->var->pointer_level);
 
 		if (!is_to_array && !is_pointer_to_struct) {
-			data->error(set->func->token, E_WARNING, "Inner `set` statement casts only work with "
+			data->error(data, set->func->token, E_WARNING, "Inner `set` statement casts only work with "
 					"to_array() casts on structs or pointers: %s(%s...", set->func->name, set->vars->vars[0]->name);
 			return 0;
 		}
@@ -724,34 +783,34 @@ static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg
 
 	if (ref_type->type == PSI_T_STRUCT) {
 		/* to_array(struct, to_...) */
-		if (!set->outer.set || set->outer.set->inner != set->inner) {
-			for (i = 0; i < set->count; ++i) {
-				decl_var *sub_var = set->inner[i]->vars->vars[0];
+		if (!set->outer.set || set->outer.set->inner->vals != set->inner->vals) {
+			for (i = 0; i < set->inner->count; ++i) {
+				decl_var *sub_var = set->inner->vals[i]->vars->vars[0];
 				decl_arg *sub_ref = locate_struct_member(ref_type->strct, sub_var);
 
 				if (sub_ref) {
-					if (!validate_set_value_ex(data, set->inner[i], sub_ref, ref_type->strct->args)) {
+					if (!validate_set_value_ex(data, set->inner->vals[i], sub_ref, ref_type->strct->args)) {
 						return 0;
 					}
 				}
 			}
 		}
-	} else if (set->count == 1) {
+	} else if (set->inner && set->inner->count == 1) {
 		/* to_array(ptr, to_string(*ptr)) */
-		decl_var *sub_var = set->inner[0]->vars->vars[0];
+		decl_var *sub_var = set->inner->vals[0]->vars->vars[0];
 		decl_arg *sub_ref = locate_decl_var_arg(sub_var, ref_list, ref);
 
 		if (sub_ref) {
 			if (strcmp(sub_var->name, set_var->name)) {
-				data->error(sub_var->token, E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
+				data->error(data, sub_var->token, E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
 				return 0;
 			}
-			if (!validate_set_value_ex(data, set->inner[0], sub_ref, ref_list)) {
+			if (!validate_set_value_ex(data, set->inner->vals[0], sub_ref, ref_list)) {
 				return 0;
 			}
 		}
-	} else if (set->count > 1) {
-		data->error(set->func->token, E_WARNING, "Inner `set` statement casts on pointers may only occur once");
+	} else if (set->inner && set->inner->count > 1) {
+		data->error(data, set->func->token, E_WARNING, "Inner `set` statement casts on pointers may only occur once");
 		return 0;
 	}
 
@@ -793,12 +852,12 @@ static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
 	/* and which type cast to apply */
 	if (impl->stmts->ret.count != 1) {
 		if (impl->stmts->ret.count > 1) {
-			data->error(impl->stmts->ret.list[1]->token, PSI_WARNING,
+			data->error(data, impl->stmts->ret.list[1]->token, PSI_WARNING,
 					"Too many `return` statements for implmentation %s;"
 					" found %zu, exactly one is needed",
 					impl->func->name, impl->stmts->ret.count);
 		} else {
-			data->error(impl->func->token, PSI_WARNING,
+			data->error(data, impl->func->token, PSI_WARNING,
 					"Missing `return` statement for implementation %s",
 					impl->func->name);
 		}
@@ -808,7 +867,7 @@ static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
 	ret = impl->stmts->ret.list[0];
 
 	if (!(impl->decl = locate_impl_decl(data->decls, ret))) {
-		data->error(ret->token, PSI_WARNING,
+		data->error(data, ret->token, PSI_WARNING,
 				"Missing declaration '%s' for `return` statment for implementation %s",
 				ret->set->vars->vars[0]->name, impl->func->name);
 		return 0;
@@ -823,6 +882,52 @@ static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
 	return 1;
 }
 
+static inline int validate_let_func(PSI_Data *data, let_func *func, impl *impl) {
+	int check = 0;
+	size_t j;
+
+	if (impl->func->args) {
+		for (j = 0; j < impl->func->args->count; ++j) {
+			impl_arg *iarg = impl->func->args->args[j];
+
+			if (!strcmp(func->var->name, iarg->var->name)) {
+				func->arg = iarg;
+				check = 1;
+				break;
+			}
+		}
+	}
+	if (!check) {
+		data->error(data, func->var->token, PSI_WARNING, "Unknown value '$%s' of `let` statement"
+				" for cast '%s' of implementation '%s'",
+				func->var->name, func->name, impl->func->name);
+		return 0;
+	}
+	return 1;
+}
+
+static inline int validate_let_callback(PSI_Data *data, decl_var *let_var, let_callback *cb, impl *impl) {
+	decl_type *cb_type;
+	decl *cb_func;
+	size_t i;
+
+	if (!validate_let_func(data, cb->func, impl)) {
+		return 0;
+	}
+
+	cb_type = real_decl_type(let_var->arg->type);
+	if (cb_type->type != PSI_T_FUNCTION) {
+		data->error(data, let_var->token, PSI_WARNING, "Not a function: %s", let_var->name);
+		return 0;
+	}
+	cb_func = cb_type->func;
+	for (i = 0; i < cb->args->count; ++i) {
+		if (!validate_set_value(data, cb->args->vals[i], cb_func->args->count, cb_func->args->args, 0)) {
+			return 0;
+		}
+	}
+}
+
 static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
 	size_t i, j;
 	/* we can have multiple let stmts */
@@ -840,7 +945,7 @@ static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
 		}
 
 		if (!locate_decl_var_arg(let_var, impl->decl->args, impl->decl->func)) {
-			data->error(let_var->token, PSI_WARNING, "Unknown variable '%s' in `let` statement"
+			data->error(data, let_var->token, PSI_WARNING, "Unknown variable '%s' in `let` statement"
 					" of implementation '%s'", let_var->name, impl->func->name);
 			return 0;
 		}
@@ -874,22 +979,13 @@ static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
 				return 0;
 			}
 			break;
-		case PSI_LET_FUNC:
-			if (impl->func->args) {
-				for (j = 0; j < impl->func->args->count; ++j) {
-					impl_arg *iarg = impl->func->args->args[j];
-
-					if (!strcmp(let->val->data.func->var->name, iarg->var->name)) {
-						let->val->data.func->arg = iarg;
-						check = 1;
-						break;
-					}
-				}
+		case PSI_LET_CALLBACK:
+			if (!validate_let_callback(data, let->var, let->val->data.callback, impl)) {
+				return 0;
 			}
-			if (!check) {
-				data->error(let->var->token, PSI_WARNING, "Unknown value '$%s' of `let` statement"
-						" for variable '%s' of implementation '%s'",
-						let->val->data.func->var->name, let->var->name, impl->func->name);
+			break;
+		case PSI_LET_FUNC:
+			if (!validate_let_func(data, let->val->data.func, impl)) {
 				return 0;
 			}
 			break;
@@ -911,7 +1007,7 @@ static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
 			}
 		}
 		if (!check) {
-			data->error(impl->func->token, PSI_WARNING,
+			data->error(data, impl->func->token, PSI_WARNING,
 					"Missing `let` statement for arg '%s %.*s%s'"
 					" of declaration '%s' for implementation '%s'",
 					darg->type->name, (int) darg->var->pointer_level, "*****",
@@ -940,7 +1036,7 @@ static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
 			}
 		}
 		if (!check) {
-			data->error(set->var->token, PSI_WARNING, "Unknown variable '$%s' of `set` statement"
+			data->error(data, set->var->token, PSI_WARNING, "Unknown variable '$%s' of `set` statement"
 					" of implementation '%s'",
 					set->var->name, impl->func->name);
 			return 0;
@@ -983,7 +1079,7 @@ static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
 			}
 
 			if (!check) {
-				data->error(set_var->token, PSI_WARNING, "Unknown value '%s' of `set` statement"
+				data->error(data, set_var->token, PSI_WARNING, "Unknown value '%s' of `set` statement"
 						" for variable '$%s' of implementation '%s'",
 						set_var->name, set->arg->var->name, impl->func->name);
 				return 0;
@@ -1017,7 +1113,7 @@ static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
 
 			/* first find the decl of the free func */
 			if (!locate_free_decl(data->decls, free_call)) {
-				data->error(free_call->token, PSI_WARNING,
+				data->error(data, free_call->token, PSI_WARNING,
 						"Missing declaration '%s' in `free` statement"
 						" of implementation '%s'",
 						free_call->func, impl->func->name);
@@ -1047,7 +1143,7 @@ static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
 				}
 
 				if (!check) {
-					data->error(free_var->token, PSI_WARNING,
+					data->error(data, free_var->token, PSI_WARNING,
 							"Unknown variable '%s' of `free` statement"
 							" of implementation '%s'",
 							free_var->name, impl->func->name);
@@ -1060,7 +1156,7 @@ static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
 }
 static inline int validate_impl_stmts(PSI_Data *data, impl *impl) {
 	if (!impl->stmts) {
- 		data->error(impl->func->token, PSI_WARNING,
+ 		data->error(data, impl->func->token, PSI_WARNING,
  				"Missing body for implementation %s!",
  				impl->func->name);
  		return 0;
@@ -1093,7 +1189,7 @@ static inline int validate_impl_args(PSI_Data *data, impl *impl) {
 		if (iarg->def) {
 			def = 1;
 		} else if (def) {
-			data->error(impl->func->token, PSI_WARNING,
+			data->error(data, impl->func->token, PSI_WARNING,
 					"Non-optional argument %zu '$%s' of implementation '%s'"
 					" follows optional argument",
 					i+1, iarg->var->name, impl->func->name);
@@ -1119,39 +1215,13 @@ int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
 	size_t i, count = C->count++, check_round, check_count;
 	decl_typedefs *check_defs = P->defs;
 	decl_structs *check_structs = P->structs;
+	decl_unions *check_unions = P->unions;
 	decl_enums *check_enums = P->enums;
+	unsigned silent = C->flags & PSI_PARSER_SILENT;
 
 	C->data = realloc(C->data, C->count * sizeof(*C->data));
 	D = PSI_DataExchange(&C->data[count], PSI_DATA(P));
-/*
-	if (D->defs) {
-		for (i = 0; i < D->defs->count; ++i) {
-			if (validate_decl_typedef(PSI_DATA(C), D->defs->list[i])) {
-				C->defs = add_decl_typedef(C->defs, D->defs->list[i]);
-			} else {
-				check_defs = add_decl_typedef(check_defs, D->defs->list[i]);
-			}
-		}
-	}
-	if (D->structs) {
-		for (i = 0; i < D->structs->count; ++i) {
-			if (validate_decl_struct(PSI_DATA(C), D->structs->list[i])) {
-				C->structs = add_decl_struct(C->structs, D->structs->list[i]);
-			} else {
-				check_structs = add_decl_struct(check_structs, D->structs->list[i]);
-			}
-		}
-	}
-	if (D->enums) {
-		for (i = 0; i < D->enums->count; ++i) {
-			if (validate_decl_enum(PSI_DATA(C), D->enums->list[i])) {
-				C->enums = add_decl_enum(C->enums, D->enums->list[i]);
-			} else {
-				check_enums = add_decl_enum(check_enums, D->enums->list[i]);
-			}
-		}
-	}
-*/
+
 #define REVALIDATE(what) do { \
 		if (check_round && check_ ##what) { \
 			free(check_ ##what->list); \
@@ -1162,13 +1232,17 @@ int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
 #define CHECK_TOTAL (CHECK_COUNT(defs) + CHECK_COUNT(structs) + CHECK_COUNT(enums))
 #define CHECK_COUNT(of) (check_ ##of ? check_ ##of->count : 0)
 
+	if (!silent) {
+		/* no warnings on first round */
+		C->flags |= PSI_PARSER_SILENT;
+	}
 	for (check_round = 0, check_count = 0; CHECK_TOTAL && check_count != CHECK_TOTAL; ++check_round) {
 		decl_typedefs *recheck_defs = NULL;
 		decl_structs *recheck_structs = NULL;
+		decl_unions *recheck_unions = NULL;
 		decl_enums *recheck_enums = NULL;
 
 		check_count = CHECK_TOTAL;
-		fprintf(stderr, "### Validation round %zu with %zu checks\n", check_round, check_count);
 
 		for (i = 0; i < CHECK_COUNT(defs); ++i) {
 			if (validate_decl_typedef(PSI_DATA(C), check_defs->list[i])) {
@@ -1184,6 +1258,13 @@ int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
 				recheck_structs = add_decl_struct(recheck_structs, check_structs->list[i]);
 			}
 		}
+		for (i = 0; i < CHECK_COUNT(unions); ++i) {
+			if (validate_decl_union(PSI_DATA(C), check_unions->list[i])) {
+				C->unions = add_decl_union(C->unions, check_unions->list[i]);
+			} else {
+				recheck_unions = add_decl_union(recheck_unions, check_unions->list[i]);
+			}
+		}
 		for (i = 0; i < CHECK_COUNT(enums); ++i) {
 			if (validate_decl_enum(PSI_DATA(C), check_enums->list[i])) {
 				C->enums = add_decl_enum(C->enums, check_enums->list[i]);
@@ -1194,7 +1275,12 @@ int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
 
 		REVALIDATE(defs);
 		REVALIDATE(structs);
+		REVALIDATE(unions);
 		REVALIDATE(enums);
+
+		if (check_round == 0 && !silent) {
+			C->flags &= ~PSI_PARSER_SILENT;
+		}
 	}