Skip to content

Commit d59b264

Browse files
chenglouchenglou
committed
[Super errors] Update artifacts
1 parent 38cbd10 commit d59b264

File tree

3 files changed

+45
-48
lines changed

3 files changed

+45
-48
lines changed

‎lib/4.06.1/unstable/js_compiler.ml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -409758,8 +409758,8 @@ let super_warning_printer loc ppf w =
409758409758
match Warnings.report w with
409759409759
| `Inactive -> ()
409760409760
| `Active { Warnings. number = _; message = _; sub_locs = _} ->
409761-
setup_colors ();
409762-
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
409761+
setup_colors ();
409762+
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
409763409763
(print ("Warning number " ^ (Warnings.number w |> string_of_int)))
409764409764
loc
409765409765
(Warnings.message w);
@@ -410404,8 +410404,7 @@ let simple_conversions = [
410404410404
let print_simple_conversion ppf (actual, expected) =
410405410405
try (
410406410406
let converter = List.assoc (actual, expected) simple_conversions in
410407-
Format.pp_print_newline ppf ();
410408-
fprintf ppf "@[<v 2>@,You can convert @{<info>%s@} to @{<info>%s@} with @{<info>%s@}.@]" actual expected converter
410407+
fprintf ppf "@,@,@[<v 2>You can convert @{<info>%s@} to @{<info>%s@} with @{<info>%s@}.@]" actual expected converter
410409410408
) with | Not_found -> ()
410410410409

410411410410
let print_simple_message ppf = function
@@ -410502,7 +410501,7 @@ let print_expr_type_clash env trace ppf =
410502410501
(function ppf ->
410503410502
fprintf ppf "This has type:")
410504410503
(function ppf ->
410505-
fprintf ppf "But somewhere wanted:");
410504+
fprintf ppf "Somewhere wanted:");
410506410505
show_extra_help ppf env trace;
410507410506
end
410508410507

@@ -410545,21 +410544,21 @@ let report_error env ppf = function
410545410544
fprintf ppf "The variable %s on the left-hand side of this or-pattern has type" (Ident.name id))
410546410545
(function ppf ->
410547410546
fprintf ppf "but on the right-hand side it has type")
410548-
| Expr_type_clash (
410547+
| Expr_type_clash (
410549410548
(_, {desc = Tarrow _}) ::
410550410549
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)}) :: _
410551-
) ->
410552-
fprintf ppf "This function is a curried function where an uncurried function is expected"
410550+
) ->
410551+
fprintf ppf "This function is a curried function where an uncurried function is expected"
410553410552
| Expr_type_clash (
410554410553
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),a,_),_,_)}) ::
410555410554
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),b,_),_,_)}) :: _
410556-
) when a <> b ->
410557-
fprintf ppf "This function has %s but was expected %s" a b
410558-
| Expr_type_clash (
410555+
) when a <> b ->
410556+
fprintf ppf "This function has %s but was expected %s" a b
410557+
| Expr_type_clash (
410559410558
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),a,_),_,_)}) ::
410560410559
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),b,_),_,_)}) :: _
410561-
) when a <> b ->
410562-
fprintf ppf "This method has %s but was expected %s" a b
410560+
) when a <> b ->
410561+
fprintf ppf "This method has %s but was expected %s" a b
410563410562

410564410563
| Expr_type_clash trace ->
410565410564
(* modified *)
@@ -410621,10 +410620,10 @@ let report_error env ppf = function
410621410620
fprintf ppf "it should have type@ %a@]"
410622410621
type_expr ty
410623410622
end else begin
410624-
match ty with
410625-
| {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)} ->
410623+
match ty with
410624+
| {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)} ->
410626410625
fprintf ppf "This expression is excpeted to have an uncurried function"
410627-
| _ ->
410626+
| _ ->
410628410627
fprintf ppf "@[This expression should not be a function,@ ";
410629410628
fprintf ppf "the expected type is@ %a@]"
410630410629
type_expr ty

