X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fmodule.c;h=aff784dbc28235c13f65583f69c58f6962638d25;hp=57c93993f980c700a9bf1a5a400d74dd9f9ad6cc;hb=d3171526ab7658114cac4ebe1098af4b038e576e;hpb=39b256d8a981d4b1eb250043803acac8d82c1829

diff --git a/src/module.c b/src/module.c
index 57c9399..aff784d 100644
--- a/src/module.c
+++ b/src/module.c
@@ -1,18 +1,15 @@
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
 #include "php.h"
 #include "php_ini.h"
 #include "ext/standard/info.h"
-#include "zend_exceptions.h"
 #include "zend_constants.h"
 #include "zend_operators.h"
 
 #include "php_psi.h"
-#include "parser.h"
-#include "context.h"
 
 #if HAVE_LIBJIT
 # include "libjit.h"
@@ -35,1034 +32,133 @@ 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, ...)
+zend_class_entry *psi_object_get_class_entry()
 {
-	char buf[0x1000];
-	va_list argv;
-
-	va_start(argv, msg);
-	vslprintf(buf, 0x1000, msg, argv);
-	va_end(argv);
-
-	php_error(type, buf);
-}
-
-size_t psi_t_alignment(token_t t)
-{
-#define PSI_ALIGNOF(T) case PSI_T_## T: return ALIGNOF_## T ##_T;
-	switch (t) {
-	PSI_ALIGNOF(INT8);
-	PSI_ALIGNOF(UINT8);
-	PSI_ALIGNOF(INT16);
-	PSI_ALIGNOF(UINT16);
-	PSI_ALIGNOF(INT32);
-	PSI_ALIGNOF(UINT32);
-	PSI_ALIGNOF(INT64);
-	PSI_ALIGNOF(UINT64);
-	case PSI_T_FLOAT:
-		return ALIGNOF_FLOAT;
-	case PSI_T_DOUBLE:
-		return ALIGNOF_DOUBLE;
-	case PSI_T_POINTER:
-		return ALIGNOF_VOID_P;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
-	return 0;
-}
-
-size_t psi_t_size(token_t t)
-{
-#define PSI_SIZEOF(T) case PSI_T_## T : return SIZEOF_## T ##_T;
-	switch (t) {
-	PSI_SIZEOF(INT8);
-	PSI_SIZEOF(UINT8);
-	PSI_SIZEOF(INT16);
-	PSI_SIZEOF(UINT16);
-	PSI_SIZEOF(INT32);
-	PSI_SIZEOF(UINT32);
-	PSI_SIZEOF(INT64);
-	PSI_SIZEOF(UINT64);
-	case PSI_T_FLOAT:
-		return SIZEOF_FLOAT;
-	case PSI_T_DOUBLE:
-		return SIZEOF_DOUBLE;
-	case PSI_T_POINTER:
-		return SIZEOF_VOID_P;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
-	return 0;
-}
-
-size_t psi_t_align(token_t t, size_t s)
-{
-	size_t a = psi_t_alignment(t);
-	return ((s - 1) | (a - 1)) + 1;
-}
-
-int psi_internal_type(impl_type *type)
-{
-	switch (type->type) {
-	case PSI_T_BOOL:
-		return _IS_BOOL;
-	case PSI_T_INT:
-		return IS_LONG;
-	case PSI_T_FLOAT:
-	case PSI_T_DOUBLE:
-		return IS_DOUBLE;
-	case PSI_T_STRING:
-		return IS_STRING;
-	case PSI_T_ARRAY:
-		return IS_ARRAY;
-	default:
-		return 0;
-	}
+	return psi_class_entry;
 }
 
-zend_internal_arg_info *psi_internal_arginfo(impl *impl)
+void psi_error_wrapper(void *context, PSI_Token *t, int type, const char *msg, ...)
 {
-	size_t i;
-	zend_internal_arg_info *aip;
-	zend_internal_function_info *fi;
-
-	aip = calloc(impl->func->args->count + 1, sizeof(*aip));
-
-	fi = (zend_internal_function_info *) &aip[0];
-	fi->required_num_args = psi_num_min_args(impl);
-	fi->return_reference = impl->func->return_reference;
-	fi->type_hint = psi_internal_type(impl->func->return_type);
-
-	for (i = 0; i < impl->func->args->count; ++i) {
-		impl_arg *iarg = impl->func->args->args[i];
-		zend_internal_arg_info *ai = &aip[i+1];
-
-		ai->name = iarg->var->name;
-		ai->type_hint = psi_internal_type(iarg->type);
-		if (iarg->var->reference) {
-			ai->pass_by_reference = 1;
-		}
-		if (iarg->var->reference || (iarg->def && iarg->def->type == PSI_T_NULL)) {
-			ai->allow_null = 1;
-		}
-	}
-
-	return aip;
-}
-
-size_t psi_num_min_args(impl *impl)
-{
-	size_t i, n = impl->func->args->count;
+	va_list argv;
+	const char *fn = NULL;
+	unsigned ln = 0;
 
-	for (i = 0; i < impl->func->args->count; ++i) {
-		if (impl->func->args->args[i]->def) {
-			--n;
+	if (context) {
+		if (PSI_DATA(context)->flags & PSI_PARSER_SILENT) {
+			return;
 		}
 	}
-	return n;
-}
 
-void psi_to_void(zval *return_value, set_value *set, impl_val *ret_val)
-{
-	RETVAL_NULL();
-}
-
-void psi_to_bool(zval *return_value, set_value *set, impl_val *ret_val)
-{
-	psi_to_int(return_value, set, ret_val);
-	convert_to_boolean(return_value);
-}
-
-void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val)
-{
-	decl_var *var = set->vars->vars[0];
-	token_t t = real_decl_type(var->arg->type)->type;
-	impl_val *v = deref_impl_val(ret_val, var);
-
-	switch (t) {
-	case PSI_T_FLOAT:
-		RETVAL_DOUBLE((double) v->fval);
-		convert_to_long(return_value);
-		break;
-	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(v->dval);
-		convert_to_long(return_value);
-		break;
-	case PSI_T_INT8:
-		RETVAL_LONG(v->i8);
-		break;
-	case PSI_T_UINT8:
-		RETVAL_LONG(v->u8);
-		break;
-	case PSI_T_INT16:
-		RETVAL_LONG(v->i16);
-		break;
-	case PSI_T_UINT16:
-		RETVAL_LONG(v->u16);
-		break;
-	case PSI_T_INT32:
-		RETVAL_LONG(v->i32);
-		break;
-	case PSI_T_UINT32:
-#if UINT32_MAX >= ZEND_LONG_MAX
-		if (v->u32 > ZEND_LONG_MAX) {
-			char d[12] = {0};
-
-			RETVAL_STRING(zend_print_ulong_to_buf(&d[10], v->u32));
-		} else {
-#endif
-			RETVAL_LONG(v->u32);
-#if UINT32_MAX >= ZEND_LONG_MAX
-		}
-#endif
-		break;
-	case PSI_T_INT64:
-		RETVAL_LONG(v->i64);
-		break;
-	case PSI_T_UINT64:
-		if (v->u64 > ZEND_LONG_MAX) {
-			char d[24] = {0};
-
-			RETVAL_STRING(zend_print_ulong_to_buf(&d[22], v->u64));
-		} else {
-			RETVAL_LONG(v->u64);
-		}
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
+	if (t) {
+		fn = t->file;
+		ln = t->line;
+	} else if (zend_is_executing()) {
+		fn = zend_get_executed_filename();
+		ln = zend_get_executed_lineno();
+	} else if (zend_is_compiling()) {
+		fn = zend_get_compiled_filename()->val;
+		ln = zend_get_compiled_lineno();
 	}
-}
 
-void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val)
-{
-	decl_var *var = set->vars->vars[0];
-	token_t t = real_decl_type(var->arg->type)->type;
-	impl_val *v = deref_impl_val(ret_val, var);
-
-	switch (t) {
-	case PSI_T_FLOAT:
-		RETVAL_DOUBLE((double) v->fval);
-		break;
-	case PSI_T_DOUBLE:
-		RETVAL_DOUBLE(v->dval);
-		break;
-	case PSI_T_INT8:
-		RETVAL_DOUBLE((double) v->i8);
-		break;
-	case PSI_T_UINT8:
-		RETVAL_DOUBLE((double) v->u8);
-		break;
-	case PSI_T_INT16:
-		RETVAL_DOUBLE((double) v->i16);
-		break;
-	case PSI_T_UINT16:
-		RETVAL_DOUBLE((double) v->u16);
-		break;
-	case PSI_T_INT32:
-		RETVAL_DOUBLE((double) v->i32);
-		break;
-	case PSI_T_UINT32:
-		RETVAL_DOUBLE((double) v->u32);
-		break;
-	case PSI_T_INT64:
-		RETVAL_DOUBLE((double) v->i64);
-		break;
-	case PSI_T_UINT64:
-		RETVAL_DOUBLE((double) v->u64);
-		break;
-	EMPTY_SWITCH_DEFAULT_CASE();
-	}
+	va_start(argv, msg);
+	psi_verror(type, fn, ln, msg, argv);
+	va_end(argv);
 }
 
-void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val)
+void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...)
 {
-	decl_var *var = set->vars->vars[0];
-	token_t t = real_decl_type(var->arg->type)->type;
+	va_list argv;
 
-	switch (t) {
-	case PSI_T_VOID:
-	case PSI_T_INT8:
-	case PSI_T_UINT8:
-		if (!var->arg->var->pointer_level) {
-			RETVAL_STRINGL(&ret_val->cval, 1);
-		} else {
-			ret_val = deref_impl_val(ret_val, var);
-			if (ret_val && ret_val->ptr) {
-				if (set->num) {
-					RETVAL_STRINGL(ret_val->ptr, psi_long_num_exp(set->num, set->outer.val));
-				} else {
-					RETVAL_STRING(ret_val->ptr);
-				}
-			} else {
-				RETVAL_EMPTY_STRING();
-			}
-		}
-		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;
-	}
-	convert_to_string(return_value);
+	va_start(argv, msg);
+	psi_verror(type, fn, ln, msg, argv);
+	va_end(argv);
 }
 
-
-static impl_val *iterate(impl_val *val, size_t size, unsigned i, impl_val *tmp)
+void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv)
 {
-	memset(tmp, 0, sizeof(*tmp));
-	memcpy(tmp, ((void*) val->ptr) + size * i, size);
-	return tmp;
+	zend_error_cb(type, fn, ln, msg, argv);
 }
 
