Merge branch 'master' of https://scm.cri.ensmp.fr/git/Faustine

[Faustine.git] / interpretor / types.ml

diff --git a/interpretor/types.ml b/interpretor/types.ml
index 68e550c..dd82e7c 100644 (file)
--- a/interpretor/types.ml
+++ b/interpretor/types.ml
@@ -48,19 +48,22 @@ class type value_type =
     method tan : value_type
     method atan : value_type
     method atan2 : value_type -> value_type
-    method expo : value_type
+    method exp : value_type
     method sqrt : value_type
     method ln : value_type
-    method log10 : value_type
+    method lg : value_type
+    method abs : value_type
     method fmod : value_type -> value_type
     method _mod : value_type -> value_type
     method remainder : value_type -> value_type
-    method greater : value_type -> value_type
-    method less : value_type -> value_type
-    method gore : value_type -> value_type
-    method lore : value_type -> value_type
-    method equal : value_type -> value_type
-    method different : value_type -> value_type
+    method gt : value_type -> value_type
+    method lt : value_type -> value_type
+    method geq : value_type -> value_type
+    method leq : value_type -> value_type
+    method eq : value_type -> value_type
+    method neq : value_type -> value_type
+    method shl : value_type -> value_type
+    method shr : value_type -> value_type
     method max : value_type -> value_type
     method min : value_type -> value_type
   end;;
@@ -93,7 +96,7 @@ type symbol = Add
            | Exp
            | Sqrt
            | Ln
-           | Log10
+           | Lg
            | Abs
            | Fmod
            | Mod
@@ -102,12 +105,14 @@ type symbol = Add
            | Vconcat
            | Vpick
            | Serialize
-           | Greater
-           | Less
-           | Gore
-           | Lore
-           | Equal
-           | Different
+           | Gt
+           | Lt
+           | Geq
+           | Leq
+           | Eq
+           | Neq
+           | Shl
+           | Shr
            | Max
            | Min
            | Prefix
@@ -170,20 +175,22 @@ class type signal_type =
       method tan : signal_type
       method atan : signal_type
       method atan2 : signal_type -> signal_type
-      method expo : signal_type
+      method exp : signal_type
       method sqrt : signal_type
       method ln : signal_type
-      method log10 : signal_type
+      method lg : signal_type
       method abs : signal_type
       method fmod : signal_type -> signal_type
       method _mod : signal_type -> signal_type
       method remainder : signal_type -> signal_type
-      method greater : signal_type -> signal_type
-      method less : signal_type -> signal_type
-      method gore : signal_type -> signal_type
-      method lore : signal_type -> signal_type
-      method equal : signal_type -> signal_type
-      method different : signal_type -> signal_type
+      method gt : signal_type -> signal_type
+      method lt : signal_type -> signal_type
+      method geq : signal_type -> signal_type
+      method leq : signal_type -> signal_type
+      method eq : signal_type -> signal_type
+      method neq : signal_type -> signal_type
+      method shl : signal_type -> signal_type
+      method shr : signal_type -> signal_type
       method max : signal_type -> signal_type
       method min : signal_type -> signal_type
       method rdtable : signal_type -> signal_type -> signal_type