travis trusty

[m6w6/ext-psi] / php_psi.h

diff --git a/php_psi.h b/php_psi.h
index dd422b7a848a47b328ad336c82e2f112a7636c87..3dedff290a3830dbca22049141b3d05fcff1594e 100644 (file)
--- a/php_psi.h
+++ b/php_psi.h
@@ -1,4 +1,3 @@
-
 #ifndef PHP_PSI_H
 #define PHP_PSI_H
 
@@ -20,9 +19,6 @@ extern zend_module_entry psi_module_entry;
 #endif
 
 #include "context.h"
-#include "parser.h"
-
-void psi_error(int type, const char *msg, ...);
 
 static inline int psi_check_env(const char *var) {
        char *set = getenv(var);
@@ -42,114 +38,16 @@ 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);
-
-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_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);
-
-static inline int psi_calc_num_exp_value(num_exp *exp, impl_val *val) {
-       switch (exp->t) {
-       case PSI_T_NUMBER:
-               switch (is_numeric_string(exp->u.numb, strlen(exp->u.numb), (zend_long *) val, (double *) val, 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:
-                       val->i64 = zend_get_constant_str(exp->u.cnst->name, strlen(exp->u.cnst->name))->value.lval;
-                       return PSI_T_INT64;
-               case PSI_T_FLOAT:
-                       val->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:
-               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(val, deref_impl_val(exp->u.dvar->arg->let->ptr, exp->u.dvar), sizeof(*val));
-                       return real_decl_type(exp->u.dvar->arg->type)->type;
-
-               case PSI_T_FLOAT:
-               case PSI_T_DOUBLE:
-                       memcpy(val, deref_impl_val(exp->u.dvar->arg->let->ptr, exp->u.dvar), sizeof(*val));
-                       return real_decl_type(exp->u.dvar->arg->type)->type;
-
-               EMPTY_SWITCH_DEFAULT_CASE();
-               }
-               break;
-
-       EMPTY_SWITCH_DEFAULT_CASE();
-       }
-       return  0;
-}
-
-static inline int psi_calc_num_exp(num_exp *exp, impl_val *val) {
-       impl_val num = {0};
-       int num_type = psi_calc_num_exp_value(exp, &num);
-
-       if (exp->operand) {
-               impl_val tmp = {0};
-               int tmp_type = psi_calc_num_exp(exp->operand, &tmp);
-
-               return exp->calculator(num_type, &num, tmp_type, &tmp, val);
-       }
-
-       memcpy(val, &num, sizeof(*val));
-       return num_type;
-}
-
-static inline zend_long psi_long_num_exp(num_exp *exp) {
-       impl_val val = {0};
-
-       switch (psi_calc_num_exp(exp, &val)) {
-       case PSI_T_UINT8:       val.u16 = val.u8;
-       case PSI_T_UINT16:      val.u32 = val.u16;
-       case PSI_T_UINT32:      val.u64 = val.u32;
-       case PSI_T_UINT64:      return val.u64;
-       case PSI_T_INT8:        val.i16 = val.i8;
-       case PSI_T_INT16:       val.i32 = val.i16;
-       case PSI_T_INT32:       val.i64 = val.i32;
-       case PSI_T_INT64:       return val.i64;
-       case PSI_T_FLOAT:       val.dval = val.fval;
-       case PSI_T_DOUBLE:      return val.dval;
-       EMPTY_SWITCH_DEFAULT_CASE();
-       }
-}
+PHP_PSI_API zend_class_entry *psi_object_get_class_entry();
 
 ZEND_BEGIN_MODULE_GLOBALS(psi)
        char *engine;
        char *directory;
-       PSI_Context context;
+       struct 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)