X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=d2293fe7bf4f360de6bd5bf19e4551e489e2559c;hp=cbcfbc6b1d6ecd6e32ab0a2a099cf557cad958f1;hb=81b71a515e2024cee739deb6e207eb3b0e7c5d64;hpb=14c98cac21b8102d1d4c2a57744f6976ea3a0849

diff --git a/src/context.c b/src/context.c
index cbcfbc6..d2293fe 100644
--- a/src/context.c
+++ b/src/context.c
@@ -4,82 +4,7 @@
 
 #include "php.h"
 
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-#ifdef HAVE_GLOB_H
-# include <glob.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-# include <arpa/nameser.h>
-#endif
-#ifdef HAVE_NETDB_H
-# include <netdb.h>
-#endif
-#ifdef HAVE_RESOLV_H
-# include <resolv.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-# include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-# include <sys/socket.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
-#endif
-#ifdef HAVE_SYS_UIO_H
-# include <sys/uio.h>
-#endif
-#ifdef HAVE_SYS_UTSNAME_H
-# include <sys/utsname.h>
-#endif
-#ifdef HAVE_TIME_H
-# include <time.h>
-#endif
-#ifdef HAVE_WCHAR_H
-# include <wchar.h>
-#endif
+#include "php_psi_stdinc.h"
 
 #ifdef HAVE_DIRENT_H
 # include <dirent.h>
@@ -105,8 +30,6 @@
 #include "php.h"
 #include "php_scandir.h"
 #include "php_psi.h"
-#include "context.h"
-#include "parser.h"
 
 #include "libjit.h"
 #include "libffi.h"
@@ -128,59 +51,13 @@ static struct psi_std_type {
 	{0}
 };
 
-static struct psi_predef_type {
-	token_t type_tag;
-	const char *type_name;
-	const char *alias;
-} psi_predef_types[] = {
-	PSI_TYPES
-	{0}
-};
-
-static struct psi_predef_const {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	const char *val_text;
-	token_t val_type_tag;
-} psi_predef_consts[] = {
-	PSI_CONSTS
-	{0}
-};
-
-PSI_MACROS
-
-static struct psi_func_redir {
-	const char *name;
-	void (*func)(void);
-} psi_func_redirs[] = {
-	PSI_REDIRS
-	{0}
-};
-
-static struct psi_predef_decl {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	size_t pointer_level;
-	size_t array_size;
-} psi_predef_decls[] = {
-	PSI_DECLS
-	{0}
-};
-
-static struct psi_predef_struct {
-	token_t type_tag;
-	const char *type_name;
-	const char *var_name;
-	size_t offset;
-	size_t size;
-	size_t pointer_level;
-	size_t array_size;
-} psi_predef_structs[] = {
-	PSI_STRUCTS
-	{0}
-};
+#include "php_psi_types.h"
+#include "php_psi_consts.h"
+#include "php_psi_macros.h"
+#include "php_psi_redirs.h"
+#include "php_psi_decls.h"
+#include "php_psi_va_decls.h"
+#include "php_psi_structs.h"
 
 static int validate_lib(PSI_Data *data, void **dlopened) {
 	char lib[MAXPATHLEN];
@@ -193,13 +70,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(PSI_WARNING, "Library name too long: '%s'", ptr);
+			data->error(NULL, PSI_WARNING, "Library name too long: '%s'", ptr);
 		}
 		lib[len] = 0;
 		ptr = lib;
 	}
 	if (!(*dlopened = dlopen(ptr, RTLD_LAZY|RTLD_LOCAL))) {
-		data->error(PSI_WARNING, "Could not open library '%s': %s.",
+		data->error(NULL, PSI_WARNING, "Could not open library '%s': %s.",
 				data->psi.file.ln, dlerror());
 		return 0;
 	}
@@ -265,7 +142,8 @@ static inline int validate_decl_type(PSI_Data *data, decl_type *type) {
 }
 static inline int validate_decl_typedef(PSI_Data *data, decl_typedef *def) {
 	if (!validate_decl_type(data, def->type)) {
-		data->error(PSI_WARNING, "Type '%s' cannot be aliased to %s'%s'",
+		data->error(def->token, PSI_WARNING,
+			"Type '%s' cannot be aliased to %s'%s'",
 			def->type->name, def->type->type == PSI_T_STRUCT?"struct ":"",def->alias);
 		return 0;
 	}
@@ -280,7 +158,8 @@ 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(PSI_WARNING, "Cannot use '%s'(%d) as type for '%s'",
+		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);
 		return 0;
 	}
@@ -335,6 +214,7 @@ static const char * const abi_ccs[] = {
 		"default", /* \                 */
 		"extern",  /*  > - all the same */
 		"cdecl",   /* /                 */
+		"mscdecl",
 		"stdcall",
 		"fastcall",
 };
@@ -346,7 +226,6 @@ static inline int validate_decl_abi(PSI_Data *data, decl_abi *abi) {
 			return 1;
 		}
 	}
-	data->error(PSI_WARNING, "Invalid calling convention: '%s'", abi->convention);
 	return 0;
 }
 static inline int validate_decl_func(PSI_Data *data, void *dl, decl *decl, decl_arg *func)
