Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix a make -j bug, by ensuring Lazy depends on CamlinternalLazy. #2148

Merged
merged 1 commit into from Nov 18, 2018
Merged

Fix a make -j bug, by ensuring Lazy depends on CamlinternalLazy. #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions Changes
View file
Open in desktop
Expand Up @@ -448,6 +448,9 @@ Working version
(Sébastien Hinderer, review by Xavier Leroy, Stephen Dolan and
Damien Doligez)

- GPR#2148: fix a parallel build bug involving CamlinternalLazy.
(Stephen Dolan, review by Gabriel Scherer and Nicolas Ojeda Bar)

### Internal/compiler-libs changes:

- GPR#292: use Menhir as the parser generator for the OCaml parser.
Expand Down
2 changes: 1 addition & 1 deletion stdlib/.depend
View file
Open in desktop
Expand Up @@ -104,7 +104,7 @@ stdlib__int64.cmx : stdlib.cmx stdlib__int64.cmi
stdlib__int64.cmi :
stdlib__lazy.cmo : stdlib__obj.cmi camlinternalLazy.cmi stdlib__lazy.cmi
stdlib__lazy.cmx : stdlib__obj.cmx camlinternalLazy.cmx stdlib__lazy.cmi
stdlib__lazy.cmi :
stdlib__lazy.cmi : camlinternalLazy.cmi
stdlib__lexing.cmo : stdlib__sys.cmi stdlib__string.cmi stdlib__bytes.cmi stdlib__array.cmi stdlib__lexing.cmi
stdlib__lexing.cmx : stdlib__sys.cmx stdlib__string.cmx stdlib__bytes.cmx stdlib__array.cmx stdlib__lexing.cmi
stdlib__lexing.cmi :
Expand Down
2 changes: 2 additions & 0 deletions stdlib/camlinternalLazy.ml
View file
Open in desktop
Expand Up @@ -15,6 +15,8 @@

(* Internals of forcing lazy values. *)

type 'a t = 'a lazy_t

exception Undefined

let raise_undefined = Obj.repr (fun () -> raise Undefined)
Expand Down
2 changes: 2 additions & 0 deletions stdlib/camlinternalLazy.mli
View file
Open in desktop
Expand Up @@ -19,6 +19,8 @@

exception Undefined

type 'a t = 'a lazy_t

val force_lazy_block : 'a lazy_t -> 'a

val force_val_lazy_block : 'a lazy_t -> 'a
Expand Down
2 changes: 1 addition & 1 deletion stdlib/lazy.ml
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@
rules for the [lazy] keyword.
*)

type 'a t = 'a lazy_t
type 'a t = 'a CamlinternalLazy.t

exception Undefined = CamlinternalLazy.Undefined

Expand Down
2 changes: 1 addition & 1 deletion stdlib/lazy.mli
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@

(** Deferred computations. *)

type 'a t = 'a lazy_t
type 'a t = 'a CamlinternalLazy.t
(** A value of type ['a Lazy.t] is a deferred computation, called
a suspension, that has a result of type ['a]. The special
expression syntax [lazy (expr)] makes a suspension of the
Expand Down
10 changes: 5 additions & 5 deletions testsuite/tests/backtrace/backtrace2.byte.reference
View file
Open in desktop
Expand Up @@ -46,13 +46,13 @@ Called from file "backtrace2.ml", line 52, characters 43-52
Called from file "backtrace2.ml", line 52, characters 43-52
Called from file "backtrace2.ml", line 52, characters 43-52
Called from file "backtrace2.ml", line 52, characters 43-52
Called from file "camlinternalLazy.ml", line 27, characters 17-27
Re-raised at file "camlinternalLazy.ml", line 34, characters 10-11
Called from file "camlinternalLazy.ml", line 29, characters 17-27
Re-raised at file "camlinternalLazy.ml", line 36, characters 10-11
Called from file "backtrace2.ml", line 67, characters 11-23
Uncaught exception Not_found
Raised at file "hashtbl.ml", line 194, characters 19-28
Called from file "backtrace2.ml", line 55, characters 8-41
Re-raised at file "camlinternalLazy.ml", line 33, characters 62-63
Called from file "camlinternalLazy.ml", line 27, characters 17-27
Re-raised at file "camlinternalLazy.ml", line 34, characters 10-11
Re-raised at file "camlinternalLazy.ml", line 35, characters 62-63
Called from file "camlinternalLazy.ml", line 29, characters 17-27
Re-raised at file "camlinternalLazy.ml", line 36, characters 10-11
Called from file "backtrace2.ml", line 67, characters 11-23
10 changes: 5 additions & 5 deletions testsuite/tests/backtrace/backtrace2.opt.reference
View file
Open in desktop
Expand Up @@ -46,13 +46,13 @@ Called from file "backtrace2.ml", line 52, characters 43-52
Called from file "backtrace2.ml", line 52, characters 43-52
Called from file "backtrace2.ml", line 52, characters 43-52
Called from file "backtrace2.ml", line 52, characters 43-52
Called from file "camlinternalLazy.ml", line 27, characters 17-27
Re-raised at file "camlinternalLazy.ml", line 34, characters 4-11
Called from file "camlinternalLazy.ml", line 29, characters 17-27
Re-raised at file "camlinternalLazy.ml", line 36, characters 4-11
Called from file "backtrace2.ml", line 67, characters 11-23
Uncaught exception Not_found
Raised at file "hashtbl.ml", line 194, characters 13-28
Called from file "backtrace2.ml", line 55, characters 8-41
Re-raised at file "camlinternalLazy.ml", line 33, characters 56-63
Called from file "camlinternalLazy.ml", line 27, characters 17-27
Re-raised at file "camlinternalLazy.ml", line 34, characters 4-11
Re-raised at file "camlinternalLazy.ml", line 35, characters 56-63
Called from file "camlinternalLazy.ml", line 29, characters 17-27
Re-raised at file "camlinternalLazy.ml", line 36, characters 4-11
Called from file "backtrace2.ml", line 67, characters 11-23