X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Fcalc.h;h=49114efc67b3a60f2997e8de36ff7485a24e5e3e;hp=d294cfbb14dc6057c2ff252911738a74837cf1ad;hb=52ed5940ed0ab3cafd36fbded2e83c92563e7b2b;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84

diff --git a/src/calc.h b/src/calc.h
index d294cfb..49114ef 100644
--- a/src/calc.h
+++ b/src/calc.h
@@ -27,11 +27,19 @@
 #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 "f"
+#define PRIdval "lf"
+#define PRIldval "Lf"
+
+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/cast.h"
+#include "calc/cmp.h"
+#include "calc/oper.h"
 
 #endif