diff options
author | Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net> | 2017-11-01 15:01:37 +0100 |
---|---|---|
committer | Gaëtan Gilbert <gaetan.gilbert@skyskimmer.net> | 2017-11-01 15:11:22 +0100 |
commit | c8533911300df8d4897a3109ea30d43be7f430eb (patch) | |
tree | 024ea3154461be06aa18ffb8270620d5bdcaa448 /stm | |
parent | ad973248998da8d7d10ed00f4bcd6f383ba9a171 (diff) |
Fix FIXME: use OCaml 4.02 generative functors when available.
4.02.3 has been the minimal OCaml version for a while now.
Diffstat (limited to 'stm')
-rw-r--r-- | stm/asyncTaskQueue.ml | 8 | ||||
-rw-r--r-- | stm/asyncTaskQueue.mli | 4 | ||||
-rw-r--r-- | stm/proofworkertop.ml | 2 | ||||
-rw-r--r-- | stm/queryworkertop.ml | 2 | ||||
-rw-r--r-- | stm/stm.ml | 8 | ||||
-rw-r--r-- | stm/tacworkertop.ml | 2 | ||||
-rw-r--r-- | stm/vio_checking.ml | 2 |
7 files changed, 14 insertions, 14 deletions
diff --git a/stm/asyncTaskQueue.ml b/stm/asyncTaskQueue.ml index 5d9b595d3..a356f32e9 100644 --- a/stm/asyncTaskQueue.ml +++ b/stm/asyncTaskQueue.ml @@ -49,7 +49,7 @@ end type expiration = bool ref -module Make(T : Task) = struct +module Make(T : Task) () = struct exception Die type response = @@ -107,7 +107,7 @@ module Make(T : Task) = struct let open Feedback in feedback ~id:Stateid.initial (WorkerStatus(id, s)) - module Worker = Spawn.Sync(struct end) + module Worker = Spawn.Sync () module Model = struct @@ -354,5 +354,5 @@ module Make(T : Task) = struct end -module MakeQueue(T : Task) = struct include Make(T) end -module MakeWorker(T : Task) = struct include Make(T) end +module MakeQueue(T : Task) () = struct include Make(T) () end +module MakeWorker(T : Task) () = struct include Make(T) () end diff --git a/stm/asyncTaskQueue.mli b/stm/asyncTaskQueue.mli index a80918e93..1044e668b 100644 --- a/stm/asyncTaskQueue.mli +++ b/stm/asyncTaskQueue.mli @@ -41,7 +41,7 @@ end type expiration = bool ref -module MakeQueue(T : Task) : sig +module MakeQueue(T : Task) () : sig type queue @@ -76,7 +76,7 @@ module MakeQueue(T : Task) : sig end -module MakeWorker(T : Task) : sig +module MakeWorker(T : Task) () : sig val main_loop : unit -> unit val init_stdout : unit -> unit diff --git a/stm/proofworkertop.ml b/stm/proofworkertop.ml index a27c6d6cd..10b42f7e9 100644 --- a/stm/proofworkertop.ml +++ b/stm/proofworkertop.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -module W = AsyncTaskQueue.MakeWorker(Stm.ProofTask) +module W = AsyncTaskQueue.MakeWorker(Stm.ProofTask) () let () = Coqtop.toploop_init := WorkerLoop.loop W.init_stdout diff --git a/stm/queryworkertop.ml b/stm/queryworkertop.ml index ac7a270ac..a1fe50c63 100644 --- a/stm/queryworkertop.ml +++ b/stm/queryworkertop.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -module W = AsyncTaskQueue.MakeWorker(Stm.QueryTask) +module W = AsyncTaskQueue.MakeWorker(Stm.QueryTask) () let () = Coqtop.toploop_init := WorkerLoop.loop W.init_stdout diff --git a/stm/stm.ml b/stm/stm.ml index 84a4c5cc5..3cac3b609 100644 --- a/stm/stm.ml +++ b/stm/stm.ml @@ -179,7 +179,7 @@ type 'vcs state_info = { (* TODO: Make this record private to VCS *) let default_info () = { n_reached = 0; n_goals = 0; state = Empty; vcs_backup = None,None } -module DynBlockData : Dyn.S = Dyn.Make(struct end) +module DynBlockData : Dyn.S = Dyn.Make () (* Clusters of nodes implemented as Dag properties. While Dag and Vcs impose * no constraint on properties, here we impose boxes to be non overlapping. @@ -1558,7 +1558,7 @@ and Slaves : sig end = struct (* {{{ *) - module TaskQueue = AsyncTaskQueue.MakeQueue(ProofTask) + module TaskQueue = AsyncTaskQueue.MakeQueue(ProofTask) () let queue = ref None let init () = @@ -1884,7 +1884,7 @@ and Partac : sig end = struct (* {{{ *) - module TaskQueue = AsyncTaskQueue.MakeQueue(TacTask) + module TaskQueue = AsyncTaskQueue.MakeQueue(TacTask) () let vernac_interp ~solve ~abstract cancel nworkers safe_id id { indentation; verbose; loc; expr = e; strlen } @@ -2014,7 +2014,7 @@ and Query : sig end = struct (* {{{ *) - module TaskQueue = AsyncTaskQueue.MakeQueue(QueryTask) + module TaskQueue = AsyncTaskQueue.MakeQueue(QueryTask) () let queue = ref None diff --git a/stm/tacworkertop.ml b/stm/tacworkertop.ml index 1716ac0c6..17f90b7b1 100644 --- a/stm/tacworkertop.ml +++ b/stm/tacworkertop.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -module W = AsyncTaskQueue.MakeWorker(Stm.TacTask) +module W = AsyncTaskQueue.MakeWorker(Stm.TacTask) () let () = Coqtop.toploop_init := WorkerLoop.loop W.init_stdout diff --git a/stm/vio_checking.ml b/stm/vio_checking.ml index 9507e90ba..da6a095ab 100644 --- a/stm/vio_checking.ml +++ b/stm/vio_checking.ml @@ -14,7 +14,7 @@ let check_vio (ts,f) = Stm.set_compilation_hints long_f_dot_v; List.fold_left (fun acc ids -> Stm.check_task f tasks ids && acc) true ts -module Worker = Spawn.Sync(struct end) +module Worker = Spawn.Sync () module IntOT = struct type t = int |