Debugging better Sub and Meet.

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

diff --git a/helm/ocaml/mathql_interpreter/mqint.ml b/helm/ocaml/mathql_interpreter/mqint.ml
index a9d18940b426ad58118546cfea0cdc25eb3acd71..f3888c99673a4f500ffc9b32e9930457cc0c76ab 100644 (file)
--- a/helm/ocaml/mathql_interpreter/mqint.ml
+++ b/helm/ocaml/mathql_interpreter/mqint.ml
@@ -141,7 +141,6 @@ and exec_boole_exp c = function
        in if res then (print_endline"TRUE"; flush stdout)
           else (print_endline"FALSE"; flush stdout);
           res
-   | _ -> assert false    
 
 (* valuta una MathQL.val_exp e ritorna un MathQL.value *)
 

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