-void psi_from_zval(impl_val *mem, decl_arg *spec, zval *zv, void **tmp)
+static void psi_object_free(zend_object *o)
 {
-	decl_type *type = real_decl_type(spec->type);
+	psi_object *obj = PSI_OBJ(NULL, o);
 
-	switch (type->type) {
-	case PSI_T_FLOAT:
-		mem->fval = (float) zval_get_double(zv);
-		break;
-	case PSI_T_DOUBLE:
-		mem->dval = zval_get_double(zv);
-		break;
-	case PSI_T_INT8:
-	case PSI_T_UINT8:
-		if (spec->var->pointer_level) {
-			zend_string *zs = zval_get_string(zv);
-			*tmp = mem->ptr = estrndup(zs->val, zs->len);
-			zend_string_release(zs);
-			break;
-		}
-		/* no break */
-	default:
-		mem->zend.lval = zval_get_long(zv);
-		break;
+	if (obj->data) {
+		/* FIXME: how about registering a destructor?
+		// free(obj->data); */
+		obj->data = NULL;
 	}
+	zend_object_std_dtor(o);
 }
 
-void *psi_array_to_struct(decl_struct *s, HashTable *arr)
+static zend_object *psi_object_init(zend_class_entry *ce)
 {
-	size_t i, j = 0;
-	char *mem = ecalloc(1, s->size + s->args->count * sizeof(void *));
-
-	if (arr) for (i = 0; i < s->args->count; ++i) {
-		decl_arg *darg = s->args->args[i];
-		zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
-
-		if (entry) {
-			impl_val val;
-			void *tmp = NULL;
+	psi_object *o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
 
-			memset(&tmp, 0, sizeof(tmp));
-			psi_from_zval(&val, darg, entry, &tmp);
-			memcpy(mem + darg->layout->pos, &val, darg->layout->len);
-			if (tmp) {
-				((void **)(mem + s->size))[j++] = tmp;
-			}
-		}
-	}
-	return mem;
+	zend_object_std_init(&o->std, ce);
+	object_properties_init(&o->std, ce);
+	o->std.handlers = &psi_object_handlers;
+	return &o->std;
 }
 
-void psi_to_array(zval *return_value, set_value *set, impl_val *r_val)
-{
-	size_t i;
-	decl_var *var = set->vars->vars[0];
-	token_t t = real_decl_type(var->arg->type)->type;
-	impl_val tmp, *ret_val = deref_impl_val(r_val, var);
-
-	array_init(return_value);
-
-	if (t == PSI_T_STRUCT) {
-		// decl_struct *s = real_decl_type(var->arg->type)->strct;
-
-		if (set->count) {
-			/* explicit member casts */
-			for (i = 0; i < set->count; ++i) {
-				set_value *sub_set = set->inner[i];
-				decl_var *sub_var = sub_set->vars->vars[0];
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_dump, 0, 0, 0)
+	ZEND_ARG_INFO(0, stream)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_dump) {
+	php_stream *s;
+	zval *r = NULL;
+	int fd = STDOUT_FILENO;
 
-				sub_set->outer.val = r_val;
-
-				if (sub_var->arg) {
-					impl_val *tmp = NULL, *val;
-					zval ztmp;
-
-					val = deref_impl_val(struct_member_ref(sub_var->arg, ret_val, &tmp), sub_var);
-					sub_set->func->handler(&ztmp, sub_set, val);
-					add_assoc_zval(return_value, sub_var->name, &ztmp);
-
-					if (tmp) {
-						free(tmp);
-					}
-				}
-			}
-		}
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "|r!", &r)) {
 		return;
 	}
