Skip to content

Allow type variables when spreading record type definitions #6309

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 14 commits into from
Jun 25, 2023
Merged

Allow type variables when spreading record type definitions #6309

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7f3bbcb
exploration
zth Jun 22, 2023
e2c07c5
simple substitution of type parameters, and some cleanup
zth Jun 22, 2023
3340f6c
do deep substitution of type variables
zth Jun 23, 2023
af3b0d0
allow renaming type variables, and spreading with instantiated type v…
zth Jun 23, 2023
4588502
cleanup
zth Jun 24, 2023
d4e98ee
redo pairing type params logic
zth Jun 24, 2023
e9ca35e
refactor: better type inference
cristianoc Jun 25, 2023
72b75d9
Don't ask.
cristianoc Jun 25, 2023
b00cd22
remove open
zth Jun 25, 2023
23b94d2
rename record type spread utils file
zth Jun 25, 2023
6d8339d
move more things related to record type spreads into dedicated file
zth Jun 25, 2023
0eddf31
test for deep sub
zth Jun 25, 2023
ad9e031
extend test a bit
zth Jun 25, 2023
4588da7
changelog
zth Jun 25, 2023
File filter

Filter by extension

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
rename record type spread utils file
  • Loading branch information
@zth
zth committed Jun 25, 2023
commit 23b94d2fbae3ada7446004cf8010b916322536a8
0 jscomp/ml/record_spread.ml → jscomp/ml/record_type_spread.ml
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions jscomp/ml/typedecl.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,8 @@ let transl_declaration ~typeRecordAsObject env sdecl id =
let lbls_opt = match has_spread with
| true ->
let substitute_type_vars type_vars typ =
let type_map = type_vars |> List.fold_left (fun acc (tvar_name, tvar_typ) -> Record_spread.StringMap.add tvar_name tvar_typ acc) Record_spread.StringMap.empty in
Record_spread.substitute_types ~type_map typ in
let type_map = type_vars |> List.fold_left (fun acc (tvar_name, tvar_typ) -> Record_type_spread.StringMap.add tvar_name tvar_typ acc) Record_type_spread.StringMap.empty in
Record_type_spread.substitute_types ~type_map typ in
let rec extract t = match t.desc with
| Tpoly(t, []) -> extract t
| _ -> Ctype.repr t in
Expand Down