@@ -354,7 +233,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(PSI_WARNING, "Cannot dlsym dlsym (sic!)");
+		data->error(func->token, PSI_WARNING, "Cannot dlsym dlsym (sic!)");
 		return 0;
 	}
 
@@ -372,7 +251,8 @@ 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(PSI_WARNING, "Failed to locate symbol '%s': %s",
+			data->error(func->token, PSI_WARNING,
+				"Failed to locate symbol '%s': %s",
 				func->var->name, dlerror());
 		}
 	}
@@ -381,6 +261,8 @@ 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,
+				"Invalid calling convention: '%s'", decl->abi->token->text);
 		return 0;
 	}
 	if (!validate_decl_func(data, dl, decl, decl->func)) {
@@ -397,7 +279,7 @@ 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) {
+static inline decl_arg *locate_decl_var_arg(decl_var *var, decl_args *args, decl_arg *func) {
 	size_t i;
 
 	for (i = 0; i < args->count; ++i) {
@@ -408,21 +290,76 @@ static inline decl_arg *locate_decl_var_arg(decl_var *var, decl_args *args) {
 			return var->arg = arg;
 		}
 	}
+	if (func && !strcmp(var->name, func->var->name)) {
+		return var->arg = func;
+	}
 
 	return NULL;
 }
 static inline decl_arg *locate_struct_member(decl_struct *s, decl_var *var) {
 	if (s->args) {
-		return locate_decl_var_arg(var, s->args);
+		return locate_decl_var_arg(var, s->args, NULL);
 	}
 
 	return NULL;
 }
-static inline int validate_set_value(PSI_Data *data, set_value *set, decl_arg *ref, decl_args *ref_list) {
+static inline constant *locate_num_exp_constant(num_exp *exp, constants *consts) {
 	size_t i;
-	decl_type *ref_type = real_decl_type(ref->type);
-	decl_var *set_var = set->vars->vars[0];
 
+	for (i = 0; i < consts->count; ++i) {
+		constant *cnst = consts->list[i];
+
+		if (!strcmp(cnst->name, exp->u.numb)) {
+			free(exp->u.numb);
+			return exp->u.cnst = cnst;
+		}
+	}
+
+	return NULL;
+}
+static inline int validate_num_exp(PSI_Data *data, decl_args *dargs, decl_arg *func, num_exp *exp) {
+	if (exp->operand) {
+		switch (exp->operator) {
+		case PSI_T_PLUS:
+			exp->calculator = psi_calc_add;
+			break;
+		case PSI_T_MINUS:
+			exp->calculator = psi_calc_sub;
+			break;
+		case PSI_T_ASTERISK:
+			exp->calculator = psi_calc_mul;
+			break;
+		case PSI_T_SLASH:
+			exp->calculator = psi_calc_div;
+			break;
+		EMPTY_SWITCH_DEFAULT_CASE();
+		}
+		if (!validate_num_exp(data, dargs, func, exp->operand)) {
+			return 0;
+		}
+	}
+	switch (exp->t) {
+	case PSI_T_NAME:
+		if (!locate_decl_var_arg(exp->u.dvar, dargs, func)) {
+			data->error(exp->token, PSI_WARNING, "Unknown variable '%s' in numeric expression",
+					exp->u.dvar->name);
+			return 0;
+		}
+		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",
+					exp->u.numb);
+			return 0;
+		}
+		return 1;
+	case PSI_T_NUMBER:
+		return 1;
+	default:
+		return 0;
+	}
+}
+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;
@@ -439,62 +376,127 @@ static inline int validate_set_value(PSI_Data *data, set_value *set, decl_arg *r
 	case PSI_T_TO_ARRAY:
 		set->func->handler = psi_to_array;
 		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
+	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_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 */
+	default:
+		return 0;
 	}