+	if (r) {
+		php_stream_from_zval(s, r);
 
-	if (var->arg->var->array_size) {
-		/* to_array(foo[NUMBER]) */
-		for (i = 0; i < var->arg->var->array_size; ++i) {
-			size_t size = psi_t_size(var->arg->var->pointer_level > 1 ? PSI_T_POINTER : t);
-			impl_val *ptr = iterate(ret_val, size, i, &tmp);
-			zval ele;
-
-			switch (t) {
-			case PSI_T_FLOAT:
-				ZVAL_DOUBLE(&ele, (double) ptr->fval);
-				break;
-			case PSI_T_DOUBLE:
-				ZVAL_DOUBLE(&ele, ptr->dval);
-				break;
-			default:
-				ZVAL_LONG(&ele, ptr->lval);
-				break;
-			}
-
-			add_next_index_zval(return_value, &ele);
+		if (SUCCESS != php_stream_cast(s, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void **)&fd, 1)) {
+			RETURN_FALSE;
 		}
-		return;
-	} else if (set->vars->count > 1) {
-		/* to_array(arr_var, cnt_var[, cnt_var...], to_int(*arr_var))
-		 * check for length in second var
-		 * /
-		size_t count = 0;
-		zval ele;
-
-		if (set->outer.set) {
-			/ * struct *//*
-			for (i = 1; i < set->vars->count; ++i) {
-				impl_val *tmp = NULL, *cnt_val;
-				decl_var *cnt_var = set->vars->vars[i];
-
-				cnt_val = struct_member_ref(cnt_var->arg, set->outer.val, &tmp);
-				count += deref_impl_val(cnt_val, cnt_var)->lval;
-
-				if (tmp) {
-					free(tmp);
-				}
-			}
-		} else {
-			ZEND_ASSERT(0);
-		}
-
-		for (i = 0; i < count; ++i) {
-			size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
-			impl_val *ptr = iterate(ret_val, size, i, &tmp);
-
-			set->inner[0]->func->handler(&ele, set->inner[0], ptr);
-			add_next_index_zval(return_value, &ele);
-		}
-		*/
-	} else if (set->num) {
-		/* to_array(arr_var, num_expr, to_int(*arr_var))
-		 */
-		zval ele;
-		zend_long i, n = psi_long_num_exp(set->num, set->outer.val);
-
-		for (i = 0; i < n; ++i) {
-			size_t size = psi_t_size(var->arg->var->pointer_level ? PSI_T_POINTER : t);
-			impl_val *ptr = iterate(ret_val, size, i, &tmp);
-
-			set->inner[0]->func->handler(&ele, set->inner[0], ptr);
-			add_next_index_zval(return_value, &ele);
-		}
-	} else {
-		ZEND_ASSERT(0);
 	}
+	PSI_ContextDump(&PSI_G(context), fd);
 }
 
