X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcontext.c;h=fd315eefcbc413558bdc10a6e91ff1ec296a040a;hp=f580f7f424bb70a8fd3d9fcd0a9ee9900539a55c;hb=b1720af16e5d7765e2effcd16e23f351c2f82e54;hpb=574519ef5e3ab76f00253fad870afce7135638d1

diff --git a/src/context.c b/src/context.c
index f580f7f..fd315ee 100644
--- a/src/context.c
+++ b/src/context.c
@@ -77,6 +77,9 @@
 #ifdef HAVE_TIME_H
 # include <time.h>
 #endif
+#ifdef HAVE_SYSLOG_H
+# include <syslog.h>
+#endif
 #ifdef HAVE_WCHAR_H
 # include <wchar.h>
 #endif
@@ -126,6 +129,15 @@ static struct psi_std_type {
 	{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 struct psi_predef_type {
 	token_t type_tag;
 	const char *type_name;
@@ -148,6 +160,12 @@ static struct psi_predef_const {
 
 PSI_MACROS
 
+struct utsname *uname2() {
+	struct utsname *u = calloc(1, sizeof(*u));
+	uname(u);
+	return u;
+}
+
 int psi_glob(const char *pattern, int flags,
                int (*errfunc) (const char *epath, int eerrno),
                glob_t *pglob) {
@@ -161,26 +179,12 @@ int psi_glob(const char *pattern, int flags,
 	return rv;
 }
 
-int psi_printf(const char *fmt, ...) {
-	int rs;
-	char *a1;
-	va_list ap1, ap2;
-
-	va_start(ap1, fmt);
-	va_copy(ap2, ap1);
-	a1 = va_arg(ap2, char *);
-	rs = vprintf(fmt, ap1);
-	va_end(ap1);
-	va_end(ap2);
-	return rs;
-}
-
 static struct psi_func_redir {
 	const char *name;
 	void (*func)(void);
 } psi_func_redirs[] = {
 	{"glob", (void (*)(void)) psi_glob},
-	{"printf", (void (*)(void)) psi_printf},
+	{"uname2", (void (*)(void)) uname2},
 	PSI_REDIRS
 	{0}
 };
@@ -195,6 +199,10 @@ static struct psi_predef_decl {
 	PSI_DECLS
 	{0}
 };
+static struct psi_predef_decl psi_predef_vararg_decls[] = {
+	PSI_VA_DECLS
+	{0}
+};
 
 static struct psi_predef_struct {
 	token_t type_tag;
@@ -208,7 +216,7 @@ static struct psi_predef_struct {
 	PSI_STRUCTS
 	{0}
 };
-
+*/
 static int validate_lib(PSI_Data *data, void **dlopened) {
 	char lib[MAXPATHLEN];
 	const char *ptr = data->psi.file.ln;
@@ -220,13 +228,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;
 	}
@@ -292,7 +300,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;
 	}
@@ -307,10 +316,9 @@ 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 decl var '%s'"
-				" in %s on line %zu at col %zu",
-			arg->type->name, arg->type->type, arg->var->name,
-			arg->type->token->file, arg->type->token->line, arg->type->token->col);
+		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;
 	}
 	return 1;
@@ -364,6 +372,7 @@ static const char * const abi_ccs[] = {
 		"default", /* \                 */
 		"extern",  /*  > - all the same */
 		"cdecl",   /* /                 */
+		"mscdecl",
 		"stdcall",
 		"fastcall",
 };
@@ -375,7 +384,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)
@@ -383,7 +391,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;
 	}
 
@@ -401,7 +409,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());
 		}
 	}
@@ -410,6 +419,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)) {
@@ -488,14 +499,14 @@ static inline int validate_num_exp(PSI_Data *data, decl_args *dargs, decl_arg *f
 	switch (exp->t) {
 	case PSI_T_NAME:
 		if (!locate_decl_var_arg(exp->u.dvar, dargs, func)) {
-			data->error(PSI_WARNING, "Unknown variable '%s' in numeric expression",
+			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(PSI_WARNING, "Unknown constant '%s' in numeric expression",
+			data->error(exp->token, PSI_WARNING, "Unknown constant '%s' in numeric expression",
 					exp->u.numb);
 			return 0;
 		}
@@ -529,6 +540,14 @@ static inline int validate_set_value_handler(set_value *set) {
 	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;
 	}
@@ -553,14 +572,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(PSI_WARNING, "Invalid cast '%s'", set->func->name);
+		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(PSI_WARNING, "Unknown variable '%s'", svar->name);
+			data->error(svar->token, PSI_WARNING, "Unknown variable '%s' in `set` statement", svar->name);
 			return 0;
 		}
 	}
@@ -575,7 +594,7 @@ static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg
 		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;
 		}
@@ -588,14 +607,15 @@ 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_...) */
-		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_ex(data, set->inner[i], sub_ref, ref_type->strct->args)) {
-					return 0;
+		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 (sub_ref) {
+					if (!validate_set_value_ex(data, set->inner[i], sub_ref, ref_type->strct->args)) {
+						return 0;
+					}
 				}
 			}
 		}
@@ -604,10 +624,9 @@ static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg
 		decl_var *sub_var = set->inner[0]->vars->vars[0];
 		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_ex(data, set->inner[0], sub_ref, ref_list)) {
@@ -615,7 +634,7 @@ static inline int validate_set_value_ex(PSI_Data *data, set_value *set, decl_arg
 			}
 		}
 	} 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;
 	}
 
@@ -657,11 +676,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;
@@ -670,8 +691,9 @@ 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;
 	}
 
@@ -701,7 +723,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(PSI_WARNING, "Unknown variable '%s' in `let` statement"
+			data->error(let_var->token, PSI_WARNING, "Unknown variable '%s' in `let` statement"
 					" of implementation '%s'", let_var->name, impl->func->name);
 			return 0;
 		}
@@ -748,7 +770,7 @@ static inline int validate_impl_let_stmts(PSI_Data *data, impl *impl) {
 				}
 			}
 			if (!check) {
-				data->error(PSI_WARNING, "Unknown value '$%s' of `let` statement"
+				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;
@@ -772,7 +794,8 @@ 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);
@@ -800,7 +823,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;
@@ -843,7 +866,7 @@ static inline int validate_impl_set_stmts(PSI_Data *data, impl *impl) {
 			}
 
 			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;
@@ -877,33 +900,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, 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 (!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;
@@ -915,7 +943,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;
  	}
@@ -937,6 +966,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;
@@ -1007,6 +1063,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);
@@ -1014,6 +1088,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;
@@ -1114,7 +1189,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]);
 			}
 		}
@@ -1153,11 +1228,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;
 				}
@@ -1187,7 +1262,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);
@@ -1289,6 +1364,7 @@ static inline void dump_num_exp(int fd, num_exp *exp) {
 		exp = exp->operand;
 	}
 }
+
 static inline void dump_impl_set_value(int fd, set_value *set, unsigned level) {
 	size_t i;
 
@@ -1296,7 +1372,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];
@@ -1305,6 +1386,10 @@ 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);