language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-03 11:52:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Support extension variables in record and tag union encoding derive keys

Browse source
This commit is contained in:
Ayaz Hafiz 2022-08-17 09:48:38 -05:00
parent a8b348506f
commit b5e59d22e3
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
4 changed files with 86 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/compiler/derive_key/src/encoding.rs
View file

@ -2,10 +2,10 @@ use roc_module::{
ident::{Lowercase, TagName},
symbol::Symbol,
};
use roc_types::subs::{Content, FlatType, GetSubsSlice, Subs, Variable};
use roc_types::subs::{Content, FlatType, Subs, Variable};
use crate::{
util::{check_empty_ext_var, debug_name_record},
util::{check_derivable_ext_var, debug_name_record},
DeriveError,
};
@ -63,12 +63,17 @@ impl FlatEncodable {
_ => Err(Underivable),
},
FlatType::Record(fields, ext) => {
check_empty_ext_var(subs, ext, |ext| {
let (fields_iter, ext) = fields.unsorted_iterator_and_ext(subs, ext);
check_derivable_ext_var(subs, ext, |ext| {
matches!(ext, Content::Structure(FlatType::EmptyRecord))
})?;
let mut field_names: Vec<_> =
subs.get_subs_slice(fields.field_names()).to_vec();
let mut field_names = Vec::with_capacity(fields.len());
for (field_name, _) in fields_iter {
field_names.push(field_name.clone());
}
field_names.sort();
Ok(Key(FlatEncodableKey::Record(field_names)))
@ -83,20 +88,23 @@ impl FlatEncodable {
// [ A t1, B t1 t2 ] as R
// look the same on the surface, because `R` is only somewhere inside of the
// `t`-prefixed payload types.
check_empty_ext_var(subs, ext, |ext| {
let (tags_iter, ext) = tags.unsorted_tags_and_ext(subs, ext);
check_derivable_ext_var(subs, ext, |ext| {
matches!(ext, Content::Structure(FlatType::EmptyTagUnion))
})?;
let mut tag_names_and_payload_sizes: Vec<_> = tags
.iter_all()
.map(|(name_index, payload_slice_index)| {
let payload_slice = subs[payload_slice_index];
let payload_size = payload_slice.length;
let name = &subs[name_index];
(name.clone(), payload_size)
let mut tag_names_and_payload_sizes: Vec<_> = tags_iter
.tags
.into_iter()
.map(|(name, payload_slice)| {
let payload_size = payload_slice.len();
(name.clone(), payload_size as _)
})
.collect();
tag_names_and_payload_sizes.sort_by(|(t1, _), (t2, _)| t1.cmp(t2));
Ok(Key(FlatEncodableKey::TagUnion(tag_names_and_payload_sizes)))
}
FlatType::FunctionOrTagUnion(name_index, _, _) => Ok(Key(

6
crates/compiler/derive_key/src/util.rs
View file

@ -3,13 +3,15 @@ use roc_types::subs::{Content, Subs, Variable};
use crate::DeriveError;
pub(crate) fn check_empty_ext_var(
pub(crate) fn check_derivable_ext_var(
subs: &Subs,
ext_var: Variable,
is_empty_ext: impl Fn(&Content) -> bool,
) -> Result<(), DeriveError> {
let ext_content = subs.get_content_without_compacting(ext_var);
if is_empty_ext(ext_content) {
if is_empty_ext(ext_content)
|| matches!(ext_content, Content::FlexVar(_) | Content::RigidVar(_))
{
Ok(())
} else {
match ext_content {