-void psi_to_object(zval *return_value, set_value *set, impl_val *r_val)
-{
-	decl_var *var = set->vars->vars[0];
-	impl_val *ret_val = deref_impl_val(r_val, var);
-	psi_object *obj;
+ZEND_BEGIN_ARG_INFO_EX(ai_psi_validate, 0, 0, 1)
+	ZEND_ARG_INFO(0, file)
+ZEND_END_ARG_INFO();
+static PHP_FUNCTION(psi_validate) {
+	zend_string *file;
+	PSI_Parser P;
 
-	if (ret_val->ptr) {
-		object_init_ex(return_value, psi_class_entry);
-		obj = PSI_OBJ(return_value, NULL);
-		obj->data = ret_val->ptr;
-	} else {
-		RETVAL_NULL();
-	}
-}
-
-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;
-
-	zend_replace_error_handling(EH_THROW, zend_exception_get_default(), &zeh);
-
-	if (!impl->func->args->count) {
-		ZEND_RESULT_CODE rv;
-
-		rv = zend_parse_parameters_none();
-		zend_restore_error_handling(&zeh);
-		return rv;
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "P", &file)) {
+		return;
 	}
 
-	/* set up defaults */
-	for (i = 0; i < impl->func->args->count; ++i) {
-		iarg = impl->func->args->args[i];
-
-		if (i < EX_NUM_ARGS()) {
-			iarg->_zv = ++zarg;
-			ZVAL_DEREF(iarg->_zv);
-//			if (iarg->var->reference) {
-//				zval_dtor(iarg->_zv);
-//				ZVAL_NULL(iarg->_zv);
-//			}
-		}
-
-		if (iarg->def) {
-			switch (iarg->type->type) {
-			case PSI_T_BOOL:
-				iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
-				break;
-			case PSI_T_INT:
-				iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
-				break;
-			case PSI_T_FLOAT:
-			case PSI_T_DOUBLE:
-				iarg->val.dval = zend_strtod(iarg->def->text, NULL);
-				break;
-			case PSI_T_STRING:
-				/* FIXME */
-				iarg->val.zend.str = zend_string_init(&iarg->def->text[1], strlen(iarg->def->text) - 2, 0);
-				break;
-			}
-		}
+	if (!PSI_ParserInit(&P, file->val, psi_error_wrapper, 0)) {
+		RETURN_FALSE;
 	}
 
-	ZEND_PARSE_PARAMETERS_START(psi_num_min_args(impl), impl->func->args->count)
-	nextarg:
-		iarg = impl->func->args->args[_i];
-		if (iarg->def) {
-			Z_PARAM_OPTIONAL;
-		}
-		if (PSI_T_BOOL == iarg->type->type) {
-			if (iarg->def) {
-				iarg->val.zend.bval = iarg->def->type == PSI_T_TRUE ? 1 : 0;
-			}
-			Z_PARAM_BOOL(iarg->val.zend.bval);
-		} else if (PSI_T_INT == iarg->type->type) {
-			if (iarg->def) {
-				iarg->val.zend.lval = zend_atol(iarg->def->text, strlen(iarg->def->text));
-			}
-			Z_PARAM_LONG(iarg->val.zend.lval);
-		} else if (PSI_T_FLOAT == iarg->type->type || PSI_T_DOUBLE == iarg->type->type) {
-			if (iarg->def) {
-				iarg->val.dval = zend_strtod(iarg->def->text, NULL);
-			}
-			Z_PARAM_DOUBLE(iarg->val.dval);
-		} else if (PSI_T_STRING == iarg->type->type) {
-			zend_string *str = iarg->val.zend.str;
-			Z_PARAM_STR_EX(iarg->val.zend.str, 1, iarg->var->reference);
-			if (str && str != iarg->val.zend.str) {
-				zend_string_release(str);
-			}
-		} else if (PSI_T_ARRAY == iarg->type->type) {
-			Z_PARAM_PROLOGUE(0);
-		} else if (PSI_T_OBJECT == iarg->type->type) {
-			Z_PARAM_PROLOGUE(0);
-		} else {
-			error_code = ZPP_ERROR_FAILURE;
-			break;
-		}
-		if (_i < _num_args) {
-			goto nextarg;
-		}
-	ZEND_PARSE_PARAMETERS_END_EX(
-		zend_restore_error_handling(&zeh);
-		return FAILURE
-	);
-
-	zend_restore_error_handling(&zeh);
-	return SUCCESS;
-}
-
-static inline void *psi_do_calloc(let_calloc *alloc)
-{
-	zend_long n = psi_long_num_exp(alloc->nmemb, NULL), s = psi_long_num_exp(alloc->size, NULL);
-	void *mem = safe_emalloc(n, s, sizeof(void *));
-	memset(mem, 0, n * s + sizeof(void *));
-	return mem;
-}
-
-static inline void *psi_do_let(let_stmt *let)
-{
-	decl_arg *darg = let->var->arg;
-	impl_arg *iarg = darg->let->arg;
-	impl_val *arg_val = darg->ptr;
-
-	if (!iarg) {
-		/* let foo = calloc(1, long);
-		 * let foo = NULL;
-		 * let foo;
-		 */
-		if (darg->let->val->func && darg->let->val->func->type == PSI_T_CALLOC) {
-			arg_val->ptr = psi_do_calloc(darg->let->val->func->alloc);
-			darg->mem = arg_val->ptr;
-		} else if (darg->var->array_size) {
-			arg_val->ptr = ecalloc(darg->var->array_size, sizeof(*arg_val));
-			darg->mem = arg_val->ptr;
-		} else {
-			memset(arg_val, 0, sizeof(*arg_val));
-		}
-	} else {
-
-		switch (darg->let->val->func->type) {
-		case PSI_T_BOOLVAL:
-			if (iarg->type->type == PSI_T_BOOL) {
-				arg_val->cval = iarg->val.zend.bval;
-			} else {
-				arg_val->cval = zend_is_true(iarg->_zv);
-			}
-			break;
-		case PSI_T_INTVAL:
-			if (iarg->type->type == PSI_T_INT) {
-				arg_val->lval = iarg->val.zend.lval;
-			} else {
-				arg_val->lval = zval_get_long(iarg->_zv);
-			}
-			break;
-		case PSI_T_PATHVAL:
-		case PSI_T_STRVAL:
-			if (iarg->type->type == PSI_T_STRING) {
-				arg_val->ptr = estrdup(iarg->val.zend.str->val);
-				darg->mem = arg_val->ptr;
-				zend_string_release(iarg->val.zend.str);
-			} else {
-				zend_string *zs = zval_get_string(iarg->_zv);
-				arg_val->ptr = estrdup(zs->val);
-				darg->mem = arg_val->ptr;
-				zend_string_release(zs);
-			}
-			if (PSI_T_PATHVAL == darg->let->val->func->type) {
-				if (SUCCESS != php_check_open_basedir(arg_val->ptr)) {
-					efree(arg_val->ptr);
-					return NULL;
-				}
-			}
-			break;
-		case PSI_T_STRLEN:
-			if (iarg->type->type == PSI_T_STRING) {
-				arg_val->lval = iarg->val.zend.str->len;
-				zend_string_release(iarg->val.zend.str);
-			} else {
-				zend_string *zs = zval_get_string(iarg->_zv);
-				arg_val->lval = zs->len;
-				zend_string_release(zs);
-			}
-			break;
-		case PSI_T_ARRVAL:
-			if (iarg->type->type == PSI_T_ARRAY) {
-				decl_type *type = real_decl_type(darg->type);
-
-				switch (type->type) {
-				case PSI_T_STRUCT:
-					arg_val->ptr = psi_array_to_struct(type->strct, HASH_OF(iarg->_zv));
-					darg->mem = arg_val->ptr;
-					break;
-				}
-			}
-			break;
-		case PSI_T_OBJVAL:
-			if (iarg->type->type == PSI_T_OBJECT) {
-				psi_object *obj;
-
-				if (!instanceof_function(Z_OBJCE_P(iarg->_zv), psi_class_entry)) {
-					return NULL;
-				}
-
-				obj = PSI_OBJ(iarg->_zv, NULL);
-				arg_val->ptr = obj->data;
-			}
+	while (0 < PSI_ParserScan(&P)) {
+		PSI_ParserParse(&P, PSI_TokenAlloc(&P));
+		if (P.num == PSI_T_EOF) {
 			break;
-		EMPTY_SWITCH_DEFAULT_CASE();
 		}
 	}
+	PSI_ParserParse(&P, NULL);
 
-	if (darg->let->val && darg->let->val->is_reference) {
-		return darg->let->ptr = &darg->ptr;
+	if (0 == PSI_ContextValidateData(NULL, PSI_DATA(&P)) && !P.errors) {
+		RETVAL_TRUE;
 	} else {
-		return darg->let->ptr = darg->ptr;
-	}
-}
-
-static inline void psi_do_set(zval *return_value, set_value *set)
-{
-	zval_dtor(return_value);
-	set->func->handler(return_value, set, set->vars->vars[0]->arg->ptr);
-}
-
-static inline void psi_do_return(zval *return_value, return_stmt *ret)
-{
-	ret->set->func->handler(return_value, ret->set, ret->set->vars->vars[0]->arg->ptr);
-}
-
-static inline void psi_do_return2(zval *return_value, return_stmt *ret, impl_val *ret_val)
-{
-	ret->set->func->handler(return_value, ret->set, ret_val);
-}
-
-static inline void psi_do_free(free_stmt *fre)
-{
-	size_t i, j;
-	impl_val dummy;
-
-	for (i = 0; i < fre->calls->count; ++i) {
-		free_call *f = fre->calls->list[i];
-
-		for (j = 0; j < f->vars->count; ++j) {
-			decl_var *dvar = f->vars->vars[j];
-			decl_arg *darg = dvar->arg;
-
-			f->decl->call.args[j] = &darg->val;
-		}
-
-		/* FIXME: check in validate_* that free functions return scalar */
-		PSI_ContextCall(&PSI_G(context), &dummy, f->decl);
-	}
-}
-
-static inline void psi_do_clean(impl *impl)
-{
-	size_t i;
-
-	for (i = 0; i < impl->func->args->count; ++i ) {
-		impl_arg *iarg = impl->func->args->args[i];
-
-		switch (iarg->type->type) {
-		case PSI_T_STRING:
-			if (iarg->val.zend.str) {
-				zend_string_release(iarg->val.zend.str);
-			}
-			break;
-		}
-	}
-
-	if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
-		decl_arg *darg = impl->decl->args->args[i];
-
-		if (darg->mem) {
-			decl_type *type = real_decl_type(darg->type);
-
-			if (type->type == PSI_T_STRUCT) {
-				void **ptr = (void **) ((char *) darg->mem + type->strct->size);
-
-				while (*ptr) {
-					efree(*ptr++);
-				}
-			}
-			efree(darg->mem);
-			darg->mem = NULL;
-		}
-	}
-}
-
-static inline int psi_calc_num_exp_value(num_exp *exp, impl_val *strct, impl_val *res) {
-	impl_val *ref, *tmp = NULL;
-
-	switch (exp->t) {
-	case PSI_T_NUMBER:
-		switch (is_numeric_string(exp->u.numb, strlen(exp->u.numb), (zend_long *) res, (double *) res, 0)) {
-		case IS_LONG:
-			return PSI_T_INT64;
-		case IS_DOUBLE:
-			return PSI_T_DOUBLE;
-		}
-		break;
-
-	case PSI_T_NSNAME:
-		switch (exp->u.cnst->type->type) {
-		case PSI_T_INT:
-			res->i64 = zend_get_constant_str(exp->u.cnst->name, strlen(exp->u.cnst->name))->value.lval;
-			return PSI_T_INT64;
-		case PSI_T_FLOAT:
-			res->dval = zend_get_constant_str(exp->u.cnst->name, strlen(exp->u.cnst->name))->value.dval;
-			return PSI_T_DOUBLE;
-		default:
-			return 0;
-		}
-		break;
-
-	case PSI_T_NAME:
-		if (strct) {
-			ref = struct_member_ref(exp->u.dvar->arg, strct, &tmp);
-		} else {
-			ref = exp->u.dvar->arg->ptr;
-		}
-		switch (real_decl_type(exp->u.dvar->arg->type)->type) {
-		case PSI_T_INT8:
-		case PSI_T_UINT8:
-		case PSI_T_INT16:
-		case PSI_T_UINT16:
-		case PSI_T_INT32:
-		case PSI_T_UINT32:
-		case PSI_T_INT64:
-		case PSI_T_UINT64:
-			memcpy(res, deref_impl_val(ref, exp->u.dvar), sizeof(*res));
-			if (tmp) {
-				free(tmp);
-			}
-			return real_decl_type(exp->u.dvar->arg->type)->type;
-
-		case PSI_T_FLOAT:
-		case PSI_T_DOUBLE:
-			memcpy(res, deref_impl_val(ref, exp->u.dvar), sizeof(*res));
-			if (tmp) {
-				free(tmp);
-			}
-			return real_decl_type(exp->u.dvar->arg->type)->type;
-
-		EMPTY_SWITCH_DEFAULT_CASE();
-		}
-		break;
-
-	EMPTY_SWITCH_DEFAULT_CASE();
+		RETVAL_FALSE;
 	}
-	return  0;
-}
-
-int psi_calc_num_exp(num_exp *exp, impl_val *strct, impl_val *res) {
-	impl_val num = {0};
-	int num_type = psi_calc_num_exp_value(exp, strct, &num);
-
-	if (exp->operand) {
-		impl_val tmp = {0};
-		int tmp_type = psi_calc_num_exp(exp->operand, strct, &tmp);
-
-		return exp->calculator(num_type, &num, tmp_type, &tmp, res);
-	}
-
-	memcpy(res, &num, sizeof(*res));
-	return num_type;
-}
-
-#define PRIfval "f"
-#define PRIdval "lf"
-
-#define PSI_CALC_OP(var) do { \
-	const char *fmt = "calc %" PRI##var ", %" PRI##var ": %" PRI##var "\n"; \
-	res->var = PSI_CALC(v1->var, v2->var); \
-	if (!res->var) fprintf(stderr, fmt, v1->var, v2->var, res->var); \
-} while (0)
-#define PSI_CALC_OP2(vres, var1, var2) do { \
-	const char *fmt = "calc %" PRI##var1 ", %" PRI##var2 ": %" PRI##vres "\n"; \
-	res->vres = PSI_CALC(v1->var1, v2->var2); \
-	if (!res->vres) fprintf(stderr, fmt, v1->var1, v2->var2, res->vres); \
-} while(0)
-#define PSI_CALC_FN(op) int psi_calc_##op(int t1, impl_val *v1, int t2, impl_val *v2, impl_val *res) \
-{ \
-	if (t1 == t2) { \
-		switch (t1) { \
-		case PSI_T_FLOAT:	PSI_CALC_OP(fval);	break; \
-		case PSI_T_DOUBLE:	PSI_CALC_OP(dval);	break; \
-		case PSI_T_INT8:	PSI_CALC_OP(i8);	break; \
-		case PSI_T_UINT8:	PSI_CALC_OP(u8);	break; \
-		case PSI_T_INT16:	PSI_CALC_OP(i16);	break; \
-		case PSI_T_UINT16:	PSI_CALC_OP(u16);	break; \
-		case PSI_T_INT32:	PSI_CALC_OP(i32);	break; \
-		case PSI_T_UINT32:	PSI_CALC_OP(u32);	break; \
-		case PSI_T_INT64:	PSI_CALC_OP(i64);	break; \
-		case PSI_T_UINT64:	PSI_CALC_OP(u64);	break; \
-		EMPTY_SWITCH_DEFAULT_CASE(); \
-		} \
-		return t1; \
-	} else if (t1 == PSI_T_DOUBLE) { \
-		switch (t2) { \
-		case PSI_T_FLOAT:	PSI_CALC_OP2(dval, dval, fval);	break; \
-		case PSI_T_INT8:	PSI_CALC_OP2(dval, dval, i8);	break; \
-		case PSI_T_UINT8:	PSI_CALC_OP2(dval, dval, u8);	break; \
-		case PSI_T_INT16:	PSI_CALC_OP2(dval, dval, i16);	break; \
-		case PSI_T_UINT16:	PSI_CALC_OP2(dval, dval, u16);	break; \
-		case PSI_T_INT32:	PSI_CALC_OP2(dval, dval, i32);	break; \
-		case PSI_T_UINT32:	PSI_CALC_OP2(dval, dval, u32);	break; \
-		case PSI_T_INT64:	PSI_CALC_OP2(dval, dval, i64);	break; \
-		case PSI_T_UINT64:	PSI_CALC_OP2(dval, dval, u64);	break; \
-		EMPTY_SWITCH_DEFAULT_CASE(); \
-		} \
-		return t1; \
-	} else if (t2 == PSI_T_DOUBLE) { \
-		switch (t1) { \
-		case PSI_T_FLOAT:	PSI_CALC_OP2(dval, fval, dval);	break; \
-		case PSI_T_INT8:	PSI_CALC_OP2(dval, i8, dval);	break; \
-		case PSI_T_UINT8:	PSI_CALC_OP2(dval, u8, dval);	break; \
-		case PSI_T_INT16:	PSI_CALC_OP2(dval, i16, dval);	break; \
-		case PSI_T_UINT16:	PSI_CALC_OP2(dval, u16, dval);	break; \
-		case PSI_T_INT32:	PSI_CALC_OP2(dval, i32, dval);	break; \
-		case PSI_T_UINT32:	PSI_CALC_OP2(dval, u32, dval);	break; \
-		case PSI_T_INT64:	PSI_CALC_OP2(dval, i64, dval);	break; \
-		case PSI_T_UINT64:	PSI_CALC_OP2(dval, u64, dval);	break; \
-		EMPTY_SWITCH_DEFAULT_CASE(); \
-		} \
-		return t2; \
-	} else if (t1 == PSI_T_FLOAT) { \
-		switch (t2) { \
-		case PSI_T_DOUBLE:	PSI_CALC_OP2(dval, fval, dval);	return t2; \
-		case PSI_T_INT8:	PSI_CALC_OP2(fval, fval, i8);	break; \
-		case PSI_T_UINT8:	PSI_CALC_OP2(fval, fval, u8);	break; \
-		case PSI_T_INT16:	PSI_CALC_OP2(fval, fval, i16);	break; \
-		case PSI_T_UINT16:	PSI_CALC_OP2(fval, fval, u16);	break; \
-		case PSI_T_INT32:	PSI_CALC_OP2(fval, fval, i32);	break; \
-		case PSI_T_UINT32:	PSI_CALC_OP2(fval, fval, u32);	break; \
-		case PSI_T_INT64:	PSI_CALC_OP2(fval, fval, i64);	break; \
-		case PSI_T_UINT64:	PSI_CALC_OP2(fval, fval, u64);	break; \
-		EMPTY_SWITCH_DEFAULT_CASE(); \
-		} \
-		return t1; \
-	} else if (t2 == PSI_T_FLOAT) { \
-		switch (t1) { \
-		case PSI_T_DOUBLE:	PSI_CALC_OP2(dval, dval, fval);	return t1; \
-		case PSI_T_INT8:	PSI_CALC_OP2(fval, i8, fval);	break; \
-		case PSI_T_UINT8:	PSI_CALC_OP2(fval, u8, fval);	break; \
-		case PSI_T_INT16:	PSI_CALC_OP2(fval, i16, fval);	break; \
-		case PSI_T_UINT16:	PSI_CALC_OP2(fval, u16, fval);	break; \
-		case PSI_T_INT32:	PSI_CALC_OP2(fval, i32, fval);	break; \
-		case PSI_T_UINT32:	PSI_CALC_OP2(fval, u32, fval);	break; \
-		case PSI_T_INT64:	PSI_CALC_OP2(fval, i64, fval);	break; \
-		case PSI_T_UINT64:	PSI_CALC_OP2(fval, u64, fval);	break; \
-		EMPTY_SWITCH_DEFAULT_CASE(); \
-		} \
-		return t2; \
-	} else { \
-		int64_t sval1 = v1->i64, sval2 = v2->i64; \
-		uint64_t uval1 = v1->u64, uval2 = v2->u64; \
-		switch (t1) { \
-		case PSI_T_INT8:	sval1 >>= 8; \
-		case PSI_T_INT16:	sval1 >>= 8; \
-		case PSI_T_INT32:	sval1 >>= 8; \
-		case PSI_T_INT64: \
-			switch (t2) { \
-			case PSI_T_INT8:	sval2 >>= 8; \
-			case PSI_T_INT16:	sval2 >>= 8; \
-			case PSI_T_INT32:	sval2 >>= 8; \
-			case PSI_T_INT64: \
-				res->i64 = PSI_CALC(sval1 , sval2); \
-				return PSI_T_INT64; \
-			case PSI_T_UINT8:	uval2 >>= 8; \
-			case PSI_T_UINT16:	uval2 >>= 8; \
-			case PSI_T_UINT32:	uval2 >>= 8; \
-			case PSI_T_UINT64: \
-				res->i64 = PSI_CALC(sval1, uval2); \
-				return PSI_T_INT64; \
-			} \
-			break; \
-		case PSI_T_UINT8:	uval1 >>= 8; \
-		case PSI_T_UINT16:	uval1 >>= 8; \
-		case PSI_T_UINT32:	uval1 >>= 8; \
-		case PSI_T_UINT64: \
-			switch (t2) { \
-			case PSI_T_INT8:	sval2 >>= 8; \
-			case PSI_T_INT16:	sval2 >>= 8; \
-			case PSI_T_INT32:	sval2 >>= 8; \
-			case PSI_T_INT64: \
-				res->i64 = PSI_CALC(uval1, sval2); \
-				return PSI_T_INT64; \
-			case PSI_T_UINT8:	uval2 >>= 8; \
-			case PSI_T_UINT16:	uval2 >>= 8; \
-			case PSI_T_UINT32:	uval2 >>= 8; \
-			case PSI_T_UINT64: \
-				res->u64 = PSI_CALC(uval1, uval2); \
-				return PSI_T_UINT64; \
-			} \
-			break; \
-		} \
-	} \
-	ZEND_ASSERT(0); \
-	return 0; \
+	PSI_ParserDtor(&P);
 }
 