‎lib/4.06.1/unstable/js_refmt_compiler.ml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -569854,8 +569854,8 @@ let super_warning_printer loc ppf w =
569854569854
match Warnings.report w with
569855569855
| `Inactive -> ()
569856569856
| `Active { Warnings. number = _; message = _; sub_locs = _} ->
569857-
setup_colors ();
569858-
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
569857+
setup_colors ();
569858+
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
569859569859
(print ("Warning number " ^ (Warnings.number w |> string_of_int)))
569860569860
loc
569861569861
(Warnings.message w);
@@ -570500,8 +570500,7 @@ let simple_conversions = [
570500570500
let print_simple_conversion ppf (actual, expected) =
570501570501
try (
570502570502
let converter = List.assoc (actual, expected) simple_conversions in
570503-
Format.pp_print_newline ppf ();
570504-
fprintf ppf "@[<v 2>@,You can convert @{<info>%s@} to @{<info>%s@} with @{<info>%s@}.@]" actual expected converter
570503+
fprintf ppf "@,@,@[<v 2>You can convert @{<info>%s@} to @{<info>%s@} with @{<info>%s@}.@]" actual expected converter
570505570504
) with | Not_found -> ()
570506570505

570507570506
let print_simple_message ppf = function
@@ -570598,7 +570597,7 @@ let print_expr_type_clash env trace ppf =
570598570597
(function ppf ->
570599570598
fprintf ppf "This has type:")
570600570599
(function ppf ->
570601-
fprintf ppf "But somewhere wanted:");
570600+
fprintf ppf "Somewhere wanted:");
570602570601
show_extra_help ppf env trace;
570603570602
end
570604570603

@@ -570641,21 +570640,21 @@ let report_error env ppf = function
570641570640
fprintf ppf "The variable %s on the left-hand side of this or-pattern has type" (Ident.name id))
570642570641
(function ppf ->
570643570642
fprintf ppf "but on the right-hand side it has type")
570644-
| Expr_type_clash (
570643+
| Expr_type_clash (
570645570644
(_, {desc = Tarrow _}) ::
570646570645
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)}) :: _
570647-
) ->
570648-
fprintf ppf "This function is a curried function where an uncurried function is expected"
570646+
) ->
570647+
fprintf ppf "This function is a curried function where an uncurried function is expected"
570649570648
| Expr_type_clash (
570650570649
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),a,_),_,_)}) ::
570651570650
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),b,_),_,_)}) :: _
570652-
) when a <> b ->
570653-
fprintf ppf "This function has %s but was expected %s" a b
570654-
| Expr_type_clash (
570651+
) when a <> b ->
570652+
fprintf ppf "This function has %s but was expected %s" a b
570653+
| Expr_type_clash (
570655570654
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),a,_),_,_)}) ::
570656570655
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),b,_),_,_)}) :: _
570657-
) when a <> b ->
570658-
fprintf ppf "This method has %s but was expected %s" a b
570656+
) when a <> b ->
570657+
fprintf ppf "This method has %s but was expected %s" a b
570659570658

570660570659
| Expr_type_clash trace ->
570661570660
(* modified *)
@@ -570717,10 +570716,10 @@ let report_error env ppf = function
570717570716
fprintf ppf "it should have type@ %a@]"
570718570717
type_expr ty
570719570718
end else begin
570720-
match ty with
570721-
| {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)} ->
570719+
match ty with
570720+
| {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)} ->
570722570721
fprintf ppf "This expression is excpeted to have an uncurried function"
570723-
| _ ->
570722+
| _ ->
570724570723
fprintf ppf "@[This expression should not be a function,@ ";
570725570724
fprintf ppf "the expected type is@ %a@]"
570726570725
type_expr ty

