Skip to content

refactor(core): share record label name lookup #1882

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

Draft
anmonteiro wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −36
Draft

refactor(core): share record label name lookup #1882

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 18 additions & 36 deletions jscomp/core/record_attributes_check.cppo.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,58 +102,40 @@ let find_with_default xs ~default =
module Types = Data_types
#endif

let label_name (lbl : Types.label_description) =
find_with_default lbl.lbl_attributes ~default:lbl.lbl_name

let label_names fields =
Array.map
~f:(fun ((lbl : Types.label_description), _) -> label_name lbl)
fields

let fld_record (lbl : Types.label_description) =
Lambda.Fld_record
{
name = find_with_default lbl.lbl_attributes ~default:lbl.lbl_name;
mutable_flag = lbl.lbl_mut;
}
{ name = label_name lbl; mutable_flag = lbl.lbl_mut }

let fld_record_set (lbl : Types.label_description) =
Lambda.Fld_record_set
(find_with_default lbl.lbl_attributes ~default:lbl.lbl_name)
Lambda.Fld_record_set (label_name lbl)

let fld_record_inline (lbl : Types.label_description) =
Lambda.Fld_record_inline
{ name = find_with_default lbl.lbl_attributes ~default:lbl.lbl_name }
Lambda.Fld_record_inline { name = label_name lbl }

let fld_record_inline_set (lbl : Types.label_description) =
Lambda.Fld_record_inline_set
(find_with_default lbl.lbl_attributes ~default:lbl.lbl_name)
Lambda.Fld_record_inline_set (label_name lbl)

let fld_record_extension (lbl : Types.label_description) =
Lambda.Fld_record_extension
{ name = find_with_default lbl.lbl_attributes ~default:lbl.lbl_name }
Lambda.Fld_record_extension { name = label_name lbl }

let fld_record_extension_set (lbl : Types.label_description) =
Lambda.Fld_record_extension_set
(find_with_default lbl.lbl_attributes ~default:lbl.lbl_name)

let blk_record fields =
let all_labels_info =
Array.map
~f:(fun (lbl, _) ->
find_with_default lbl.Types.lbl_attributes ~default:lbl.lbl_name)
fields
in
Lambda.Blk_record all_labels_info
Lambda.Fld_record_extension_set (label_name lbl)

let blk_record fields = Lambda.Blk_record (label_names fields)

let blk_record_ext ~is_exn fields =
let all_labels_info =
Array.map
~f:(fun ((lbl : Types.label_description), _) ->
find_with_default lbl.Types.lbl_attributes ~default:lbl.lbl_name)
fields
in
Lambda.Blk_record_ext { fields = all_labels_info; exn = is_exn }
Lambda.Blk_record_ext { fields = label_names fields; exn = is_exn }

let blk_record_inlined fields name num_nonconst attrs =
let fields =
Array.map
~f:(fun ((lbl : Types.label_description), _) ->
find_with_default lbl.Types.lbl_attributes ~default:lbl.lbl_name)
fields
in
let fields = label_names fields in
Lambda.Blk_record_inlined { fields; name; num_nonconst; attributes = attrs }

let check_mel_attributes_inclusion (attrs1 : Parsetree.attributes)
Expand Down