-#undef PSI_CALC
-#define PSI_CALC(var1, var2) (var1) + (var2)
-PSI_CALC_FN(add)
-#undef PSI_CALC
-#define PSI_CALC(var1, var2) (var1) * (var2)
-PSI_CALC_FN(mul)
-#undef PSI_CALC
-#define PSI_CALC(var1, var2) (var1) - (var2)
-PSI_CALC_FN(sub)
-#undef PSI_CALC
-#define PSI_CALC(var1, var2) (var1) / (var2)
-PSI_CALC_FN(div)
-
-void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl)
-{
-	size_t i;
-	return_stmt *ret = impl->stmts->ret.list[0];
-	decl_var *var = ret->set->vars->vars[0];
-
-	memset(var->arg->ptr, 0, sizeof(impl_val));
-
-	if (SUCCESS != psi_parse_args(execute_data, impl)) {
-		return;
-	}
-
-	for (i = 0; i < impl->stmts->let.count; ++i) {
-		let_stmt *let = impl->stmts->let.list[i];
-
-		if (!psi_do_let(let)) {
-			psi_do_return(return_value, ret);
-			psi_do_clean(impl);
-			return;
-		}
-	}
-
-	if (impl->decl->args) for (i = 0; i < impl->decl->args->count; ++i) {
-		impl->decl->call.args[i] = impl->decl->args->args[i]->let->ptr;
-	}
-
-	PSI_ContextCall(&PSI_G(context), var->arg->ptr, impl->decl);
-	psi_do_return(return_value, ret);
-
-	for (i = 0; i < impl->stmts->set.count; ++i) {
-		set_stmt *set = impl->stmts->set.list[i];
-
-		if (set->arg->_zv) {
-			psi_do_set(set->arg->_zv, set->val);
-		}
-	}
-
-	for (i = 0; i < impl->stmts->fre.count; ++i) {
-		free_stmt *fre = impl->stmts->fre.list[i];
-
-		psi_do_free(fre);
-	}
-	psi_do_clean(impl);
-}
-
-static void psi_object_free(zend_object *o)
-{
-	psi_object *obj = PSI_OBJ(NULL, o);
-
-	if (obj->data) {
-		// free(obj->data);
-		obj->data = NULL;
-	}
-	zend_object_std_dtor(o);
-}
-
-static zend_object *psi_object_init(zend_class_entry *ce)
-{
-	psi_object *o = ecalloc(1, sizeof(*o) + zend_object_properties_size(ce));
-
-	zend_object_std_init(&o->std, ce);
-	object_properties_init(&o->std, ce);
-	o->std.handlers = &psi_object_handlers;
-	return &o->std;
-}
-
-PHP_MINIT_FUNCTION(psi)
+static PHP_MINIT_FUNCTION(psi)
 {
 	PSI_ContextOps *ops = NULL;
 	zend_class_entry ce = {0};
+	unsigned flags = psi_check_env("PSI_DEBUG") ? PSI_PARSER_DEBUG : (
+			psi_check_env("PSI_SILENT") ? PSI_PARSER_SILENT : 0);
 
 	REGISTER_INI_ENTRIES();
 
@@ -1089,7 +185,7 @@ PHP_MINIT_FUNCTION(psi)
 		return FAILURE;
 	}
 
