X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=php_psi.h;h=31e65652e697f8b4bda7e63b040c937f2f693592;hp=85a3805811f58440d49476f81d0453b8fc6d666f;hb=19f0eb5807fb8d0f3aa305f2476f094e66a02709;hpb=481515f92d2baa83dea51d2effcbde711aa99e3b

diff --git a/php_psi.h b/php_psi.h
index 85a3805..31e6565 100644
--- a/php_psi.h
+++ b/php_psi.h
@@ -18,10 +18,11 @@ extern zend_module_entry psi_module_entry;
 #include "TSRM.h"
 #endif
 
-#include "parser.h"
 #include "context.h"
 
-void psi_error(int type, const char *msg, ...);
+void psi_error_wrapper(PSI_Token *t, int type, const char *msg, ...);
+void psi_error(int type, const char *fn, unsigned ln, const char *msg, ...);
+void psi_verror(int type, const char *fn, unsigned ln, const char *msg, va_list argv);
 
 static inline int psi_check_env(const char *var) {
 	char *set = getenv(var);
@@ -59,12 +60,12 @@ void psi_to_object(zval *return_value, set_value *set, impl_val *ret_val);
 
 void psi_call(zend_execute_data *execute_data, zval *return_value, impl *impl);
 
-int psi_calc_num_exp(num_exp *exp, impl_val *ref, impl_val *res);
+int psi_calc_num_exp(num_exp *exp, impl_val *strct, impl_val *res);
 
-static inline zend_long psi_long_num_exp(num_exp *exp, impl_val *ref) {
+static inline zend_long psi_long_num_exp(num_exp *exp, impl_val *strct) {
 	impl_val val = {0};
 
-	switch (psi_calc_num_exp(exp, ref, &val)) {
+	switch (psi_calc_num_exp(exp, strct, &val)) {
 	case PSI_T_UINT8:	return val.u8;
 	case PSI_T_UINT16:	return val.u16;
 	case PSI_T_UINT32:	return val.u32;