Skip to content

Evaluate signature substitutions lazily (upstream PR 10599) #280

New issue

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

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

Already on GitHub? # to your account

Merged
merged 1 commit into from
Sep 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ocaml/.depend
Original file line number Diff line number Diff line change
Expand Up @@ -1106,6 +1106,8 @@ typing/subst.cmx : \
typing/subst.cmi : \
typing/types.cmi \
typing/path.cmi \
parsing/parsetree.cmi \
parsing/location.cmi \
typing/ident.cmi
typing/tast_iterator.cmo : \
typing/typedtree.cmi \
Expand Down
Binary file modified ocaml/boot/ocamlc
Binary file not shown.
Binary file modified ocaml/boot/ocamllex
Binary file not shown.
18 changes: 9 additions & 9 deletions ocaml/testsuite/tests/shadow_include/shadow_all.ml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ module NN :
val unit : unit
external e : unit -> unit = "%identity"
module M = N.M
module type T = sig end
module type T = N.T
exception E
type ext = N.ext = ..
type ext += C
Expand All @@ -329,7 +329,7 @@ module Type :
val unit : unit
external e : unit -> unit = "%identity"
module M = N.M
module type T = sig end
module type T = N.T
exception E
type ext = N.ext = ..
type ext += C
Expand All @@ -352,7 +352,7 @@ module Module :
val unit : unit
external e : unit -> unit = "%identity"
module M = N.M
module type T = sig end
module type T = N.T
exception E
type ext = N.ext = ..
type ext += C
Expand All @@ -370,12 +370,12 @@ end
[%%expect{|
module Module_type :
sig
module type U = sig end
module type U = N.T
type t = N.t
val unit : unit
external e : unit -> unit = "%identity"
module M = N.M
module type T = sig end
module type T = N.T
exception E
type ext = N.ext = ..
type ext += C
Expand All @@ -398,7 +398,7 @@ module Exception :
val unit : unit
external e : unit -> unit = "%identity"
module M = N.M
module type T = sig end
module type T = N.T
exception E
type ext = N.ext = ..
type ext += C
Expand All @@ -421,7 +421,7 @@ module Extension :
val unit : unit
external e : unit -> unit = "%identity"
module M = N.M
module type T = sig end
module type T = N.T
exception E
type ext = N.ext = ..
type ext += C
Expand All @@ -444,7 +444,7 @@ module Class :
val unit : unit
external e : unit -> unit = "%identity"
module M = N.M
module type T = sig end
module type T = N.T
exception E
type ext = N.ext = ..
type ext += C
Expand All @@ -467,7 +467,7 @@ module Class_type :
val unit : unit
external e : unit -> unit = "%identity"
module M = N.M
module type T = sig end
module type T = N.T
exception E
type ext = N.ext = ..
type ext += C
Expand Down
Loading