-	PSI_ContextInit(&PSI_G(context), ops, psi_error);
+	PSI_ContextInit(&PSI_G(context), ops, psi_error_wrapper, flags);
 	PSI_ContextBuild(&PSI_G(context), PSI_G(directory));
 
 	if (psi_check_env("PSI_DUMP")) {
@@ -1099,7 +195,7 @@ PHP_MINIT_FUNCTION(psi)
 	return SUCCESS;
 }
 
-PHP_MSHUTDOWN_FUNCTION(psi)
+static PHP_MSHUTDOWN_FUNCTION(psi)
 {
 	PSI_ContextDtor(&PSI_G(context));
 
@@ -1109,14 +205,14 @@ PHP_MSHUTDOWN_FUNCTION(psi)
 }
 
 #if defined(COMPILE_DL_PSI) && defined(ZTS)
-PHP_RINIT_FUNCTION(psi)
+static PHP_RINIT_FUNCTION(psi)
 {
 	ZEND_TSRMLS_CACHE_UPDATE();
 	return SUCCESS;
 }
 #endif
 
-PHP_MINFO_FUNCTION(psi)
+static PHP_MINFO_FUNCTION(psi)
 {
 	php_info_print_table_start();
 	php_info_print_table_header(2, "psi support", "enabled");
@@ -1124,7 +220,10 @@ PHP_MINFO_FUNCTION(psi)
 
 	DISPLAY_INI_ENTRIES();
 }
-const zend_function_entry psi_functions[] = {
+
+static const zend_function_entry psi_functions[] = {
+	PHP_FE(psi_dump, ai_psi_dump)
+	PHP_FE(psi_validate, ai_psi_validate)
 	PHP_FE_END
 };