Flip Lattice.HConsed arguments for convenient lifting

Author: sim642

src/domain/lattice.ml

@@ -145,7 +145,7 @@ struct
 end
 
 (* HAS SIDE-EFFECTS ---- PLEASE INSTANCIATE ONLY ONCE!!! *)
-module HConsed (Base:S) (Arg: sig val assume_idempotent: bool end) =
+module HConsed (Arg: sig val assume_idempotent: bool end) (Base:S) =
 struct
   include Printable.HConsed (Base)
 

src/domain/mapDomain.ml

@@ -263,7 +263,7 @@ module HConsed (M: S) : S with
   type key = M.key and
   type value = M.value =
 struct
-  include Lattice.HConsed (M) (struct let assume_idempotent = false end)
+  include Lattice.HConsed (struct let assume_idempotent = false end) (M)
 
   type key = M.key
   type value = M.value

src/lifters/specLifters.ml

@@ -101,16 +101,16 @@ struct
 end
 
 (** Lifts a [Spec] so that the domain is [Hashcons]d *)
-module HashconsLifter (S: Spec) =
+module HashconsLifter (S: Spec) = (* keep functor eta-expanded to look up option when lifter is actually used *)
 struct
   module HConsedArg =
   struct
     (* We do refine int values on narrow and meet {!IntDomain.IntDomTupleImpl}, which can lead to fixpoint issues if we assume x op x = x *)
     (* see https://github.com/goblint/analyzer/issues/1005 *)
     let assume_idempotent = GobConfig.get_string "ana.int.refinement" = "never"
   end
-  module F (L: Lattice.S) = Lattice.HConsed (L) (HConsedArg)
-  include DomainLifter (F) (S)
+
+  include DomainLifter (Lattice.HConsed (HConsedArg)) (S)
 end
 
 module type PrintableLifter =