diff options
| author | Emilio Jesus Gallego Arias | 2018-10-15 15:31:27 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2018-10-15 15:31:27 +0200 |
| commit | fca9ec68937e047d3895d05e57de462387737796 (patch) | |
| tree | f6fc75f7e6be6b60ceafff3afa9d7e13b3219571 /lib | |
| parent | b7dae2c97cce2a298bfbbd6f3a72a02e092ebe9e (diff) | |
| parent | 06cd051d140a183229cd43f0bbae152d6ad8d6ca (diff) | |
Merge PR #8589: Correct some spelling errors (continued)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/future.ml | 6 | ||||
| -rw-r--r-- | lib/future.mli | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/future.ml b/lib/future.ml index 7a5b6f699b..b372bedc5d 100644 --- a/lib/future.ml +++ b/lib/future.ml @@ -49,7 +49,7 @@ end module UUIDMap = Map.Make(UUID) module UUIDSet = Set.Make(UUID) -type 'a assignement = [ `Val of 'a | `Exn of Exninfo.iexn | `Comp of 'a computation] +type 'a assignment = [ `Val of 'a | `Exn of Exninfo.iexn | `Comp of 'a computation] (* Val is not necessarily a final state, so the computation restarts from the state stocked into Val *) @@ -103,7 +103,7 @@ let from_here ?(fix_exn=id) v = create fix_exn (Val v) let fix_exn_of ck = let _, _, fix_exn, _ = get ck in fix_exn let create_delegate ?(blocking=true) ~name fix_exn = - let assignement signal ck = fun v -> + let assignment signal ck = fun v -> let _, _, fix_exn, c = get ck in assert (match !c with Delegated _ -> true | _ -> false); begin match v with @@ -118,7 +118,7 @@ let create_delegate ?(blocking=true) ~name fix_exn = (fun () -> Mutex.lock lock; Condition.wait cond lock; Mutex.unlock lock), (fun () -> Mutex.lock lock; Condition.broadcast cond; Mutex.unlock lock) in let ck = create ~name fix_exn (Delegated wait) in - ck, assignement signal ck + ck, assignment signal ck (* TODO: get rid of try/catch to be stackless *) let rec compute ck : 'a value = diff --git a/lib/future.mli b/lib/future.mli index d9e8c87b21..55f05518b0 100644 --- a/lib/future.mli +++ b/lib/future.mli @@ -70,10 +70,10 @@ val fix_exn_of : 'a computation -> fix_exn (* Run remotely, returns the function to assign. If not blocking (the default) it raises NotReady if forced before the delegate assigns it. *) -type 'a assignement = [ `Val of 'a | `Exn of Exninfo.iexn | `Comp of 'a computation] +type 'a assignment = [ `Val of 'a | `Exn of Exninfo.iexn | `Comp of 'a computation] val create_delegate : ?blocking:bool -> name:string -> - fix_exn -> 'a computation * ('a assignement -> unit) + fix_exn -> 'a computation * ('a assignment -> unit) (* Given a computation that is_exn, replace it by another one *) val replace : 'a computation -> 'a computation -> unit |
