Sub e Meet patched

diff --git a/helm/ocaml/mathql_interpreter/meet.ml b/helm/ocaml/mathql_interpreter/meet.ml
index c5921aaf92cf60999f2d23fb054241524b7a0ce9..bf0b5d780987a9aec30e5aff5742066fda7ed8ea 100644 (file)
--- a/helm/ocaml/mathql_interpreter/meet.ml
+++ b/helm/ocaml/mathql_interpreter/meet.ml
@@ -29,6 +29,6 @@ let rec meet_ex v1 v2 =
     [],_ 
   | _,[] -> false
   | s1::tl1, s2::_ when s1 < s2 -> meet_ex tl1 v2
-  | s1::_, s2::tl2 when s2 < s1 -> false
-  | _, _-> true
+  | s1::_, s2::tl2 when s2 < s1 -> meet_ex v1 tl2
+  | _, _ -> true
 ;;

diff --git a/helm/ocaml/mathql_interpreter/sub.ml b/helm/ocaml/mathql_interpreter/sub.ml
index 5bc3d5b92b18aebdc8ae0cd356a675fffcca83e4..e59bf049d1e25fd6c05e63495f8dac59fd2b1dcb 100644 (file)
--- a/helm/ocaml/mathql_interpreter/sub.ml
+++ b/helm/ocaml/mathql_interpreter/sub.ml
@@ -28,7 +28,7 @@ let rec sub_ex v1 v2 =
   match v1,v2 with
     [],_ -> true
   | _,[] -> false
-  | s1::tl1, s2::_ when s1 < s2 -> sub_ex tl1 v2
-  | s1::_, s2::_ when s2 < s1 -> false
+  | s1::_, s2::_ when s1 < s2 -> false 
+  | s1::_, s2::tl2 when s2 < s1 -> sub_ex v1 tl2
   | s1::tl1, s2::tl2 -> sub_ex tl1 tl2
 ;;