‎lib/4.06.1/whole_compiler.ml

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -435355,8 +435355,8 @@ let super_warning_printer loc ppf w =
435355435355
match Warnings.report w with
435356435356
| `Inactive -> ()
435357435357
| `Active { Warnings. number = _; message = _; sub_locs = _} ->
435358-
setup_colors ();
435359-
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]"
435358+
setup_colors ();
435359+
Format.fprintf ppf "@[<v 2>@,%a@,%s@,@]@."
435360435360
(print ("Warning number " ^ (Warnings.number w |> string_of_int)))
435361435361
loc
435362435362
(Warnings.message w);
@@ -435653,8 +435653,7 @@ let simple_conversions = [
435653435653
let print_simple_conversion ppf (actual, expected) =
435654435654
try (
435655435655
let converter = List.assoc (actual, expected) simple_conversions in
435656-
Format.pp_print_newline ppf ();
435657-
fprintf ppf "@[<v 2>@,You can convert @{<info>%s@} to @{<info>%s@} with @{<info>%s@}.@]" actual expected converter
435656+
fprintf ppf "@,@,@[<v 2>You can convert @{<info>%s@} to @{<info>%s@} with @{<info>%s@}.@]" actual expected converter
435658435657
) with | Not_found -> ()
435659435658

435660435659
let print_simple_message ppf = function
@@ -435751,7 +435750,7 @@ let print_expr_type_clash env trace ppf =
435751435750
(function ppf ->
435752435751
fprintf ppf "This has type:")
435753435752
(function ppf ->
435754-
fprintf ppf "But somewhere wanted:");
435753+
fprintf ppf "Somewhere wanted:");
435755435754
show_extra_help ppf env trace;
435756435755
end
435757435756

@@ -435794,21 +435793,21 @@ let report_error env ppf = function
435794435793
fprintf ppf "The variable %s on the left-hand side of this or-pattern has type" (Ident.name id))
435795435794
(function ppf ->
435796435795
fprintf ppf "but on the right-hand side it has type")
435797-
| Expr_type_clash (
435796+
| Expr_type_clash (
435798435797
(_, {desc = Tarrow _}) ::
435799435798
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)}) :: _
435800-
) ->
435801-
fprintf ppf "This function is a curried function where an uncurried function is expected"
435799+
) ->
435800+
fprintf ppf "This function is a curried function where an uncurried function is expected"
435802435801
| Expr_type_clash (
435803435802
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),a,_),_,_)}) ::
435804435803
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),b,_),_,_)}) :: _
435805-
) when a <> b ->
435806-
fprintf ppf "This function has %s but was expected %s" a b
435807-
| Expr_type_clash (
435804+
) when a <> b ->
435805+
fprintf ppf "This function has %s but was expected %s" a b
435806+
| Expr_type_clash (
435808435807
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),a,_),_,_)}) ::
435809435808
(_, {desc = Tconstr (Pdot (Pdot(Pident {name = "Js_OO"},"Meth",_),b,_),_,_)}) :: _
435810-
) when a <> b ->
435811-
fprintf ppf "This method has %s but was expected %s" a b
435809+
) when a <> b ->
435810+
fprintf ppf "This method has %s but was expected %s" a b
435812435811

435813435812
| Expr_type_clash trace ->
435814435813
(* modified *)
@@ -435870,10 +435869,10 @@ let report_error env ppf = function
435870435869
fprintf ppf "it should have type@ %a@]"
435871435870
type_expr ty
435872435871
end else begin
435873-
match ty with
435874-
| {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)} ->
435872+
match ty with
435873+
| {desc = Tconstr (Pdot (Pdot(Pident {name = "Js"},"Fn",_),_,_),_,_)} ->
435875435874
fprintf ppf "This expression is excpeted to have an uncurried function"
435876-
| _ ->
435875+
| _ ->
435877435876
fprintf ppf "@[This expression should not be a function,@ ";
435878435877
fprintf ppf "the expected type is@ %a@]"
435879435878
type_expr ty

0 commit comments

Comments
 (0)