Expose a solver's M_with_make as part of the solver mappings

src/smtml/altergo_mappings.default.ml

@@ -260,6 +260,4 @@ module M = struct
   include Make ()
 end
 
-module M' : Mappings_intf.M_with_make = M
-
 include Mappings.Make (M)

src/smtml/mappings.ml

@@ -5,6 +5,8 @@
 include Mappings_intf
 
 module Make (M_with_make : M_with_make) : S_with_fresh = struct
+  module Mappings : M_with_make = M_with_make
+
   module Make_ (M : M) : S = struct
     open Ty
     module Smap = Symbol.Map

src/smtml/mappings_intf.ml

@@ -963,6 +963,8 @@ end
 (** The [S_with_fresh] module type extends [S] with a functor for creating fresh
     instances of [S] and a flag indicating availability of the mappings. *)
 module type S_with_fresh = sig
+  module Mappings : M_with_make
+
   (** [Fresh.Make ()] creates a new instance of the [S] module type. *)
   module Fresh : sig
     module Make () : S

src/smtml/z3_mappings.default.ml

@@ -622,6 +622,4 @@ module M = struct
   let is_available = Internals.is_available
 end
 
-module M' : Mappings_intf.M_with_make = M
-
 include Mappings.Make (M)