HigherOrderCO/Bend
1
1
Fork 0
mirror of https://github.com/HigherOrderCO/Bend.git synced 2024-09-11 03:45:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Apply clippy suggestions

Browse Source
This commit is contained in:
imaqtkatt 2024-06-04 15:22:47 -03:00
parent bb428fa09c
commit c411067a34
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fun/net_to_term.rs
View File

@ -144,7 +144,7 @@ impl Reader<'_> {
let zero_term = self.read_term(self.net.enter_port(Port(sel_node, 1))); let zero_term = self.read_term(self.net.enter_port(Port(sel_node, 1)));
let mut succ_term = self.read_term(self.net.enter_port(Port(sel_node, 2))); let mut succ_term = self.read_term(self.net.enter_port(Port(sel_node, 2)));
// Call expand_generated in case of succ_term be a lifted term // Call expand_generated in case of succ_term be a lifted term
succ_term.expand_generated(&self.book, &self.recursive_defs); succ_term.expand_generated(self.book, self.recursive_defs);
// Succ term should be a lambda // Succ term should be a lambda
let (zero, succ) = match &mut succ_term { let (zero, succ) = match &mut succ_term {

29
src/fun/transform/encode_adts.rs
View File

@ -16,21 +16,11 @@ impl Book {
let body = match adt_encoding { let body = match adt_encoding {
AdtEncoding::Scott => encode_ctr_scott(fields.iter().map(|f| &f.nam), ctrs, ctr_name), AdtEncoding::Scott => encode_ctr_scott(fields.iter().map(|f| &f.nam), ctrs, ctr_name),
AdtEncoding::NumScott => { AdtEncoding::NumScott => {
let is_object = adt_name == ctr_name; let tag = make_tag(adt_name == ctr_name, ctr_name);
if is_object { let body = encode_ctr_num_scott(fields.iter().map(|f| &f.nam), &tag);
let tag = Name::new(format!("{ctr_name}/tag")); let tag_def = make_tag_def(ctr_idx, &tag, adt);
let body = encode_ctr_num_scott(fields.iter().map(|f| &f.nam), &tag); tags.push((tag, tag_def));
let tag_def = make_tag_def(ctr_idx, &tag, adt); body
tags.push((tag, tag_def));
body
} else {
let (typ, ctr) = ctr_name.rsplit_once('/').expect("To split at '/'");
let tag = Name::new(format!("{typ}/{ctr}/tag"));
let body = encode_ctr_num_scott(fields.iter().map(|f| &f.nam), &tag);
let tag_def = make_tag_def(ctr_idx, &tag, adt);
tags.push((tag, tag_def));
body
}
} }
}; };
@ -44,6 +34,15 @@ impl Book {
} }
} }
fn make_tag(is_object: bool, ctr_name: &Name) -> Name {
if is_object {
Name::new(format!("{ctr_name}/tag"))
} else {
let (typ, ctr) = ctr_name.rsplit_once('/').expect("To split at '/'");
Name::new(format!("{typ}/{ctr}/tag"))
}
}
fn encode_ctr_scott<'a>( fn encode_ctr_scott<'a>(
ctr_args: impl DoubleEndedIterator<Item = &'a Name> + Clone, ctr_args: impl DoubleEndedIterator<Item = &'a Name> + Clone,
ctrs: Vec<Name>, ctrs: Vec<Name>,