Skip to content

Commit 5516e4e

Browse files
committed
Continue flipping
1 parent 02d4175 commit 5516e4e

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

jscomp/bsb/bsb_config_parse.ml

+2-2
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ let interpret_json
348348
cwd
349349

350350
: Bsb_config_types.t =
351-
let not_toplevel = not toplevel in
351+
352352
(** we should not resolve it too early,
353353
since it is external configuration, no {!Bsb_build_util.convert_and_resolve_path}
354354
*)
@@ -412,7 +412,7 @@ let interpret_json
412412
extract_boolean map Bsb_build_schemas.cut_generators false in
413413
let groups = Bsb_parse_sources.scan
414414
~ignored_dirs:(extract_ignored_dirs map)
415-
~not_toplevel
415+
~toplevel
416416
~root: cwd
417417
~cut_generators
418418
~bs_suffix

jscomp/bsb/bsb_parse_sources.ml

+2-1
Original file line numberDiff line numberDiff line change
@@ -423,13 +423,14 @@ and parse_sources ( cxt : cxt) (sources : Ext_json_types.t ) =
423423

424424

425425
let scan
426-
~not_toplevel
426+
~toplevel
427427
~root
428428
~cut_generators
429429
~namespace
430430
~bs_suffix
431431
~ignored_dirs
432432
x : t =
433+
let not_toplevel = toplevel in
433434
parse_sources {
434435
ignored_dirs;
435436
not_toplevel;

jscomp/bsb/bsb_parse_sources.mli

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
all relative paths, this function will do the IO
3131
*)
3232
val scan :
33-
not_toplevel: bool ->
33+
toplevel: bool ->
3434
root: string ->
3535
cut_generators: bool ->
3636
namespace : string option ->

lib/4.02.3/bsb.ml

+5-4
Original file line numberDiff line numberDiff line change
@@ -8737,7 +8737,7 @@ module Bsb_parse_sources : sig
87378737
all relative paths, this function will do the IO
87388738
*)
87398739
val scan :
8740-
not_toplevel: bool ->
8740+
toplevel: bool ->
87418741
root: string ->
87428742
cut_generators: bool ->
87438743
namespace : string option ->
@@ -9180,13 +9180,14 @@ and parse_sources ( cxt : cxt) (sources : Ext_json_types.t ) =
91809180

91819181

91829182
let scan
9183-
~not_toplevel
9183+
~toplevel
91849184
~root
91859185
~cut_generators
91869186
~namespace
91879187
~bs_suffix
91889188
~ignored_dirs
91899189
x : t =
9190+
let not_toplevel = toplevel in
91909191
parse_sources {
91919192
ignored_dirs;
91929193
not_toplevel;
@@ -10949,7 +10950,7 @@ let interpret_json
1094910950
cwd
1095010951

1095110952
: Bsb_config_types.t =
10952-
let not_toplevel = not toplevel in
10953+
1095310954
(** we should not resolve it too early,
1095410955
since it is external configuration, no {!Bsb_build_util.convert_and_resolve_path}
1095510956
*)
@@ -11013,7 +11014,7 @@ let interpret_json
1101311014
extract_boolean map Bsb_build_schemas.cut_generators false in
1101411015
let groups = Bsb_parse_sources.scan
1101511016
~ignored_dirs:(extract_ignored_dirs map)
11016-
~not_toplevel
11017+
~toplevel
1101711018
~root: cwd
1101811019
~cut_generators
1101911020
~bs_suffix

lib/4.02.3/unstable/bsb_native.ml

+5-4
Original file line numberDiff line numberDiff line change
@@ -8737,7 +8737,7 @@ module Bsb_parse_sources : sig
87378737
all relative paths, this function will do the IO
87388738
*)
87398739
val scan :
8740-
not_toplevel: bool ->
8740+
toplevel: bool ->
87418741
root: string ->
87428742
cut_generators: bool ->
87438743
namespace : string option ->
@@ -9180,13 +9180,14 @@ and parse_sources ( cxt : cxt) (sources : Ext_json_types.t ) =
91809180

91819181

91829182
let scan
9183-
~not_toplevel
9183+
~toplevel
91849184
~root
91859185
~cut_generators
91869186
~namespace
91879187
~bs_suffix
91889188
~ignored_dirs
91899189
x : t =
9190+
let not_toplevel = toplevel in
91909191
parse_sources {
91919192
ignored_dirs;
91929193
not_toplevel;
@@ -10981,7 +10982,7 @@ let interpret_json
1098110982
cwd
1098210983

1098310984
: Bsb_config_types.t =
10984-
let not_toplevel = not toplevel in
10985+
1098510986
(** we should not resolve it too early,
1098610987
since it is external configuration, no {!Bsb_build_util.convert_and_resolve_path}
1098710988
*)
@@ -11045,7 +11046,7 @@ let interpret_json
1104511046
extract_boolean map Bsb_build_schemas.cut_generators false in
1104611047
let groups = Bsb_parse_sources.scan
1104711048
~ignored_dirs:(extract_ignored_dirs map)
11048-
~not_toplevel
11049+
~toplevel
1104911050
~root: cwd
1105011051
~cut_generators
1105111052
~bs_suffix

0 commit comments

Comments
 (0)