Rename & add project structure

Author: quimFIB

.merlin

@@ -1,3 +1,5 @@
 PRJ unifier
+S lib
 S src
 B _build/src
+B _build/lib

Makefile

@@ -0,0 +1,39 @@
+##
+# Project Title
+#
+# @file
+# @version 0.1
+
+#
+# Pure OCaml, no packages, no _tags, code in several directories
+#
+
+# bin-annot is required for Merlin and other IDE-like tools
+# The -I flag introduces sub-directories to search for code
+
+.PHONY: all clean byte native profile debug test
+
+OCB_FLAGS = -tag bin_annot -I src -I lib
+OCB = ocamlbuild $(OCB_FLAGS)
+
+all: native byte # profile debug
+
+clean:
+	$(OCB) -clean
+
+native:
+	$(OCB) main.native
+
+byte:
+	$(OCB) main.byte
+
+profile:
+	$(OCB) -tag profile main.native
+
+debug:
+	$(OCB) -tag debug main.byte
+
+test: native
+	./main.native 
+
+# end

_tags

@@ -0,0 +1 @@
+true: -traverse

src/MultiSet.ml lib/MultiSet.ml

@@ -130,26 +130,3 @@ module Unify =
   end
 let pretty_print t = List.fold_left (fun x y -> x ^ y) "" (List.map (fun x -> (Unifier.str x) ^ ";") (EqSet.elements t))
 
-let eq1 = Unifier.Equal (t1, t2)
-let eq2 = Unifier.Equal (t2, t2)
-let eq3 = Unifier.Equal (t3, t1)
-let eq4 = Unifier.Equal (t3, t4)
-let eq5 = Unifier.Equal (t1, t5)
-let eqSub = Unifier.Equal (`Var "c", `Term ("y", [`Var "c0"; `Var "c1"]))
-
-let failing = EqSet.(empty |> add eq1 |> add eq2 |> add eq3 |> add eq4 |> add eq5)
-let failing_uni = UniSet.from_set failing
-
-let foo = EqSet.(empty |> add eq2 |> add eq3)
-let foo_uni = UniSet.from_set foo
-let show_unif (unif : UniSet.t) = EqSet.elements unif.eqSet
-let show_candidates (candidates : EqSet.t ) = EqSet.elements candidates
-
-let (unif_0, candidates_0) = Unify.unify_step (foo_uni,foo)
-let (unif_1, candidates_1) = Unify.unify_step (unif_0,candidates_0)
-let (unif_result, candidates_result) = Unify.unify (foo_uni,foo)
-
-(* "Pretty" print the EqSet elements *)
-(* List.fold_left (fun x y -> x ^ y) "" (List.map Unifier.str (EqSet.elements foo)) *)
-
-(* List.fold_left (fun x y -> x ^ y) "" (List.map (fun x -> (Unifier.str x) ^ ";") (EqSet.elements foo)) *)

src/MultiSet.mli lib/MultiSet.mli

@@ -172,8 +172,10 @@ module EqSet :
 module UniSet :
   sig
     type t = { vSet : VarMSet.t; eqSet : EqSet.t; }
+    val union : t -> t -> t
     val add : Unifier.equality -> t -> t
     val add_from_list : Unifier.equality list -> t -> t
+    val add_from_seq : Unifier.equality Seq.t -> t -> t
     val remove : Unifier.equality -> t -> t
     val contains : Var.var -> t -> bool
     val empty : t
@@ -183,8 +185,10 @@ module UniSet :
 module Unify :
   sig
     type t = UniSet.t = { vSet : VarMSet.t; eqSet : EqSet.t; }
+    val union : t -> t -> t
     val add : Unifier.equality -> t -> t
     val add_from_list : Unifier.equality list -> t -> t
+    val add_from_seq : Unifier.equality Seq.t -> t -> t
     val remove : Unifier.equality -> t -> t
     val contains : Var.var -> t -> bool
     val empty : t
@@ -193,16 +197,7 @@ module Unify :
     val eliminate : Unifier.equality -> EqSet.t -> EqSet.t
     val occurs_rec : Unifier.equality -> bool
     val conflict : Unifier.equality -> bool
-    val unify : t * EqSet.t -> UniSet.t * EqSet.t
+    val unify_step : t * EqSet.t -> UniSet.t * EqSet.t
+    val unify : t * EqSet.t -> t * EqSet.t
   end
 val pretty_print : EqSet.t -> string
-val eq1 : Unifier.equality
-val eq2 : Unifier.equality
-val eq3 : Unifier.equality
-val eq4 : Unifier.equality
-val eq5 : Unifier.equality
-val eqSub : Unifier.equality
-val foo : EqSet.t
-val foo_uni : UniSet.t
-val vars_result : UniSet.t
-val eqs_result : EqSet.t

src/my_unification_alg.ml lib/UnifAlg.ml

@@ -0,0 +1,25 @@
+open UnifAlg
+
+let eq1 = Unifier.Equal (t1, t2)
+let eq2 = Unifier.Equal (t2, t2)
+let eq3 = Unifier.Equal (t3, t1)
+let eq4 = Unifier.Equal (t3, t4)
+let eq5 = Unifier.Equal (t1, t5)
+let eqSub = Unifier.Equal (`Var "c", `Term ("y", [`Var "c0"; `Var "c1"]))
+
+let failing = EqSet.(empty |> add eq1 |> add eq2 |> add eq3 |> add eq4 |> add eq5)
+let failing_uni = UniSet.from_set failing
+
+let foo = EqSet.(empty |> add eq2 |> add eq3)
+let foo_uni = UniSet.from_set foo
+let show_unif (unif : UniSet.t) = EqSet.elements unif.eqSet
+let show_candidates (candidates : EqSet.t ) = EqSet.elements candidates
+
+let (unif_0, candidates_0) = Unify.unify_step (foo_uni,foo)
+let (unif_1, candidates_1) = Unify.unify_step (unif_0,candidates_0)
+let (unif_result, candidates_result) = Unify.unify (foo_uni,foo)
+
+(* "Pretty" print the EqSet elements *)
+(* List.fold_left (fun x y -> x ^ y) "" (List.map Unifier.str (EqSet.elements foo)) *)
+
+(* List.fold_left (fun x y -> x ^ y) "" (List.map (fun x -> (Unifier.str x) ^ ";") (EqSet.elements foo)) *)