Skip to content

Commit e658259

Browse files
authored
Merge pull request rescript-lang#3022 from BuckleScript/syn_upgrade
remove unnecessary changes to simplif (not used actually)
2 parents ef39899 + d4c4bf6 commit e658259

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

jscomp/watch-build.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ export npm_package_name=bs-platform
99

1010
echo "Checking"
1111

12-
# make -r -j5 syntax.cmxa
12+
# make -r -j5 syntax.cmxa depends.cmxa bsb.cmxa
13+
1314
make -r -j5 check
1415
echo "Linking"
1516
make -r -j3 ../lib/bsc.exe ../lib/bsb.exe bin/cmjdump.exe ../lib/bsb_helper.exe

lib/bsdep.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38884,7 +38884,7 @@ let rec unsafe_mapper : Bs_ast_mapper.mapper =
3888438884
pcsig_fields = Ast_core_type_class_type.handle_class_type_fields self pcsig_fields
3888538885
};
3888638886
pcty_attributes
38887-
}
38887+
}
3888838888

3888938889
| Pcty_constr _
3889038890
| Pcty_extension _

lib/bsppx.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20889,7 +20889,7 @@ let rec unsafe_mapper : Bs_ast_mapper.mapper =
2088920889
pcsig_fields = Ast_core_type_class_type.handle_class_type_fields self pcsig_fields
2089020890
};
2089120891
pcty_attributes
20892-
}
20892+
}
2089320893

2089420894
| Pcty_constr _
2089520895
| Pcty_extension _

lib/whole_compiler.ml

+8-2
Original file line numberDiff line numberDiff line change
@@ -27098,13 +27098,19 @@ type module_name = private string
2709827098

2709927099
module String_set = Depend.StringSet
2710027100

27101+
(* FIXME: [Clflags.open_modules] seems not to be properly used *)
27102+
27103+
let bound_vars = String_set.empty
27104+
27105+
2710127106
type 'a kind = 'a Ml_binary.kind
2710227107

27108+
2710327109
let read_parse_and_extract (type t) (k : t kind) (ast : t) : String_set.t =
2710427110
Depend.free_structure_names := String_set.empty;
27105-
let bound_vars = String_set.empty in
2710627111
List.iter
2710727112
(fun modname ->
27113+
2710827114
Depend.open_module bound_vars (Longident.Lident modname))
2710927115
(!Clflags.open_modules);
2711027116
(match k with
@@ -113913,7 +113919,7 @@ let rec unsafe_mapper : Bs_ast_mapper.mapper =
113913113919
pcsig_fields = Ast_core_type_class_type.handle_class_type_fields self pcsig_fields
113914113920
};
113915113921
pcty_attributes
113916-
}
113922+
}
113917113923

113918113924
| Pcty_constr _
113919113925
| Pcty_extension _

vendor/ocaml/bytecomp/simplif.mli

-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
open Lambda
1919

20-
val simplify_exits: lambda -> lambda
21-
val eliminate_ref: Lambda.IdentSet.elt -> Lambda.lambda -> Lambda.lambda
22-
val simplify_lets: Lambda.lambda -> Lambda.lambda
2320
val simplify_lambda: lambda -> lambda
2421

2522
(* To be filled by asmcomp/selectgen.ml *)

0 commit comments

Comments
 (0)