X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=607015d29e1412ee70ec207a14c57048e10b4d9c;hp=cf147b6b03c3306aff51080f198679680fc1750b;hb=c2dc24a4967dd767fc4a240f93ca0de4600a8c62;hpb=7d89722785c32163fe6252ed199c86ba6ee0e28c

diff --git a/src/module.c b/src/module.c
index cf147b6..607015d 100644
--- a/src/module.c
+++ b/src/module.c
@@ -33,16 +33,25 @@ PHP_INI_END();
 static zend_object_handlers psi_object_handlers;
 static zend_class_entry *psi_class_entry;
 
-void psi_error(int type, const char *msg, ...)
+void psi_error_wrapper(PSI_Token *t, int type, const char *msg, ...)
 {
-	char buf[0x1000];
 	va_list argv;
 
 	va_start(argv, msg);
-	vslprintf(buf, 0x1000, msg, argv);
+	psi_verror(type, t?t->file:"Unknown", t?*t->line:0, msg, argv);
 	va_end(argv);
+}
+void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...)
+{
+	va_list argv;
 
-	php_error(type, buf);
+	va_start(argv, msg);
+	psi_verror(type, fn, ln, msg, argv);
+	va_end(argv);
+}
+void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv)
+{
+	zend_error_cb(type, fn, ln, msg, argv);
 }
 
 size_t psi_t_alignment(token_t t)
@@ -288,6 +297,13 @@ void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
 	token_t t = real_decl_type(var->arg->type)->type;
 
 	switch (t) {
+	case PSI_T_FLOAT:
+		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
+		break;
+	case PSI_T_DOUBLE:
+		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
+		break;
+	default:
 	case PSI_T_VOID:
 	case PSI_T_INT8:
 	case PSI_T_UINT8:
@@ -306,13 +322,6 @@ void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
 			}
 		}
 		return;
-	case PSI_T_FLOAT:
-		RETVAL_DOUBLE((double) deref_impl_val(ret_val, var)->fval);
-		break;
-	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(deref_impl_val(ret_val, var)->dval);
-		break;
-	default:
 		psi_to_int(return_value, set, ret_val);
 		break;
 	}
@@ -377,6 +386,11 @@ void *psi_array_to_struct(decl_struct *s, HashTable *arr)
 	return mem;
 }
 
+void psi_to_recursive(zval *return_value, set_value *set, impl_val *r_val)
+{
+	set->outer.set->func->handler(return_value, set->outer.set, r_val->ptr);
+}
+
 void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
 {
 	size_t i;
@@ -476,7 +490,6 @@ void psi_to_object(zval *return_value, set_value *set, impl_val *r_val)
 static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, impl *impl)
 {
 	size_t i;
-	zval *zarg = ZEND_CALL_ARG(execute_data, 0);
 	impl_arg *iarg;
 	zend_error_handling zeh;
 
@@ -532,6 +545,8 @@ static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, i
 			error_code = ZPP_ERROR_FAILURE;
 			break;
 		}
+		iarg->_zv = _arg;
+		ZVAL_DEREF(iarg->_zv);
 		if (_i < _num_args) {
 			goto nextarg;
 		}
@@ -542,12 +557,9 @@ static inline ZEND_RESULT_CODE psi_parse_args(zend_execute_data *execute_data, i
 
 	/* set up defaults */
 	for (i = 0; i < impl->func->args->count; ++i) {
-		iarg = impl->func->args->args[i];
+		if (i >= EX_NUM_ARGS() && iarg->def) {
+			iarg = impl->func->args->args[i];
 
-		if (i < EX_NUM_ARGS()) {
-			iarg->_zv = ++zarg;
-			ZVAL_DEREF(iarg->_zv);
-		} else if (iarg->def) {
 			switch (iarg->type->type) {
 			case PSI_T_BOOL:
 				iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
@@ -579,21 +591,6 @@ static inline void *psi_do_calloc(let_calloc *alloc)
 	return mem;
 }
 
-static inline token_t psi_let_fn(token_t impl_type) {
-	switch (impl_type) {
-	case PSI_T_BOOL:
-		return PSI_T_BOOLVAL;
-	case PSI_T_INT:
-		return PSI_T_INTVAL;
-	case PSI_T_FLOAT:
-	case PSI_T_DOUBLE:
-		return PSI_T_FLOATVAL;
-	case PSI_T_STRING:
-		return PSI_T_STRVAL;
-	}
-	return 0;
-}
-
 static inline ZEND_RESULT_CODE psi_let_val(token_t let_func, impl_arg *iarg, impl_val *arg_val, decl_struct *strct, void **to_free)
 {
 	switch (let_func) {
@@ -704,7 +701,7 @@ static inline void *psi_do_let(let_stmt *let)
 	case PSI_LET_FUNC:
 		iarg = let->val->data.func->arg;
 
-		if (SUCCESS != psi_let_val(let->val->data.func->type, iarg, real_decl_type(darg->type)->strct, darg->ptr, &darg->mem)) {
+		if (SUCCESS != psi_let_val(let->val->data.func->type, iarg, darg->ptr, real_decl_type(darg->type)->strct, &darg->mem)) {
 			return NULL;
 		}
 	}
@@ -742,7 +739,7 @@ static inline void psi_do_free(free_stmt *fre)
 		}
 
 		/* FIXME: check in validate_* that free functions return scalar */
-		PSI_ContextCall(&PSI_G(context), &f->decl->call);
+		PSI_ContextCall(&PSI_G(context), &f->decl->call, NULL);
 	}
 }
 
@@ -779,6 +776,29 @@ static inline void psi_do_clean(impl *impl)
 			darg->mem = NULL;
 		}
 	}
+
+	if (impl->func->args->vararg.args) {
+		free_impl_args(impl->func->args->vararg.args);
+		impl->func->args->vararg.args = NULL;
+	}
+	if (impl->func->args->vararg.types) {
+		efree(impl->func->args->vararg.types);
+		impl->func->args->vararg.types = NULL;
+	}
+	if (impl->func->args->vararg.values) {
+		efree(impl->func->args->vararg.values);
+		impl->func->args->vararg.values = NULL;
+	}
+	if (impl->func->args->vararg.free_list) {
+		void **list = impl->func->args->vararg.free_list;
+
+		while (*list) {
+			efree(*list++);
+		}
+
+		efree(impl->func->args->vararg.free_list);
+		impl->func->args->vararg.free_list = NULL;
+	}
 }
 
 static inline int psi_calc_num_exp_value(num_exp *exp, impl_val *strct, impl_val *res) {
@@ -1015,33 +1035,62 @@ static inline void psi_do_args(impl *impl) {
 	}
 }
 
