X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fcontext_validate.c;h=f7f517dfd37e86e40f944a66d1b9391313f6b3fb;hb=e5103bb1ce17ef734e1329da9a13d9a2cbc40ad9;hp=7c7a245abee60d27e54581163a583ecbe297971b;hpb=9bd48d16d68944f3a1e9366fe8c6f3c6d985bf56;p=m6w6%2Fext-psi

diff --git a/src/context_validate.c b/src/context_validate.c
index 7c7a245..f7f517d 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
 
@@ -13,11 +13,12 @@
 #include "php_psi_macros.h"
 #include "php_psi_redirs.h"
 
+#include "parser.h"
 #include "calc.h"
 #include "marshal.h"
 #include "engine.h"
 
-static int validate_lib(PSI_Data *data, void **dlopened) {
+static int validate_lib(struct psi_data *data, void **dlopened) {
 	char lib[MAXPATHLEN];
 	const char *ptr = data->psi.file.ln;
 	size_t len;
@@ -28,13 +29,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;
 	}
@@ -45,14 +46,14 @@ static inline int locate_decl_type_alias(decl_typedefs *defs, decl_type *type) {
 	size_t i;
 	struct psi_std_type *stdtyp;
 
-	if (type->real) {
+	if (type->real.def) {
 		return 1;
 	}
 	if (defs) for (i = 0; i < defs->count; ++i) {
 		decl_arg *def = defs->list[i];
 
 		if (def->type->type != type->type && !strcmp(def->var->name, type->name)) {
-			type->real = def->type;
+			type->real.def = def;
 			return 1;
 		}
 	}
@@ -69,12 +70,27 @@ static inline int locate_decl_type_alias(decl_typedefs *defs, decl_type *type) {
 static inline int locate_decl_type_struct(decl_structs *structs, decl_type *type) {
 	size_t i;
 
-	if (type->strct) {
+	if (type->real.strct) {
 		return 1;
 	}
 	if (structs) for (i = 0; i < structs->count; ++i) {
 		if (!strcmp(structs->list[i]->name, type->name)) {
-			type->strct = structs->list[i];
+			type->real.strct = structs->list[i];
+			return 1;
+		}
+	}
+	return 0;
+}
+
+static inline int locate_decl_type_union(decl_unions *unions, decl_type *type) {
+	size_t i;
+
+	if (type->real.unn) {
+		return 1;
+	}
+	if (unions) for (i = 0; i < unions->count; ++i) {
+		if (!strcmp(unions->list[i]->name, type->name)) {
+			type->real.unn = unions->list[i];
 			return 1;
 		}
 	}
@@ -84,65 +100,115 @@ static inline int locate_decl_type_struct(decl_structs *structs, decl_type *type
 static inline int locate_decl_type_enum(decl_enums *enums, decl_type *type) {
 	size_t i;
 
-	if (type->enm) {
+	if (type->real.enm) {
 		return 1;
 	}
 	if (enums) for (i = 0; i < enums->count; ++i) {
 		if (!strcmp(enums->list[i]->name, type->name)) {
-			type->enm = enums->list[i];
+			type->real.enm = enums->list[i];
 			return 1;
 		}
 	}
 	return 0;
 }
 
-static inline int validate_decl_type(PSI_Data *data, decl_type *type) {
-	switch (type->type) {
-	case PSI_T_CHAR:
-	case PSI_T_SHORT:
-	case PSI_T_INT:
-	case PSI_T_LONG:
-	case PSI_T_NAME:
+static inline int locate_decl_type_decl(decls *decls, decl_type *type) {
+	size_t i;
+
+	if (type->real.func) {
+		return 1;
+	}
+	if (decls) for (i = 0; i < decls->count; ++i) {
+		if (!strcmp(decls->list[i]->func->var->name, type->name)) {
+			type->real.func = decls->list[i];
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+static inline int validate_decl_nodl(struct psi_data *data, decl *decl);
+static inline int validate_decl_struct(struct psi_data *data, decl_struct *s);
+static inline int validate_decl_union(struct psi_data *data, decl_union *u);
+static inline int validate_decl_enum(struct psi_data *data, decl_enum *e);
+
+static inline int validate_decl_type(struct psi_data *data, decl_type *type, decl_arg *def) {
+	if (weak_decl_type(type)) {
 		if (!locate_decl_type_alias(data->defs, type)) {
 			return 0;
 		}
-		if (type->real) {
-			return validate_decl_type(data, type->real);
+		if (type->real.def) {
+			return validate_decl_type(data, type->real.def->type, type->real.def);
 		}
 		return 1;
+	}
+
+	switch (type->type) {
 	case PSI_T_STRUCT:
 		if (!locate_decl_type_struct(data->structs, type)) {
 			return 0;
 		}
 		break;
+	case PSI_T_UNION:
+		if (!locate_decl_type_union(data->unions, type)) {
+			return 0;
+		}
+		break;
 	case PSI_T_ENUM:
 		if (!locate_decl_type_enum(data->enums, type)) {
 			return 0;
 		}
+		break;
+	case PSI_T_FUNCTION:
+		if (!locate_decl_type_decl(data->decls, type)) {
+			return 0;
+		}
+		if (!validate_decl_nodl(data, type->real.func)) {
+			return 0;
+		}
+		break;
 	}
 	return 1;
 }
-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,
+static inline int validate_decl_typedef(struct psi_data *data, decl_arg *def) {
+	if (!validate_decl_type(data, def->type, def)) {
+		const char *pre;
+
+		switch (def->type->type) {
+		case PSI_T_STRUCT:	pre = "struct ";	break;
+		case PSI_T_UNION:	pre = "union ";		break;
+		case PSI_T_ENUM:	pre = "enum ";		break;
+		default:			pre = "";			break;
+		}
+		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);
+			def->var->name, pre, def->type->name);
 		return 0;
 	}
+	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 0;
+		}
+	}
 	return 1;
 }
 
-static inline int validate_constant(PSI_Data *data, constant *c) {
+static inline int validate_constant(struct psi_data *data, constant *c) {
 	/* FIXME */
 	return 1;
 }
 
-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,
-			"Cannot use '%s'(%d) as type for decl var '%s'",
-			arg->type->name, arg->type->type, arg->var->name);
+static inline int validate_decl_arg(struct psi_data *data, decl_arg *arg) {
+	if (!validate_decl_type(data, arg->type, NULL)) {
+		data->error(data, arg->type->token, PSI_WARNING,
+			"Cannot use '%s' as type for '%s'",
+			arg->type->name, arg->var->name);
 		return 0;
 	}
 	return 1;
@@ -172,18 +238,170 @@ static void psi_sort_struct_arg_swp(void *a, void *b) {
 	*_b = *_a;
 	*_a = _c;
 }
-static inline void psi_sort_struct_args(decl_struct *s) {
-	zend_insert_sort(s->args->args, s->args->count, sizeof(*s->args->args),
+static inline void psi_sort_struct_args(void **args, size_t count) {
+	zend_insert_sort(args, count, sizeof(*args),
 			psi_sort_struct_arg_cmp, psi_sort_struct_arg_swp);
 }
 
-static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
-	size_t i;
+static inline int validate_decl_struct_darg(struct psi_data *data, decl_arg *darg, void *current) {
+	decl_type *real = real_decl_type(darg->type);
 
-	for (i = 0; i < s->args->count; ++i) {
-		if (!validate_decl_arg(data, s->args->args[i])) {
+	/* pre-validate any structs/unions/enums */
+	switch (real->type) {
+	case PSI_T_STRUCT:
+		if (current && current == real->real.strct) {
+			return 1;
+		}
+		if (!locate_decl_type_struct(data->structs, real)) {
+			return 0;
+		}
+		if (!validate_decl_struct(data, real->real.strct)) {
+			return 0;
+		}
+		break;
+	case PSI_T_UNION:
+		if (current && current == real->real.unn) {
+			return 1;
+		}
+		if (!locate_decl_type_union(data->unions, real)) {
+			return 0;
+		}
+		if (!validate_decl_union(data, real->real.unn)) {
 			return 0;
 		}
+		break;
+	case PSI_T_ENUM:
+		if (current && current == real->real.enm) {
+			return 1;
+		}
+		if (!locate_decl_type_enum(data->enums, real)) {
+			return 0;
+		}
+		if (!validate_decl_enum(data, real->real.enm)) {
+			return 0;
+		}
+		break;
+	}
+
+	return 1;
+}
+
+static inline size_t sizeof_decl_arg(decl_arg *darg) {
+	size_t size;
+	decl_type *real = real_decl_type(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) {
+		size = psi_t_size(PSI_T_POINTER);
+	} else {
+		switch (real->type) {
+		case PSI_T_UNION:
+			size = real->real.unn->size;
+			break;
+		case PSI_T_STRUCT:
+			size = real->real.strct->size;
+			break;
+		case PSI_T_ENUM:
+		default:
+			size = psi_t_size(real->type);
+			break;
+		}
+	}
+
+	ZEND_ASSERT(size);
+
+	return size;
+}
+
+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->real.strct);
+		break;
+	case PSI_T_UNION:
+		align = alignof_decl_union(real->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 {
+		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);
+
+	return align;
+}
+
+static inline int validate_decl_struct(struct psi_data *data, decl_struct *s) {
+	size_t i, pos, len, size, align;
+
+	if (!s->size && !s->args->count) {
+		data->error(data, s->token, PSI_WARNING,
+				"Cannot compute size of empty struct '%s'",
+				s->name);
+		return 0;
 	}
 
 	for (i = 0; i < s->args->count; ++i) {
@@ -196,69 +414,117 @@ 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) {
-			size_t size;
+		if (!validate_decl_struct_darg(data, darg, s)) {
+			return 0;
+		} else if (darg->layout) {
+			pos = darg->layout->pos;
 
-			if (darg->var->array_size) {
-				size = psi_t_size(real_decl_type(darg->type)->type) * darg->var->array_size;
-			} else if (darg->var->pointer_level) {
-				size = psi_t_size(PSI_T_POINTER);
-			} else {
-				decl_type *real = real_decl_type(darg->type);
+			align = align_decl_arg(darg, &pos, &len);
 
-				if (real->type == PSI_T_STRUCT) {
-					size = real->strct->size;
-				} else {
-					size = psi_t_size(real->type);
-				}
-			}
-			if (darg->layout->len != size) {
-				data->error(darg->token, PSI_WARNING,
-						"Computed length %zu of %s.%s does not match"
-						" pre-defined length %zu of type '%s'",
-						darg->layout->len, s->name, darg->var->name, size,
+			if (darg->layout->len != len) {
+				data->error(data, darg->token, PSI_WARNING,
+						"Computed size %zu of %s.%s does not match"
+						" pre-defined size %zu of type '%s'",
+						len, s->name, darg->var->name, darg->layout->len,
 						darg->type->name);
-				return 0;
 			}
-		} else {
-			token_t t;
-			size_t size, align;
-
-			if (darg->var->pointer_level && (!darg->var->array_size || darg->var->pointer_level == 1)) {
-				t = PSI_T_POINTER;
+			if (darg->layout->pos != pos) {
+				data->error(data, darg->token, PSI_WARNING,
+						"Computed offset %zu of %s.%s does not match"
+						" pre-defined offset %zu",
+						pos, s->name, darg->var->name, darg->layout->pos);
+			}
+		} else  {
+			if (i) {
+				pos = s->args->args[i-1]->layout->pos +
+						s->args->args[i-1]->layout->len;
 			} else {
-				t = real_decl_type(darg->type)->type;
+				pos = 0;
 			}
 
-			switch (t) {
-			case PSI_T_STRUCT:
-				if (!validate_decl_struct(data, real_decl_type(darg->type)->strct)) {
-					return 0;
-				}
-				size = real_decl_type(darg->type)->strct->size;
-				break;
-			default:
-				size = psi_t_size(t) * (darg->var->array_size ?: 1);
-				break;
-			}
+			align = align_decl_arg(darg, &pos, &len);
+			darg->layout = init_decl_struct_layout(pos, len);
+		}
 
-			if (i) {
-				decl_arg *last = s->args->args[i-1];
+		if (align > s->align) {
+			s->align = align;
+		}
+	}
 
-				align = psi_t_align(t, last->layout->pos + last->layout->len);
-			} else {
-				align = 0;
+	psi_sort_struct_args((void **) s->args->args, s->args->count);
+
+	if (s->args->count) {
+		decl_arg *darg = s->args->args[s->args->count-1];
+
+		size = darg->layout->pos + darg->layout->len;
+		if (s->size < size) {
+			s->size = psi_align(size, s->align);
+		}
+	}
+
+	return 1;
+}
+
+static inline int validate_decl_union(struct psi_data *data, decl_union *u) {
+	size_t i, pos, len, size = 0, align;
+
+	if (!u->size && !u->args->count) {
+		data->error(data, u->token, PSI_WARNING,
+				"Cannot compute size of empty union %s",
+				u->name);
+		return 0;
+	}
+
+	for (i = 0; i < u->args->count; ++i) {
+		decl_arg *darg = u->args->args[i];
+
+		if (!validate_decl_arg(data, darg)) {
+			return 0;
+		}
+
+		ZEND_ASSERT(!darg->var->arg || darg->var->arg == darg);
+		darg->var->arg = darg;
+
+		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(data, darg->token, PSI_WARNING,
+						"Offset of %s.%s should be 0",
+						u->name, darg->var->name);
+				darg->layout->pos = 0;
 			}
+			if (darg->layout->len != len) {
+				data->error(data, darg->token, PSI_WARNING,
+						"Computed size %zu of %s.%s does not match"
+						" pre-defined size %zu of type '%s'",
+						len, u->name, darg->var->name, darg->layout->len,
+						darg->type->name);
+			}
+		} else {
+			pos = 0;
 
-			darg->layout = init_decl_struct_layout(align, size);
+			align = align_decl_arg(darg, &pos, &len);
+			darg->layout = init_decl_struct_layout(pos, len);
+
+		}
+		if (len > size) {
+			size = len;
 		}
-		if (s->size < darg->layout->pos + darg->layout->len) {
-			s->size = darg->layout->pos + darg->layout->len;
-			/* FIXME: align struct */
+		if (align > u->align) {
+			u->align = align;
 		}
 	}
 
-	psi_sort_struct_args(s);
+	psi_sort_struct_args((void **) u->args->args, u->args->count);
+
+	if (u->size < size) {
+		u->size = psi_align(size, u->align);
+	}
 
 	return 1;
 }
@@ -271,7 +537,7 @@ static const char * const abi_ccs[] = {
 		"stdcall",
 		"fastcall",
 };
-static inline int validate_decl_abi(PSI_Data *data, decl_abi *abi) {
+static inline int validate_decl_abi(struct psi_data *data, decl_abi *abi) {
 	size_t i;
 
 	for (i = 0; i < sizeof(abi_ccs)/sizeof(char*); ++i) {
@@ -281,18 +547,15 @@ static inline int validate_decl_abi(PSI_Data *data, decl_abi *abi) {
 	}
 	return 0;
 }
-static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_arg *func)
+static inline int validate_decl_func(struct psi_data *data, void *dl, decl *decl, decl_arg *func)
 {
 	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;
 	}
 
-	if (!validate_decl_arg(data, func)) {
-		return 0;
-	}
 	for (redir = &psi_func_redirs[0]; redir->name; ++redir) {
 		if (!strcmp(func->var->name, redir->name)) {
 			decl->call.sym = redir->func;
@@ -304,21 +567,20 @@ 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());
+				func->var->name, dlerror() ?: "not found");
 		}
 	}
 	return 1;
 }
-
-static inline int validate_decl(PSI_Data *data, void *dl, decl *decl) {
+static inline int validate_decl_nodl(struct psi_data *data, 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;
 	}
-	if (!validate_decl_func(data, dl, decl, decl->func)) {
+	if (!validate_decl_arg(data, decl->func)) {
 		return 0;
 	}
 	if (decl->args) {
@@ -332,17 +594,36 @@ static inline int validate_decl(PSI_Data *data, void *dl, decl *decl) {
 	}
 	return 1;
 }
-static inline decl_arg *locate_decl_var_arg(decl_var *var, decl_args *args, decl_arg *func) {
+static inline int validate_decl(struct psi_data *data, void *dl, decl *decl) {
+	if (!validate_decl_nodl(data, decl)) {
+		return 0;
+	}
+	if (!validate_decl_func(data, dl, decl, decl->func)) {
+		return 0;
+	}
+	return 1;
+}
+static inline decl_arg *locate_decl_arg(decl_args *args, const char *name) {
 	size_t i;
 
 	if (args) for (i = 0; i < args->count; ++i) {
 		decl_arg *arg = args->args[i];
 
-		if (!strcmp(var->name, arg->var->name)) {
-			ZEND_ASSERT(!var->arg || var->arg == arg);
-			return var->arg = arg;
+		if (!strcmp(name, arg->var->name)) {
+			return arg;
 		}
 	}
+
+	return NULL;
+}
+static inline decl_arg *locate_decl_var_arg(decl_var *var, decl_args *args, decl_arg *func) {
+	decl_arg *arg = locate_decl_arg(args, var->name);
+
+	if (arg) {
+		ZEND_ASSERT(!var->arg || var->arg == arg);
+		return var->arg = arg;
+	}
+
 	if (func && !strcmp(var->name, func->var->name)) {
 		return var->arg = func;
 	}
@@ -398,7 +679,7 @@ static inline decl_enum_item *locate_num_exp_enum_item(num_exp *exp, decl_enums
 	}
 	return NULL;
 }
-static inline int validate_num_exp(PSI_Data *data, num_exp *exp, decl_args *dargs, decl_arg *func, decl_enum *enm) {
+static inline int validate_num_exp(struct psi_data *data, num_exp *exp, decl_args *dargs, decl_arg *func, decl_enum *enm) {
 	if (exp->operand) {
 		switch (exp->operator) {
 		case PSI_T_PLUS:
@@ -423,7 +704,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;
 			}
@@ -431,7 +712,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;
 		}
@@ -444,11 +725,11 @@ static inline int validate_num_exp(PSI_Data *data, num_exp *exp, decl_args *darg
 	}
 }
 
-static inline int validate_decl_enum(PSI_Data *data, decl_enum *e) {
+static inline int validate_decl_enum(struct 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;
 	}
 
@@ -478,32 +759,18 @@ static inline int validate_decl_enum(PSI_Data *data, decl_enum *e) {
 
 static inline int validate_set_value_handler(set_value *set) {
 	switch (set->func->type) {
-	case PSI_T_TO_BOOL:
-		set->func->handler = psi_to_bool;
-		break;
-	case PSI_T_TO_INT:
-		set->func->handler = psi_to_int;
-		break;
-	case PSI_T_TO_FLOAT:
-		set->func->handler = psi_to_double;
-		break;
-	case PSI_T_TO_STRING:
-		set->func->handler = psi_to_string;
-		break;
-	case PSI_T_TO_ARRAY:
-		set->func->handler = psi_to_array;
-		break;
-	case PSI_T_TO_OBJECT:
-		set->func->handler = psi_to_object;
-		break;
-	case PSI_T_VOID:
-		set->func->handler = psi_to_void;
-		break;
+	case PSI_T_TO_BOOL:		set->func->handler = psi_to_bool;		break;
+	case PSI_T_TO_INT:		set->func->handler = psi_to_int;		break;
+	case PSI_T_TO_FLOAT:	set->func->handler = psi_to_double;		break;
+	case PSI_T_TO_STRING:	set->func->handler = psi_to_string;		break;
+	case PSI_T_TO_ARRAY:	set->func->handler = psi_to_array;		break;
+	case PSI_T_TO_OBJECT:	set->func->handler = psi_to_object;		break;
+	case PSI_T_VOID:		set->func->handler = psi_to_void;		break;
+	case PSI_T_ZVAL:		set->func->handler = psi_to_zval;		break;
 	case PSI_T_ELLIPSIS:
 		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 */
@@ -525,20 +792,20 @@ static inline void decl_var_arg_v(decl_args *args, va_list argp) {
 		}
 	}
 }
-static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg *ref, decl_args *ref_list) {
+static inline int validate_set_value_ex(struct psi_data *data, set_value *set, decl_arg *ref, decl_args *ref_list) {
 	size_t i;
 	decl_type *ref_type;
 	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;
 		}
 	}
@@ -548,12 +815,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;
 		}
@@ -564,42 +831,42 @@ static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg
 		}
 	}
 
-	if (ref_type->type == PSI_T_STRUCT) {
+	if (set->inner && 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];
-				decl_arg *sub_ref = locate_struct_member(ref_type->strct, sub_var);
+		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->real.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->real.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;
 	}
 
 	return 1;
 }
-static inline int validate_set_value(PSI_Data *data, set_value *set, ...) {
+static inline int validate_set_value(struct psi_data *data, set_value *set, ...) {
 	va_list argp;
 	decl_args args = {0};
 	int check;
@@ -628,19 +895,19 @@ static inline decl *locate_impl_decl(decls *decls, return_stmt *ret) {
 
 	return NULL;
 }
-static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
+static inline int validate_impl_ret_stmt(struct psi_data *data, impl *impl) {
 	return_stmt *ret;
 
 	/* we must have exactly one ret stmt delcaring the native func to call */
 	/* 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);
 		}
@@ -650,7 +917,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;
@@ -660,12 +927,241 @@ static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
 		return 0;
 	}
 
-	impl->decl->impl = impl;
+	//impl->decl->impl = impl;
+
+	return 1;
+}
+
+static inline impl_arg *locate_impl_var_arg(impl_var *var, impl_args *args) {
+	size_t i;
+
+	for (i = 0; i < args->count; ++i) {
+		impl_arg *iarg = args->args[i];
+
+		if (!strcmp(var->name, iarg->var->name)) {
+			return var->arg = iarg;
+		}
+	}
+
+	return NULL;
+}
+
+static inline int validate_let_val(struct psi_data *data, let_val *val, decl_var *let_var, impl *impl);
+
+static inline const char *locate_let_val_varname(let_val *val) {
+	if (val) {
+		switch (val->kind) {
+		case PSI_LET_CALLBACK:
+			return &val->data.callback->func->var->name[1];
+		case PSI_LET_FUNC:
+			return &val->data.func->var->name[1];
+		default:
+			break;
+		}
+	}
+	return NULL;
+}
+
+static inline int validate_let_func(struct psi_data *data, let_func *func, decl_var *let_var, impl *impl) {
+	if (func->outer) {
+		decl_type *var_typ = real_decl_type(let_var->arg->type);
+
+		switch (var_typ->type) {
+		case PSI_T_STRUCT:
+			func->ref = locate_decl_arg(var_typ->real.strct->args, &func->var->name[1]);
+			break;
+		case PSI_T_UNION:
+			func->ref = locate_decl_arg(var_typ->real.unn->args, &func->var->name[1]);
+			break;
+		default:
+			data->error(data, let_var->token, PSI_WARNING,
+					"Inner let statement's values must refer to a structure type, got '%s' for '%s'",
+					real_decl_type(let_var->arg->type)->name, let_var->name);
+			return 0;
+		}
+	}
+	if (impl->func->args) {
+		locate_impl_var_arg(func->var, impl->func->args);
+	}
+	if (!func->var->arg && !func->ref) {
+		data->error(data, func->var->token, PSI_WARNING,
+				"Unknown variable '$%s' of `let` statement"
+				" for cast '%s' of implementation '%s'",
+				func->var->name, func->name, impl->func->name);
+		return 0;
+	}
+	switch (func->type) {
+	case PSI_T_BOOLVAL:		func->handler = psi_let_boolval;	break;
+	case PSI_T_INTVAL:		func->handler = psi_let_intval;		break;
+	case PSI_T_FLOATVAL:	func->handler = psi_let_floatval;	break;
+	case PSI_T_STRVAL:		func->handler = psi_let_strval;		break;
+	case PSI_T_STRLEN:		func->handler = psi_let_strlen;		break;
+	case PSI_T_PATHVAL:		func->handler = psi_let_pathval;	break;
+	case PSI_T_ARRVAL:		func->handler = psi_let_arrval;		break;
+	case PSI_T_OBJVAL:		func->handler = psi_let_objval;		break;
+	case PSI_T_ZVAL:		func->handler = psi_let_zval;		break;
+	case PSI_T_VOID:		func->handler = psi_let_void;		break;
+	EMPTY_SWITCH_DEFAULT_CASE();
+	}
+
+	if (func->inner && func->ref) {
+		size_t i;
+		decl_type *var_typ = real_decl_type(let_var->arg->type);
+
+		switch (var_typ->type) {
+		case PSI_T_STRUCT:
+		case PSI_T_UNION:
+			break;
+		default:
+			data->error(data, let_var->token, PSI_WARNING,
+					"Inner let statement's values must refer to a structure type, got '%s' for '%s'",
+					real_decl_type(let_var->arg->type)->name, let_var->name);
+			return 0;
+		}
+
+		for (i = 0; i < func->inner->count; ++i) {
+			let_val *inner = func->inner->vals[i];
+			let_val *outer = func->outer;
+			const char *name = locate_let_val_varname(inner);
+			decl_arg *sub_arg;
+
+			if (name) {
+				sub_arg = locate_decl_arg(var_typ->real.strct->args, name);
+			}
+			if (!name || !sub_arg) {
+				data->error(data, let_var->token, PSI_WARNING,
+						"Unknown variable '%s' of '%s'",
+						name,
+						var_typ->real.strct->name);
+				return 0;
+			}
+			if (!validate_let_val(data, inner, sub_arg->var, impl)) {
+				return 0;
+			}
+		}
+	}
+	return 1;
+}
+
+static inline int validate_let_callback(struct psi_data *data, decl_var *cb_var, let_callback *cb, impl *impl) {
+	size_t i;
+	decl *cb_func;
+	decl_type *cb_type = real_decl_type(cb_var->arg->type);
+
+	if (!validate_let_func(data, cb->func, cb_var, impl)) {
+		return 0;
+	}
+
+	if (cb_type->type != PSI_T_FUNCTION) {
+		data->error(data, cb_var->token, PSI_WARNING, "Not a function: %s", cb_var->name);
+		return 0;
+	}
+	cb_func = cb_type->real.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;
+		}
+	}
+
+	if (!validate_decl_nodl(data, cb_func)) {
+		return 0;
+	}
+
+	cb->decl = cb_func;
+
+	return 1;
+}
+
+static inline int validate_let_val(struct psi_data *data, let_val *val, decl_var *let_var, impl *impl) {
+
+	switch (val->kind) {
+	case PSI_LET_NULL:
+		break;
+	case PSI_LET_TMP:
+		if (!let_var) {
+			data->error(data, NULL, PSI_WARNING,
+					"Ivalid let statement value of implementation '%s'",
+					impl->func->name);
+			return 0;
+		}
+		/* e.g. let bar = &strval($bar); // decl_arg(char **bar) */
+		/* e.g. let foo = *bar;  */
+		let_var->pointer_level = val->data.var->pointer_level;
+		let_var->arg = init_decl_arg(
+				init_decl_type(
+						real_decl_type(val->data.var->arg->type)->type,
+						real_decl_type(val->data.var->arg->type)->name),
+				init_decl_var(
+						let_var->name,
+						let_var->pointer_level,
+						let_var->array_size));
+		break;
+	case PSI_LET_NUMEXP:
+		if (!validate_num_exp(data, val->data.num, impl->decl->args, impl->decl->func, NULL)) {
+			return 0;
+		}
+		break;
+	case PSI_LET_CALLOC:
+		if (!validate_num_exp(data, val->data.alloc->nmemb, impl->decl->args, impl->decl->func, NULL)) {
+			return 0;
+		}
+		if (!validate_num_exp(data, val->data.alloc->size, impl->decl->args, impl->decl->func, NULL)) {
+			return 0;
+		}
+		break;
+	case PSI_LET_CALLBACK:
+		if (!let_var) {
+			data->error(data, NULL, PSI_WARNING,
+					"Ivalid let statement value of implementation '%s'",
+					impl->func->name);
+			return 0;
+		}
+		if (val->data.callback->func->inner) {
+			size_t i;
+
+			for (i = 0; i < val->data.callback->func->inner->count; ++i) {
+				let_val *inner = val->data.callback->func->inner->vals[i];
+				switch (inner->kind) {
+				case PSI_LET_FUNC:
+					inner->data.func->outer = val;
+					break;
+				case PSI_LET_CALLBACK:
+					inner->data.callback->func->outer = val;
+					break;
+				}
+			}
+		}
+		if (!validate_let_callback(data, let_var, val->data.callback, impl)) {
+			return 0;
+		}
+		break;
+	case PSI_LET_FUNC:
+		if (val->data.func->inner) {
+			size_t i;
+
+			for (i = 0; i < val->data.func->inner->count; ++i) {
+				let_val *inner = val->data.func->inner->vals[i];
+				switch (inner->kind) {
+				case PSI_LET_FUNC:
+					inner->data.func->outer = val;
+					break;
+				case PSI_LET_CALLBACK:
+					inner->data.callback->func->outer = val;
+					break;
+				}
+			}
+		}
+
+		if (!validate_let_func(data, val->data.func, let_var, impl)) {
+			return 0;
+		}
+		break;
+	}
 
 	return 1;
 }
 
-static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
+static inline int validate_impl_let_stmts(struct psi_data *data, impl *impl) {
 	size_t i, j;
 	/* we can have multiple let stmts */
 
@@ -673,7 +1169,6 @@ static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
 	for (i = 0; i < impl->stmts->let.count; ++i) {
 		let_stmt *let = impl->stmts->let.list[i];
 		decl_var *let_var;
-		int check = 0;
 
 		if (let->val && let->val->kind == PSI_LET_TMP) {
 			let_var = let->val->data.var;
@@ -682,62 +1177,15 @@ 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;
 		}
 
-		switch (let->val->kind) {
-		case PSI_LET_NULL:
-			break;
-		case PSI_LET_TMP:
-			/* e.g. let bar = &strval($bar); // decl_arg(char **bar) */
-			/* e.g. let foo = *bar;  */
-			let->var->pointer_level = let->val->data.var->pointer_level;
-			let->var->arg = init_decl_arg(
-					init_decl_type(
-							real_decl_type(let->val->data.var->arg->type)->type,
-							real_decl_type(let->val->data.var->arg->type)->name),
-					init_decl_var(
-							let->var->name,
-							let->var->pointer_level,
-							let->var->array_size));
-			break;
-		case PSI_LET_NUMEXP:
-			if (!validate_num_exp(data, let->val->data.num, impl->decl->args, impl->decl->func, NULL)) {
-				return 0;
-			}
-			break;
-		case PSI_LET_CALLOC:
-			if (!validate_num_exp(data, let->val->data.alloc->nmemb, impl->decl->args, impl->decl->func, NULL)) {
-				return 0;
-			}
-			if (!validate_num_exp(data, let->val->data.alloc->size, impl->decl->args, impl->decl->func, NULL)) {
-				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;
-					}
-				}
-			}
-			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);
-				return 0;
-			}
-			break;
+		if (!validate_let_val(data, let->val, let->var, impl)) {
+			return 0;
 		}
 	}
-
 	/* check that we have a let stmt for every decl arg */
 	if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
 		decl_arg *darg = impl->decl->args->args[i];
@@ -747,13 +1195,12 @@ static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
 			let_stmt *let = impl->stmts->let.list[j];
 
 			if (!strcmp(let->var->name, darg->var->name)) {
-				darg->let = let;
 				check = 1;
 				break;
 			}
 		}
 		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, "*****",
@@ -764,7 +1211,7 @@ static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
 
 	return 1;
 }
-static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
+static inline int validate_impl_set_stmts(struct psi_data *data, impl *impl) {
 	size_t i, j, k;
 	/* we can have any count of set stmts; processing out vars */
 	/* check that set stmts reference known variables */
@@ -782,7 +1229,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;
@@ -825,7 +1272,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;
@@ -848,7 +1295,7 @@ static inline decl *locate_free_decl(decls *decls, free_call *f) {
 
 	return NULL;
 }
-static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
+static inline int validate_impl_free_stmts(struct psi_data *data, impl *impl) {
 	size_t i, j, k, l;
 	/* we can have any count of free stmts; freeing any out vars */
 	for (i = 0; i < impl->stmts->fre.count; ++i) {
@@ -859,7 +1306,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);
@@ -889,7 +1336,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);
@@ -900,9 +1347,9 @@ static inline int validate_impl_free_stmts(PSI_Data *data, impl *impl) {
 	}
 	return 1;
 }
-static inline int validate_impl_stmts(PSI_Data *data, impl *impl) {
+static inline int validate_impl_stmts(struct 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;
@@ -925,7 +1372,7 @@ static inline int validate_impl_stmts(PSI_Data *data, impl *impl) {
 	return 1;
 }
 
-static inline int validate_impl_args(PSI_Data *data, impl *impl) {
+static inline int validate_impl_args(struct psi_data *data, impl *impl) {
 	int def = 0;
 	size_t i;
 
@@ -935,7 +1382,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);
@@ -946,7 +1393,7 @@ static inline int validate_impl_args(PSI_Data *data, impl *impl) {
 	return 1;
 }
 
-static inline int validate_impl(PSI_Data *data, impl *impl) {
+static inline int validate_impl(struct psi_data *data, impl *impl) {
 	if (!validate_impl_args(data, impl)) {
 		return 0;
 	}
@@ -954,46 +1401,20 @@ static inline int validate_impl(PSI_Data *data, impl *impl) {
 }
 
 
-int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
+int psi_context_validate(struct psi_context *C, struct psi_parser *P)
 {
-	PSI_Data *D;
+	struct psi_data *D;
 	void *dlopened = NULL;
 	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 flags = C->flags;
 
 	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]);
-			}
-		}
-	}
-*/
+	D = psi_data_exchange(&C->data[count], PSI_DATA(P));
+
 #define REVALIDATE(what) do { \
 		if (check_round && check_ ##what) { \
 			free(check_ ##what->list); \
@@ -1004,13 +1425,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 (!(flags & PSI_PARSER_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])) {
@@ -1026,6 +1451,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]);
@@ -1036,9 +1468,15 @@ int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
 
 		REVALIDATE(defs);
 		REVALIDATE(structs);
+		REVALIDATE(unions);
 		REVALIDATE(enums);
+
+		if (check_round == 0 && !(flags & PSI_PARSER_SILENT)) {
+			C->flags ^= PSI_PARSER_SILENT;
+		}
 	}
 
+	C->flags = flags;
 
 	if (D->consts) {
 		for (i = 0; i < D->consts->count; ++i) {
@@ -1072,7 +1510,7 @@ int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
 	return 1;
 }
 
-int PSI_ContextValidateData(PSI_Data *dest, PSI_Data *source)
+int psi_context_validate_data(struct psi_data *dest, struct psi_data *source)
 {
 	size_t i;
 	int errors = 0;
@@ -1113,6 +1551,18 @@ int PSI_ContextValidateData(PSI_Data *dest, PSI_Data *source)
 		}
 	}
 
+	if (source->unions) for (i = 0; i < source->unions->count; ++i) {
+		decl_union *dunion = source->unions->list[i];
+
+		if (validate_decl_union(source, dunion)) {
+			if (dest) {
+				dest->unions = add_decl_union(dest->unions, dunion);
+			}
+		} else {
+			++errors;
+		}
+	}
+
 	if (source->enums) for (i = 0; i < source->enums->count; ++i) {
 		decl_enum *denum = source->enums->list[i];