+	return 1;
+}
+static inline void decl_var_arg_v(decl_args *args, va_list argp) {
+	int argc;
+	decl_arg **argv;
+
+	memset(args, 0, sizeof(*args));
 
-	for (i = 1; i < set->vars->count; ++i) {
-		if (!locate_decl_var_arg(set->vars->vars[i], ref_list)) {
+	while ((argc = va_arg(argp, int))) {
+		argv = va_arg(argp, decl_arg **);
+		while (argc--) {
+			add_decl_arg(args, *argv++);
+		}
+	}
+}
+static inline int validate_set_value_ex(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);
+		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);
 			return 0;
 		}
 	}
-	set_var->arg = ref;
+
+	if (!ref) {
+		ref = set_var->arg;
+	}
+	ref_type = real_decl_type(ref->type);
 
 	if (set->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(E_WARNING, "Inner `set` statement casts only work with "
+			data->error(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;
 		}
 	}
+	if (set->num) {
+		if (!validate_num_exp(data, ref_list, ref, set->num)) {
+			return 0;
+		}
+	}
 
 	if (ref_type->type == PSI_T_STRUCT) {
 		/* to_array(struct, to_...) */
-		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 != 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);
 
-			set->inner[i]->outer.set = set;
-			if (sub_ref) {
-				if (!validate_set_value(data, set->inner[i], sub_ref, ref_type->strct->args)) {
-					return 0;
+				if (sub_ref) {
+					if (!validate_set_value_ex(data, set->inner[i], sub_ref, ref_type->strct->args)) {
+						return 0;
+					}
 				}
 			}
 		}
 	} else if (set->count == 1) {
 		/* to_array(ptr, to_string(*ptr)) */
 		decl_var *sub_var = set->inner[0]->vars->vars[0];
-		decl_arg *sub_ref = locate_decl_var_arg(sub_var, ref_list);
+		decl_arg *sub_ref = locate_decl_var_arg(sub_var, ref_list, ref);
 
-		set->inner[0]->outer.set = set;
 		if (sub_ref) {
 			if (strcmp(sub_var->name, set_var->name)) {
-				data->error(E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
+				data->error(sub_var->token, E_WARNING, "Inner `set` statement casts on pointers must reference the same variable");
 				return 0;
 			}
-			if (!validate_set_value(data, set->inner[0], sub_ref, ref_list)) {
+			if (!validate_set_value_ex(data, set->inner[0], sub_ref, ref_list)) {
 				return 0;
 			}
 		}
 	} else if (set->count > 1) {
-		data->error(E_WARNING, "Inner `set` statement casts on pointers may only occur once");
+		data->error(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, ...) {
+	va_list argp;
+	decl_args args = {0};
+	int check;
+
+	va_start(argp, set);
+	decl_var_arg_v(&args, argp);
+	va_end(argp);
+
+	check = validate_set_value_ex(data, set, NULL, &args);
+	if (args.args) {
+		free(args.args);
+	}
+	return check;
+}
 static inline decl *locate_impl_decl(decls *decls, return_stmt *ret) {
 	if (decls) {
 		size_t i;
@@ -516,11 +518,13 @@ 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(PSI_WARNING, "Too many `return` statements for implmentation %s;"
+			data->error(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(PSI_WARNING, "Missing `return` statement for implementation %s",
+			data->error(impl->func->token, PSI_WARNING,
+					"Missing `return` statement for implementation %s",
 					impl->func->name);
 		}
 		return 0;
@@ -529,12 +533,13 @@ 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(PSI_WARNING, "Missing declaration for implementation %s",
-				impl->func->name);
+		data->error(ret->token, PSI_WARNING,
+				"Missing declaration '%s' for `return` statment for implementation %s",
+				ret->set->vars->vars[0]->name, impl->func->name);
 		return 0;
 	}
 
-	if (!validate_set_value(data, ret->set, ret->decl, impl->decl->args)) {
+	if (!validate_set_value(data, ret->set, 1, &ret->decl, impl->decl->args ? (int) impl->decl->args->count : 0, impl->decl->args ? impl->decl->args->args : NULL, 0)) {
 		return 0;
 	}
 
@@ -542,9 +547,80 @@ static inline int validate_impl_ret_stmt(PSI_Data *data, impl *impl) {
 
 	return 1;
 }
+
 static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
 	size_t i, j;
 	/* we can have multiple let stmts */
+
+	/* check that we have a decl arg for every let stmt */
+	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;
+		} else {
+			let_var = let->var;
+		}
+
+		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"
+					" 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, impl->decl->args, impl->decl->func, let->val->data.num)) {
+				return 0;
+			}
+			break;
+		case PSI_LET_CALLOC:
+			if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->data.alloc->nmemb)) {
+				return 0;
+			}
+			if (!validate_num_exp(data, impl->decl->args, impl->decl->func, let->val->data.alloc->size)) {
+				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;
+		}
+	}
+
 	/* 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];
@@ -560,43 +636,15 @@ static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
 			}
 		}
 		if (!check) {
-			data->error(PSI_WARNING, "Missing `let` statement for arg '%s %.*s%s'"
+			data->error(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, "*****",
 					darg->var->name, impl->decl->func->var->name, impl->func->name);
 			return 0;
 		}
 	}
-	/* check that the let_value references a known variable or NULL */
-	for (i = 0; i < impl->stmts->let.count; ++i) {
-		let_stmt *let = impl->stmts->let.list[i];
-		int check = 0;
 
-		if (let->val && let->val->func && let->val->func->alloc) {
-			if (!validate_decl_type(data, let->val->func->alloc->type)) {
-				data->error(PSI_WARNING, "Cannot use '%s' as type for calloc in `let` statement",
-					let->val->func->alloc->type->name);
-				return 0;
-			}
-		}
-		if (let->val && let->val->var) {
-			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->var->name, iarg->var->name)) {
-					let->arg = iarg;
-					check = 1;
-					break;
-				}
-			}
-			if (!check) {
-				data->error(PSI_WARNING, "Unknown value '$%s' of `let` statement"
-						" for variable '%s' of implementation '%s'",
-						let->val->var->name, let->var->name, impl->func->name);
-				return 0;
-			}
-		}
-	}
 	return 1;
 }
 static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