-static inline void psi_do_varargs(impl *impl, void ***free_list) {
+static inline impl_vararg *psi_do_varargs(impl *impl) {
 	size_t i, j;
 	impl_vararg *va = &impl->func->args->vararg;
 	size_t vacount = va->args->count;
-	void **tmpvals = calloc(vacount, sizeof(*tmpvals));
-	token_t type = psi_let_fn(va->name->type->type);
 
-	va->types = calloc(vacount, sizeof(*va->types));
-	va->values = calloc(vacount, sizeof(*va->values));
+
+	if (!vacount) {
+		return NULL;
+	}
+
+	va->types = ecalloc(vacount, sizeof(*va->types));
+	va->values = ecalloc(vacount, sizeof(*va->values));
 
 	for (i = 0, j = 0; i < vacount; ++i) {
 		impl_arg *vaarg = va->args->args[i];
 		void *to_free = NULL;
+		token_t let_fn, vatype = va->name->type->type;
+
+		if (vatype == PSI_T_MIXED) {
+			switch (Z_TYPE_P(vaarg->_zv)) {
+			case IS_TRUE:
+			case IS_FALSE:	vatype = PSI_T_BOOL;	break;
+			case IS_LONG:	vatype = PSI_T_INT;		break;
+			case IS_DOUBLE:	vatype = PSI_T_FLOAT;	break;
+			default:		vatype = PSI_T_STRING;	break;
+			}
+		}
+
+
+		switch (vatype) {
+		case PSI_T_BOOL:	let_fn = PSI_T_BOOLVAL;	break;
+		case PSI_T_INT:		let_fn = PSI_T_INTVAL;	break;
+		case PSI_T_FLOAT:
+		case PSI_T_DOUBLE:	let_fn = PSI_T_FLOATVAL;break;
+		case PSI_T_STRING:	let_fn = PSI_T_STRVAL;	break;
+		EMPTY_SWITCH_DEFAULT_CASE();
+		}
+
+		va->types[i] = vatype;
+		psi_let_val(let_fn, vaarg, &va->values[i], NULL, &to_free);
 
-		psi_let_val(type, vaarg, &va->values[i], NULL, &to_free);
 		if (to_free) {
-			*free_list = realloc(*free_list, (j + 1) * sizeof(*free_list));
-			(*free_list)[j++] = to_free;
+			if (!va->free_list) {
+				va->free_list = ecalloc(vacount - i + 1, sizeof(*va->free_list));
+			}
+			va->free_list[j++] = to_free;
 		}
 	}
+
+	return va;
 }
 
 void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
 {
-	size_t i, j;
-	decl_callinfo *call = &impl->decl->call;
-	void **free_list = NULL;
+	size_t i;
+	impl_vararg *va = NULL;
 
 	memset(impl->decl->func->ptr, 0, sizeof(impl_val));
 
@@ -1063,15 +1112,11 @@ void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
 		psi_do_args(impl);
 
 		if (impl->func->args->vararg.args) {
-			call = psi_do_varargs(impl, &free_list);
+			va = psi_do_varargs(impl);
 		}
 	}
 
-	if (impl->func->args->vararg.args) {
-		PSI_ContextCallVarargs(&PSI_G(context), &impl->decl->call)
-	} else {
-		PSI_ContextCall(&PSI_G(context), &impl->decl->call);
-	}
+	PSI_ContextCall(&PSI_G(context), &impl->decl->call, va);
 	psi_do_return(return_value, impl->stmts->ret.list[0]);
 
 	for (i = 0; i < impl->stmts->set.count; ++i) {
@@ -1141,7 +1186,7 @@ PHP_MINIT_FUNCTION(psi)
 		return FAILURE;
 	}
 
-	PSI_ContextInit(&PSI_G(context), ops, psi_error);
+	PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper);
 	PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
 
 	if (psi_check_env("PSI_DUMP")) {