Skip to content

Commit fac0c7a

Browse files
authored
Merge pull request #4148 from BuckleScript/tweak
bump compiler changes
2 parents 4661e85 + e9bd31c commit fac0c7a

File tree

8 files changed

+32
-14
lines changed

8 files changed

+32
-14
lines changed

jscomp/ext/bsc_warnings.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@
7272
7373
- 102 Bs_polymorphic_comparison
7474
*)
75-
let defaults_w = "+a-4-9-40-41-42-50-102"
75+
let defaults_w = "+a-4-9-40-41-42-50-61-102"
7676
let defaults_warn_error = "-a+5+101";;
7777
(*TODO: add +10*)

lib/4.06.1/bsb.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6951,7 +6951,7 @@ module Bsc_warnings
69516951

69526952
- 102 Bs_polymorphic_comparison
69536953
*)
6954-
let defaults_w = "+a-4-9-40-41-42-50-102"
6954+
let defaults_w = "+a-4-9-40-41-42-50-61-102"
69556955
let defaults_warn_error = "-a+5+101";;
69566956
(*TODO: add +10*)
69576957

lib/4.06.1/bsdep.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ module Bsc_warnings
138138

139139
- 102 Bs_polymorphic_comparison
140140
*)
141-
let defaults_w = "+a-4-9-40-41-42-50-102"
141+
let defaults_w = "+a-4-9-40-41-42-50-61-102"
142142
let defaults_warn_error = "-a+5+101";;
143143
(*TODO: add +10*)
144144

lib/4.06.1/unstable/bsb_native.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6951,7 +6951,7 @@ module Bsc_warnings
69516951

69526952
- 102 Bs_polymorphic_comparison
69536953
*)
6954-
let defaults_w = "+a-4-9-40-41-42-50-102"
6954+
let defaults_w = "+a-4-9-40-41-42-50-61-102"
69556955
let defaults_warn_error = "-a+5+101";;
69566956
(*TODO: add +10*)
69576957

lib/4.06.1/unstable/js_compiler.ml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25433,7 +25433,7 @@ module Bsc_warnings
2543325433

2543425434
- 102 Bs_polymorphic_comparison
2543525435
*)
25436-
let defaults_w = "+a-4-9-40-41-42-50-102"
25436+
let defaults_w = "+a-4-9-40-41-42-50-61-102"
2543725437
let defaults_warn_error = "-a+5+101";;
2543825438
(*TODO: add +10*)
2543925439

@@ -63559,8 +63559,14 @@ let rec lam ppf = function
6355963559
| Lsend (k, met, obj, largs, _) ->
6356063560
let args ppf largs =
6356163561
List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
63562-
let kind =
63563-
if k = Self then "self" else if k = Cached then "cache" else "" in
63562+
63563+
let kind =
63564+
match k with
63565+
| Self -> "self"
63566+
| Cached -> "cache"
63567+
| Public (Some x) -> x
63568+
| Public None -> "" in
63569+
6356463570
fprintf ppf "@[<2>(send%s@ %a@ %a%a)@]" kind lam obj lam met args largs
6356563571
| Levent(expr, ev) ->
6356663572
let kind =

lib/4.06.1/unstable/js_refmt_compiler.ml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304539,7 +304539,7 @@ module Bsc_warnings
304539304539

304540304540
- 102 Bs_polymorphic_comparison
304541304541
*)
304542-
let defaults_w = "+a-4-9-40-41-42-50-102"
304542+
let defaults_w = "+a-4-9-40-41-42-50-61-102"
304543304543
let defaults_warn_error = "-a+5+101";;
304544304544
(*TODO: add +10*)
304545304545

@@ -342665,8 +342665,14 @@ let rec lam ppf = function
342665342665
| Lsend (k, met, obj, largs, _) ->
342666342666
let args ppf largs =
342667342667
List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
342668-
let kind =
342669-
if k = Self then "self" else if k = Cached then "cache" else "" in
342668+
342669+
let kind =
342670+
match k with
342671+
| Self -> "self"
342672+
| Cached -> "cache"
342673+
| Public (Some x) -> x
342674+
| Public None -> "" in
342675+
342670342676
fprintf ppf "@[<2>(send%s@ %a@ %a%a)@]" kind lam obj lam met args largs
342671342677
| Levent(expr, ev) ->
342672342678
let kind =

lib/4.06.1/whole_compiler.ml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6374,7 +6374,7 @@ module Bsc_warnings
63746374

63756375
- 102 Bs_polymorphic_comparison
63766376
*)
6377-
let defaults_w = "+a-4-9-40-41-42-50-102"
6377+
let defaults_w = "+a-4-9-40-41-42-50-61-102"
63786378
let defaults_warn_error = "-a+5+101";;
63796379
(*TODO: add +10*)
63806380

@@ -47475,8 +47475,14 @@ let rec lam ppf = function
4747547475
| Lsend (k, met, obj, largs, _) ->
4747647476
let args ppf largs =
4747747477
List.iter (fun l -> fprintf ppf "@ %a" lam l) largs in
47478-
let kind =
47479-
if k = Self then "self" else if k = Cached then "cache" else "" in
47478+
47479+
let kind =
47480+
match k with
47481+
| Self -> "self"
47482+
| Cached -> "cache"
47483+
| Public (Some x) -> x
47484+
| Public None -> "" in
47485+
4748047486
fprintf ppf "@[<2>(send%s@ %a@ %a%a)@]" kind lam obj lam met args largs
4748147487
| Levent(expr, ev) ->
4748247488
let kind =

ocaml

Submodule ocaml updated from 98db001 to 37d316f

0 commit comments

Comments
 (0)