Adds S_with_fresh

Author: filipeom

bin/main.ml

@@ -34,7 +34,9 @@ let prove_mode_conv =
 
 let parse_cmdline =
   let aux files solver prover_mode debug print_statistics =
-    let module Mappings = (val mappings_of_solver solver : Mappings_intf.S) in
+    let module Mappings =
+      (val mappings_of_solver solver : Mappings_intf.S_with_fresh)
+    in
     Mappings.set_debug debug;
     let module Solver =
       ( val match prover_mode with

lib/bitwuzla_mappings.mli

@@ -17,4 +17,4 @@
 (***************************************************************************)
 
 (** @inline *)
-include Mappings_intf.S
+include Mappings_intf.S_with_fresh

lib/colibri2_mappings.mli

@@ -17,4 +17,4 @@
 (* along with this program.  If not, see <https://www.gnu.org/licenses/>.  *)
 (***************************************************************************)
 
-include Mappings_intf.S
+include Mappings_intf.S_with_fresh

lib/cvc5_mappings.mli

@@ -17,4 +17,4 @@
 (***************************************************************************)
 
 (** @inline *)
-include Mappings_intf.S
+include Mappings_intf.S_with_fresh

lib/mappings.nop.ml

@@ -369,4 +369,8 @@ end
 
 module Impl' : M = Impl
 
-include Mappings.Make (Impl)
+module Fresh = struct
+  module Make () = Mappings.Make (Impl)
+end
+
+include Fresh.Make ()

lib/mappings_intf.ml

@@ -447,3 +447,11 @@ module type S = sig
     val pp_statistics : Format.formatter -> optimize -> unit
   end
 end
+
+module type S_with_fresh = sig
+  module Fresh : sig
+    module Make () : S
+  end
+
+  include S
+end

lib/solver_dispatcher.ml

@@ -5,7 +5,8 @@ type solver_type =
   | Colibri2_solver
   | Bitwuzla_solver
 
-let mappings_of_solver : solver_type -> (module Mappings_intf.S) = function
+let mappings_of_solver : solver_type -> (module Mappings_intf.S_with_fresh) =
+  function
   | Z3_solver -> (module Z3_mappings)
   | Cvc5_solver -> (module Cvc5_mappings)
   | Colibri2_solver -> (module Colibri2_mappings)

lib/z3_mappings.mli

@@ -16,9 +16,5 @@
 (* along with this program.  If not, see <https://www.gnu.org/licenses/>.  *)
 (***************************************************************************)
 
-module Fresh : sig
-  module Make () : Mappings_intf.S
-end
-
 (** @inline *)
-include Mappings_intf.S
+include Mappings_intf.S_with_fresh