Merge branch 'slimconfigure'

[m6w6/ext-psi] / src / calc.h

diff --git a/src/calc.h b/src/calc.h
index d294cfbb14dc6057c2ff252911738a74837cf1ad..21ece7b4319aa984704a1aa02e0e1527dbff6c3e 100644 (file)
--- a/src/calc.h
+++ b/src/calc.h
@@ -27,11 +27,20 @@
 #define PSI_CALC_H
 
 #include "token.h"
-#include "impl_val.h"
+#include "types/impl_val.h"
 
-token_t psi_calc_add(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
-token_t psi_calc_sub(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
-token_t psi_calc_mul(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
-token_t psi_calc_div(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
+#define PRIfval ".13gF"
+#define PRIdval ".53lg"
+#define PRIldval ".64LgL"
+
+typedef token_t (*psi_calc)(token_t t1, impl_val *v1, token_t t2, impl_val *v2, impl_val *res);
+
+#include "calc/basic.h"
+#include "calc/bin.h"
+#include "calc/bool.h"
+#include "calc/unary.h"
+#include "calc/cast.h"
+#include "calc/cmp.h"
+#include "calc/oper.h"
 
 #endif