flush

[m6w6/ext-psi] / php_psi.h

diff --git a/php_psi.h b/php_psi.h
index 7673d4ee292669aa315ce8283e7ce3a2270a7d25..3d68d587405990ae41ba4abfeeed96467d0a55c4 100644 (file)
--- a/php_psi.h
+++ b/php_psi.h
@@ -20,7 +20,7 @@ extern zend_module_entry psi_module_entry;
 
 #include "context.h"
 
-void psi_error_wrapper(PSI_Token *t, int type, const char *msg, ...);
+void psi_error_wrapper(void *context, 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);
 
@@ -42,51 +42,7 @@ static inline psi_object *PSI_OBJ(zval *zv, zend_object *zo) {
        return (void *) (((char *) zo) - zo->handlers->offset);
 }
 
-size_t psi_t_alignment(token_t t);
-size_t psi_t_size(token_t t);
-size_t psi_t_align(token_t t, size_t s);
-
-size_t psi_offset_padding(size_t diff, size_t alignment);
-int psi_internal_type(impl_type *type);
-zend_internal_arg_info *psi_internal_arginfo(impl *impl);
-size_t psi_num_min_args(impl *impl);
-
-void psi_to_void(zval *return_value, set_value *set, impl_val *ret_val);
-void psi_to_bool(zval *return_value, set_value *set, impl_val *ret_val);
-void psi_to_int(zval *return_value, set_value *set, impl_val *ret_val);
-void psi_to_double(zval *return_value, set_value *set, impl_val *ret_val);
-void psi_to_string(zval *return_value, set_value *set, impl_val *ret_val);
-void psi_to_recursive(zval *return_value, set_value *set, impl_val *r_val);
-void psi_to_array(zval *return_value, set_value *set, impl_val *ret_val);
-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 *strct, impl_val *res);
-
-static inline zend_long psi_long_num_exp(num_exp *exp, impl_val *strct) {
-       impl_val val = {0};
-
-       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;
-       case PSI_T_UINT64:      return val.u64; /* FIXME */
-       case PSI_T_INT8:        return val.i8;
-       case PSI_T_INT16:       return val.i16;
-       case PSI_T_INT32:       return val.i32;
-       case PSI_T_INT64:       return val.i64;
-       case PSI_T_FLOAT:       return val.fval;
-       case PSI_T_DOUBLE:      return val.dval;
-       EMPTY_SWITCH_DEFAULT_CASE();
-       }
-       return 0;
-}
-
-int psi_calc_add(int t1, impl_val *v1, int t2, impl_val *v2, impl_val *res);
-int psi_calc_sub(int t1, impl_val *v1, int t2, impl_val *v2, impl_val *res);
-int psi_calc_mul(int t1, impl_val *v1, int t2, impl_val *v2, impl_val *res);
-int psi_calc_div(int t1, impl_val *v1, int t2, impl_val *v2, impl_val *res);
+PHP_PSI_API zend_class_entry *psi_object_get_class_entry();
 
 ZEND_BEGIN_MODULE_GLOBALS(psi)
        char *engine;
@@ -94,6 +50,8 @@ ZEND_BEGIN_MODULE_GLOBALS(psi)
        PSI_Context context;
 ZEND_END_MODULE_GLOBALS(psi);
 
+ZEND_EXTERN_MODULE_GLOBALS(psi);
+
 #define PSI_G(v) ZEND_MODULE_GLOBALS_ACCESSOR(psi, v)
 
 #if defined(ZTS) && defined(COMPILE_DL_PSI)