Skip to content

Commit c74358b

Browse files
authored
Evaluate signature substitutions lazily (upstream PR 10599) (#280)
(cherry picked from commit fa43873)
1 parent 79fa7a9 commit c74358b

File tree

14 files changed

+626
-256
lines changed

14 files changed

+626
-256
lines changed

ocaml/.depend

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,8 @@ typing/subst.cmx : \
11061106
typing/subst.cmi : \
11071107
typing/types.cmi \
11081108
typing/path.cmi \
1109+
parsing/parsetree.cmi \
1110+
parsing/location.cmi \
11091111
typing/ident.cmi
11101112
typing/tast_iterator.cmo : \
11111113
typing/typedtree.cmi \

ocaml/boot/ocamlc

29 KB
Binary file not shown.

ocaml/boot/ocamllex

-28 Bytes
Binary file not shown.

ocaml/testsuite/tests/shadow_include/shadow_all.ml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ module NN :
304304
val unit : unit
305305
external e : unit -> unit = "%identity"
306306
module M = N.M
307-
module type T = sig end
307+
module type T = N.T
308308
exception E
309309
type ext = N.ext = ..
310310
type ext += C
@@ -329,7 +329,7 @@ module Type :
329329
val unit : unit
330330
external e : unit -> unit = "%identity"
331331
module M = N.M
332-
module type T = sig end
332+
module type T = N.T
333333
exception E
334334
type ext = N.ext = ..
335335
type ext += C
@@ -352,7 +352,7 @@ module Module :
352352
val unit : unit
353353
external e : unit -> unit = "%identity"
354354
module M = N.M
355-
module type T = sig end
355+
module type T = N.T
356356
exception E
357357
type ext = N.ext = ..
358358
type ext += C
@@ -370,12 +370,12 @@ end
370370
[%%expect{|
371371
module Module_type :
372372
sig
373-
module type U = sig end
373+
module type U = N.T
374374
type t = N.t
375375
val unit : unit
376376
external e : unit -> unit = "%identity"
377377
module M = N.M
378-
module type T = sig end
378+
module type T = N.T
379379
exception E
380380
type ext = N.ext = ..
381381
type ext += C
@@ -398,7 +398,7 @@ module Exception :
398398
val unit : unit
399399
external e : unit -> unit = "%identity"
400400
module M = N.M
401-
module type T = sig end
401+
module type T = N.T
402402
exception E
403403
type ext = N.ext = ..
404404
type ext += C
@@ -421,7 +421,7 @@ module Extension :
421421
val unit : unit
422422
external e : unit -> unit = "%identity"
423423
module M = N.M
424-
module type T = sig end
424+
module type T = N.T
425425
exception E
426426
type ext = N.ext = ..
427427
type ext += C
@@ -444,7 +444,7 @@ module Class :
444444
val unit : unit
445445
external e : unit -> unit = "%identity"
446446
module M = N.M
447-
module type T = sig end
447+
module type T = N.T
448448
exception E
449449
type ext = N.ext = ..
450450
type ext += C
@@ -467,7 +467,7 @@ module Class_type :
467467
val unit : unit
468468
external e : unit -> unit = "%identity"
469469
module M = N.M
470-
module type T = sig end
470+
module type T = N.T
471471
exception E
472472
type ext = N.ext = ..
473473
type ext += C

0 commit comments

Comments
 (0)