Skip to content

fix error message on curried/uncurried signature mismatch #6414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 21, 2023
Merged

fix error message on curried/uncurried signature mismatch #6414

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
66a0601
fix error msg on curried/uncurried sig mismatch
tsnobip Sep 27, 2023
b6efc4c
mark function curry kind in value mismatch
tsnobip Sep 29, 2023
018b17d
use expand_head to check type of functions
tsnobip Sep 29, 2023
1f1b4b8
try passing tests in CI
tsnobip Oct 4, 2023
04fd108
Revert "try passing tests in CI"
tsnobip Oct 4, 2023
af30226
shorten test file names
tsnobip Nov 21, 2023
2870c96
shorten test file names even more
tsnobip Nov 21, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use expand_head to check type of functions
  • Loading branch information
@tsnobip
tsnobip committed Sep 29, 2023
commit 018b17d9d9e995cc0676f509cfaa664ef9f5fadc
30 changes: 12 additions & 18 deletions jscomp/ml/includemod.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,28 +533,22 @@ let show_locs ppf (loc1, loc2) =
show_loc "Expected declaration" ppf loc2;
show_loc "Actual declaration" ppf loc1

let include_err ppf = function
let include_err ~env ppf = function
| Missing_field (id, loc, kind) ->
fprintf ppf "The %s `%a' is required but not provided" kind ident id;
show_loc "Expected declaration" ppf loc
| Value_descriptions(id,
({ val_type = { desc = Tlink { desc = Tconstr (Pident {name = "function$"},_,_) }}} as d1),
({ val_type = { desc = Tarrow _ }} as d2)) ->
fprintf ppf
"@[<hv 2>Values do not match:@ %a (uncurried)@;<1 -2>is not included in@ %a (curried)@]"
(value_description id) d1 (value_description id) d2;
show_locs ppf (d1.val_loc, d2.val_loc)
| Value_descriptions(id,
({ val_type = { desc = Tlink { desc = Tarrow _ }}} as d1),
({ val_type = { desc = Tconstr (Pident {name = "function$"},_,_)}} as d2)) ->
fprintf ppf
"@[<hv 2>Values do not match:@ %a (curried)@;<1 -2>is not included in@ %a (uncurried)@]"
(value_description id) d1 (value_description id) d2;
show_locs ppf (d1.val_loc, d2.val_loc)
| Value_descriptions(id, d1, d2) ->
let curry_kind_1, curry_kind_2 =
match (Ctype.expand_head env d1.val_type, Ctype.expand_head env d2.val_type ) with
| { desc = Tarrow _ },
{ desc = Tconstr (Pident {name = "function$"},_,_)} -> (" (curried)", " (uncurried)")
| { desc = Tconstr (Pident {name = "function$"},_,_)},
{ desc = Tarrow _ } -> (" (uncurried)", " (curried)")
Comment on lines +543 to +546
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
| { desc = Tarrow _ },
{ desc = Tconstr (Pident {name = "function$"},_,_)} -> (" (curried)", " (uncurried)")
| { desc = Tconstr (Pident {name = "function$"},_,_)},
{ desc = Tarrow _ } -> (" (uncurried)", " (curried)")
| { desc = Tarrow _ },
t when Ast_uncurried_utils.typeIsUncurriedFun t -> (" (curried)", " (uncurried)")
| t,
{ desc = Tarrow _ } when Ast_uncurried_utils.typeIsUncurriedFun t -> (" (uncurried)", " (curried)")
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm unfortunately it doesn't work with this helper, maybe it's too restrictive? Like working only on function value not on signatures maybe?
Copy link
Member

@zth zth Sep 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It probably needs expand head too first, forgot about that

Edit: scratch that, already done above
| _ -> ("", "")
in
fprintf ppf
"@[<hv 2>Values do not match:@ %a@;<1 -2>is not included in@ %a@]"
(value_description id) d1 (value_description id) d2;
"@[<hv 2>Values do not match:@ %a%s@;<1 -2>is not included in@ %a%s@]"
(value_description id) d1 curry_kind_1 (value_description id) d2 curry_kind_2;
show_locs ppf (d1.val_loc, d2.val_loc);
| Type_declarations(id, d1, d2, errs) ->
fprintf ppf "@[<v>@[<hv>%s:@;<1 2>%a@ %s@;<1 2>%a@]%a%a@]"
Expand Down Expand Up @@ -647,7 +641,7 @@ let context ppf cxt =

let include_err ppf (cxt, env, err) =
Printtyp.wrap_printing_env env (fun () ->
fprintf ppf "@[<v>%a%a@]" context (List.rev cxt) include_err err)
fprintf ppf "@[<v>%a%a@]" context (List.rev cxt) (include_err ~env) err)

let buffer = ref Bytes.empty
let is_big obj =
Expand Down