@@ -617,7 +665,7 @@ static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
 			}
 		}
 		if (!check) {
-			data->error(PSI_WARNING, "Unknown variable '$%s' of `set` statement"
+			data->error(set->var->token, PSI_WARNING, "Unknown variable '$%s' of `set` statement"
 					" of implementation '%s'",
 					set->var->name, impl->func->name);
 			return 0;
@@ -627,21 +675,40 @@ static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
 			decl_var *set_var = set->val->vars->vars[j];
 
 			check = 0;
-			if (impl->decl->args) for (k = 0; k < impl->decl->args->count; ++k) {
-				decl_arg *set_arg = impl->decl->args->args[k];
+			if (impl->decl->args) {
+				for (k = 0; k < impl->decl->args->count; ++k) {
+					decl_arg *set_arg = impl->decl->args->args[k];
 
-				if (!strcmp(set_var->name, set_arg->var->name)) {
-					check = 1;
-					set_var->arg = set_arg;
-					if (!validate_set_value(data, set->val, set_arg, impl->decl->args)) {
-						return 0;
+					if (!strcmp(set_var->name, set_arg->var->name)) {
+						check = 1;
+						set_var->arg = set_arg;
+						if (!validate_set_value(data, set->val, 1, &set_arg, 1, &impl->decl->func, impl->decl->args->count, impl->decl->args->args, 0)) {
+							return 0;
+						}
+						break;
+					}
+				}
+			}
+			if (!check) {
+				for (k = 0; k < impl->stmts->let.count; ++k) {
+					let_stmt *let = impl->stmts->let.list[k];
+
+					/* check temp vars */
+					if (let->val && let->val->kind == PSI_LET_TMP) {
+						if (!strcmp(set_var->name, let->var->name)) {
+							check = 1;
+							set_var->arg = let->var->arg;
+							if (!validate_set_value(data, set->val, 1, &set_var->arg, 1, &impl->decl->func, impl->decl->args->count, impl->decl->args->args, 0)) {
+								return 0;
+							}
+							break;
+						}
 					}
-					break;
 				}
 			}
 
 			if (!check) {
-				data->error(PSI_WARNING, "Unknown value '%s' of `set` statement"
+				data->error(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;
@@ -675,33 +742,38 @@ 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(PSI_WARNING, "Unknown function '%s' in `free` statement"
-						" of implementation '%s'", free_call->func, impl->func->name);
+				data->error(free_call->token, PSI_WARNING,
+						"Missing declaration '%s' in `free` statement"
+						" of implementation '%s'",
+						free_call->func, impl->func->name);
 				return 0;
 			}
-			if (!impl->decl->args) {
-				data->error(PSI_WARNING, "Declaration '%s' of implementation '%s'"
-						" does not have any arguments to free",
-						impl->decl->func->var->name, impl->func->name);
-			}
+
+
 
 			/* now check for known vars */
 			for (l = 0; l < free_call->vars->count; ++l) {
 				int check = 0;
 				decl_var *free_var = free_call->vars->vars[l];
 
-				for (k = 0; k < impl->decl->args->count; ++k) {
-					decl_arg *free_arg = impl->decl->args->args[k];
-
-					if (!strcmp(free_var->name, free_arg->var->name)) {
-						check = 1;
-						free_var->arg = free_arg;
-						break;
+				if (!strcmp(free_var->name, impl->decl->func->var->name)) {
+					check = 1;
+					free_var->arg = impl->decl->func;
+				} else if (impl->decl->args) {
+					for (k = 0; k < impl->decl->args->count; ++k) {
+						decl_arg *free_arg = impl->decl->args->args[k];
+
+						if (!strcmp(free_var->name, free_arg->var->name)) {
+							check = 1;
+							free_var->arg = free_arg;
+							break;
+						}
 					}
 				}
 
 				if (!check) {
-					data->error(PSI_WARNING, "Unknown variable '%s' of `free` statement"
+					data->error(free_var->token, PSI_WARNING,
+							"Unknown variable '%s' of `free` statement"
 							" of implementation '%s'",
 							free_var->name, impl->func->name);
 					return 0;
@@ -713,7 +785,8 @@ 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(PSI_WARNING, "Missing body for implementation %s!",
+ 		data->error(impl->func->token, PSI_WARNING,
+ 				"Missing body for implementation %s!",
  				impl->func->name);
  		return 0;
  	}
@@ -735,6 +808,33 @@ static inline int validate_impl_stmts(PSI_Data *data, impl *impl) {
 	return 1;
 }
 
+static inline int validate_impl_args(PSI_Data *data, impl *impl) {
+	int def = 0;
+	size_t i;
+
+	for (i = 0; i < impl->func->args->count; ++i) {
+		impl_arg *iarg = impl->func->args->args[i];
+
+		if (iarg->def) {
+			def = 1;
+		} else if (def) {
+			data->error(impl->func->token, PSI_WARNING,
+					"Non-optional argument %zu '$%s' of implementation '%s'"
+					" follows optional argument",
+					i+1, iarg->var->name, impl->func->name);
+			return 0;
+		}
+	}
+
+	return 1;
+}
+static inline int validate_impl(PSI_Data *data, impl *impl) {
+	if (!validate_impl_args(data, impl)) {
+		return 0;
+	}
+	return validate_impl_stmts(data, impl);
+}
+
 PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErrorFunc error)
 {
 	size_t i;
@@ -805,6 +905,24 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
 		decl_args *args = init_decl_args(NULL);
 		decl *decl = init_decl(init_decl_abi("default"), func, args);
 
+		for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
+			decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
+			decl_var *arg_var = init_decl_var(farg->var_name, farg->pointer_level, farg->array_size);
+			decl_arg *darg = init_decl_arg(arg_type, arg_var);
+			args = add_decl_arg(args, darg);
+		}
+
+		T.decls = add_decl(T.decls, decl);
+		predef_decl = farg;
+	}
+
+	for (predef_decl = &psi_predef_vararg_decls[0]; predef_decl->type_tag; ++predef_decl) {
+		struct psi_predef_decl *farg;
+		decl_type *ftype = init_decl_type(predef_decl->type_tag, predef_decl->type_name);
+		decl_var *fname = init_decl_var(predef_decl->var_name, predef_decl->pointer_level, predef_decl->array_size);
+		decl_arg *func = init_decl_arg(ftype, fname);
+		decl_args *args = init_decl_args(NULL);
+		decl *decl = init_decl(init_decl_abi("default"), func, args);
 
 		for (farg = &predef_decl[1]; farg->type_tag; ++farg) {
 			decl_type *arg_type = init_decl_type(farg->type_tag, farg->type_name);
@@ -812,6 +930,7 @@ PSI_Context *PSI_ContextInit(PSI_Context *C, PSI_ContextOps *ops, PSI_ContextErr
 			decl_arg *darg = init_decl_arg(arg_type, arg_var);
 			args = add_decl_arg(args, darg);
 		}
+		args->varargs = 1;
 
 		T.decls = add_decl(T.decls, decl);
 		predef_decl = farg;
@@ -912,7 +1031,7 @@ int PSI_ContextValidate(PSI_Context *C, PSI_Parser *P)
 		size_t i;
 
 		for (i = 0; i < D->impls->count; ++i) {
-			if (validate_impl_stmts(PSI_DATA(C), D->impls->list[i])) {
+			if (validate_impl(PSI_DATA(C), D->impls->list[i])) {
 				C->impls = add_impl(C->impls, D->impls->list[i]);
 			}
 		}
@@ -951,11 +1070,11 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths)
 				PSI_Parser P;
 
 				if (MAXPATHLEN <= slprintf(psi, MAXPATHLEN, "%s/%s", ptr, entries[i]->d_name)) {
-					C->error(PSI_WARNING, "Path to PSI file too long: %s/%s",
+					C->error(NULL, PSI_WARNING, "Path to PSI file too long: %s/%s",
 						ptr, entries[i]->d_name);
 				}
 				if (!PSI_ParserInit(&P, psi, C->error, flags)) {
-					C->error(PSI_WARNING, "Failed to init PSI parser (%s): %s",
+					C->error(NULL, PSI_WARNING, "Failed to init PSI parser (%s): %s",
 						psi, strerror(errno));
 					continue;
 				}
@@ -985,7 +1104,7 @@ void PSI_ContextBuild(PSI_Context *C, const char *paths)
 
 
 	if (PSI_ContextCompile(C) && SUCCESS != zend_register_functions(NULL, C->closures, NULL, MODULE_PERSISTENT)) {
-		C->error(PSI_WARNING, "Failed to register functions!");
+		C->error(NULL, PSI_WARNING, "Failed to register functions!");
 	}
 
 	free(cpy);
@@ -1027,9 +1146,9 @@ zend_function_entry *PSI_ContextCompile(PSI_Context *C)
 }
 
 
-void PSI_ContextCall(PSI_Context *C, impl_val *ret_val, decl *decl)
+void PSI_ContextCall(PSI_Context *C, decl_callinfo *decl_call, impl_vararg *va)
 {
-	C->ops->call(C, ret_val, decl);
+	C->ops->call(C, decl_call, va);
 }
 
 static inline void dump_decl_type(int fd, decl_type *t) {
@@ -1058,6 +1177,36 @@ static inline void dump_decl_arg(int fd, decl_arg *a) {
 static inline void dump_level(int fd, unsigned level) {
 	dprintf(fd, "%.*s", level, "\t\t\t\t\t\t\t\t\t");
 }
+static inline void dump_num_exp(int fd, num_exp *exp) {
+	while (exp) {
+		switch (exp->t) {
+		case PSI_T_NUMBER:
+			dprintf(fd, "%s", exp->u.numb);
+			break;
+		case PSI_T_NSNAME:
+			dprintf(fd, "%s", exp->u.cnst->name);
+			break;
+		case PSI_T_NAME:
+			dump_decl_var(fd, exp->u.dvar);
+			break;
+		EMPTY_SWITCH_DEFAULT_CASE();
+		}
+		if (exp->operand) {
+			char op;
+
+			switch (exp->operator) {
+			case PSI_T_PLUS:	op = '+'; break;
+			case PSI_T_MINUS:	op = '-'; break;
+			case PSI_T_ASTERISK:op = '*'; break;
+			case PSI_T_SLASH:	op = '/'; break;
+			EMPTY_SWITCH_DEFAULT_CASE();
+			}
+			dprintf(fd, " %c ", op);
+		}
+		exp = exp->operand;
+	}
+}
+
 static inline void dump_impl_set_value(int fd, set_value *set, unsigned level) {
 	size_t i;
 
@@ -1065,7 +1214,12 @@ static inline void dump_impl_set_value(int fd, set_value *set, unsigned level) {
 		/* only if not directly after `set ...` */
 		dump_level(fd, level);
 	}
-	dprintf(fd, "%s(", set->func->name);
+
+	if (set->func->type == PSI_T_ELLIPSIS) {
+		dprintf(fd, "%s(", set->outer.set->func->name);
+	} else {
+		dprintf(fd, "%s(", set->func->name);
+	}
 
 	for (i = 0; i < set->vars->count; ++i) {
 		decl_var *svar = set->vars->vars[i];
@@ -1074,6 +1228,14 @@ static inline void dump_impl_set_value(int fd, set_value *set, unsigned level) {
 		}
 		dump_decl_var(fd, svar);
 	}
+
+	if (set->func->type == PSI_T_ELLIPSIS) {
+		dprintf(fd, ", ...");
+	}
+	if (set->num) {
+		dprintf(fd, ", ");
+		dump_num_exp(fd, set->num);
+	}
 	if (set->inner) {
 		dprintf(fd, ",\n");
 		for (i = 0; i < set->count; ++i) {
@@ -1151,11 +1313,16 @@ void PSI_ContextDump(PSI_Context *C, int fd)
 			dprintf(fd, "%s ", decl->abi->convention);
 			dump_decl_arg(fd, decl->func);
 			dprintf(fd, "(");
-			if (decl->args) for (j = 0; j < decl->args->count; ++j) {
-				if (j) {
-					dprintf(fd, ", ");
+			if (decl->args) {
+				for (j = 0; j < decl->args->count; ++j) {
+					if (j) {
+						dprintf(fd, ", ");
+					}
+					dump_decl_arg(fd, decl->args->args[j]);
+				}
+				if (decl->args->varargs) {
+					dprintf(fd, ", ...");
 				}
-				dump_decl_arg(fd, decl->args->args[j]);
 			}
 			dprintf(fd, ");\n");
 		}
@@ -1166,16 +1333,26 @@ void PSI_ContextDump(PSI_Context *C, int fd)
 			impl *impl = C->impls->list[i];
 
 			dprintf(fd, "function %s(", impl->func->name);
-			if (impl->func->args) for (j = 0; j < impl->func->args->count; ++j) {
-				impl_arg *iarg = impl->func->args->args[j];
-
-				dprintf(fd, "%s%s %s$%s",
-						j ? ", " : "",
-						iarg->type->name,
-						iarg->var->reference ? "&" : "",
-						iarg->var->name);
-				if (iarg->def) {
-					dprintf(fd, " = %s", iarg->def->text);
+			if (impl->func->args) {
+				for (j = 0; j < impl->func->args->count; ++j) {
+					impl_arg *iarg = impl->func->args->args[j];
+
+					dprintf(fd, "%s%s %s$%s",
+							j ? ", " : "",
+							iarg->type->name,
+							iarg->var->reference ? "&" : "",
+							iarg->var->name);
+					if (iarg->def) {
+						dprintf(fd, " = %s", iarg->def->text);
+					}
+				}
+				if (impl->func->args->vararg.name) {
+					impl_arg *vararg = impl->func->args->vararg.name;
+
+					dprintf(fd, ", %s %s...$%s",
+							vararg->type->name,
+							vararg->var->reference ? "&" : "",
+							vararg->var->name);
 				}
 			}
 			dprintf(fd, ") : %s%s {\n",
@@ -1187,19 +1364,29 @@ void PSI_ContextDump(PSI_Context *C, int fd)
 
 					dprintf(fd, "\tlet %s", let->var->name);
 					if (let->val) {
-						dprintf(fd, " = %s", let->val->is_reference ? "&" : "");
-						if (let->val->func) {
-							dprintf(fd, "%s(", let->val->func->name);
-							if (let->val->func->alloc) {
-								dprintf(fd, "%zu, ", let->val->func->alloc->n);
-								dump_decl_type(fd, let->val->func->alloc->type);
-							} else {
-								dprintf(fd, "$%s", let->val->var->name);
-							}
-							dprintf(fd, ");\n");
-						} else {
-							dprintf(fd, "NULL;\n");
+						dprintf(fd, " = %s", let->val->flags.one.is_reference ? "&" : "");
+						switch (let->val->kind) {
+						case PSI_LET_NULL:
+							dprintf(fd, "NULL");
+							break;
+						case PSI_LET_TMP:
+							dump_decl_var(fd, let->val->data.var);
+							break;
+						case PSI_LET_CALLOC:
+							dprintf(fd, "calloc(");
+							dump_num_exp(fd, let->val->data.alloc->nmemb);
+							dprintf(fd, ", ");
+							dump_num_exp(fd, let->val->data.alloc->size);
+							dprintf(fd, ")");
+							break;
+						case PSI_LET_FUNC:
+							dprintf(fd, "%s($%s)", let->val->data.func->name,
+									let->val->data.func->var->name);
+							break;
+
+						EMPTY_SWITCH_DEFAULT_CASE();
 						}
+						dprintf(fd, ";\n");
 					}
 				}
 				for (j = 0; j < impl->stmts->ret.count; ++j) {