Clean alias for utility_context in SymbolicUtility

colis-anr · Apr 9, 2020 · 5a53b0f · 5a53b0f
1 parent 6b85408
commit 5a53b0f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/src/symbolic/symbolicUtility.ml b/src/symbolic/symbolicUtility.ml
@@ -315,12 +315,6 @@ module MakeInterpreter (Filesystem: FILESYSTEM) = struct
   end
 end
 
-module UtilityContext = struct
-  type context = utility_context = {
-    cwd: Path.normal;
-    env: string Env.SMap.t;
-    args: string list;
-  }
 end
 
 (* Constraints *)
@@ -434,6 +428,12 @@ module Mixed = struct
   include MakeInterpreter (MixedImplementation)
   include MakeSpecifications (MixedImplementation)
 
+  type context = utility_context = {
+    cwd: Path.normal;
+    env: string Env.SMap.t;
+    args: string list;
+  }
+
   let state_from_constraints (s : Constraints.state) : state = {
     filesystem=MixedImplementation.Constraints s.filesystem;
     stdin=s.stdin;
@@ -486,7 +486,6 @@ end
 module ConstraintsCompatibility = struct
 
   include Mixed
-  include UtilityContext
 
   let success_case ~descr ?stdout constraints =
     success_case ~descr ?stdout (case_spec ~constraints ())

diff --git a/src/symbolic/symbolicUtility.mli b/src/symbolic/symbolicUtility.mli
@@ -199,12 +199,6 @@ module MakeInterpreter (Filesystem: FILESYSTEM) : sig
   end
 end
 
-module UtilityContext : sig
-  type context = utility_context = {
-    cwd: Path.normal;
-    env: string Env.SMap.t;
-    args: string list;
-  }
 end
 
 (** {1 Constraints backend} *)
@@ -288,6 +282,12 @@ module Mixed : sig
   include module type of MakeInterpreter (MixedImplementation)
   include module type of MakeSpecifications (MixedImplementation)
 
+  type context = utility_context = {
+    cwd: Path.normal;
+    env: string Env.SMap.t;
+    args: string list;
+  }
+
   (** Symbolically interprete a program using the constraints backend *)
   val interp_program_constraints : input -> Constraints.sym_state list -> program -> (Constraints.state list * Constraints.state list * Constraints.state list)
 
@@ -299,7 +299,6 @@ end
     engine: Create mixed utilities with the interface of constraints-based utilities *)
 module ConstraintsCompatibility : sig
   include module type of Mixed
-  include module type of UtilityContext
 
   val success_case: descr:string -> ?stdout:Stdout.t -> Constraints.case_spec -> case
   val error_case: descr:string -> ?stdout:Stdout.t -> ?error_message:string -> Constraints.case_spec -> case

diff --git a/src/symbolic/utilities/mkdir.ml b/src/symbolic/utilities/mkdir.ml
@@ -1,7 +1,6 @@
 open Format
 open Colis_constraints
 open Clause
-open SymbolicUtility.UtilityContext
 open SymbolicUtility.Mixed
 
 let name = "mkdir"

diff --git a/src/symbolic/utilities/mkdir.mli b/src/symbolic/utilities/mkdir.mli
@@ -1,5 +1,5 @@
 (** Symbolic execution of mkdir *)
-open SymbolicUtility.ConstraintsCompatibility
+open SymbolicUtility.Mixed
 
 val name : string
 val interprete : context -> utility