Skip to content

Commit fb58a7e

Browse files
committed
No longer ignore always annotation
1 parent 2b9aae5 commit fb58a7e

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

compiler/lib/linker.ml

+7-9
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ let list_all ?from () =
437437
provided
438438
StringSet.empty
439439

440-
let load_fragment ~ignore_always_annotation ~target_env ~filename (f : Fragment.t) =
440+
let load_fragment ~target_env ~filename (f : Fragment.t) =
441441
match f with
442442
| Always_include code ->
443443
always_included :=
@@ -482,8 +482,6 @@ let load_fragment ~ignore_always_annotation ~target_env ~filename (f : Fragment.
482482
filename;
483483
if always
484484
then (
485-
if not ignore_always_annotation
486-
then
487485
always_included :=
488486
{ ar_filename = filename; ar_program = code; ar_requires = requires }
489487
:: !always_included;
@@ -588,24 +586,24 @@ let check_deps () =
588586
())
589587
code_pieces
590588

591-
let load_file ~ignore_always_annotation ~target_env filename =
589+
let load_file ~target_env filename =
592590
List.iter (Fragment.parse_file filename) ~f:(fun frag ->
593591
let (`Ok | `Ignored) =
594-
load_fragment ~ignore_always_annotation ~target_env ~filename frag
592+
load_fragment ~target_env ~filename frag
595593
in
596594
())
597595

598-
let load_fragments ?(ignore_always_annotation = false) ~target_env ~filename l =
596+
let load_fragments ~target_env ~filename l =
599597
List.iter l ~f:(fun frag ->
600598
let (`Ok | `Ignored) =
601-
load_fragment ~ignore_always_annotation ~target_env ~filename frag
599+
load_fragment ~target_env ~filename frag
602600
in
603601
());
604602
check_deps ()
605603

606-
let load_files ?(ignore_always_annotation = false) ~target_env l =
604+
let load_files ~target_env l =
607605
List.iter l ~f:(fun filename ->
608-
load_file ~ignore_always_annotation ~target_env filename);
606+
load_file ~target_env filename);
609607
check_deps ()
610608

611609
(* resolve *)

compiler/lib/linker.mli

+2-3
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ end
3737
val reset : unit -> unit
3838

3939
val load_files :
40-
?ignore_always_annotation:bool -> target_env:Target_env.t -> string list -> unit
40+
target_env:Target_env.t -> string list -> unit
4141

4242
val load_fragments :
43-
?ignore_always_annotation:bool
44-
-> target_env:Target_env.t
43+
target_env:Target_env.t
4544
-> filename:string
4645
-> Fragment.t list
4746
-> unit

0 commit comments

Comments
 (0)