chore: rename some functions

This commit is contained in:
microproofs 2023-07-02 15:01:26 -04:00 committed by Kasey
parent c025073056
commit 05b6b2a97d
1 changed files with 18 additions and 10 deletions

View File

@ -550,8 +550,12 @@ impl<'a> CodeGenerator<'a> {
if tipo.is_primitive() { if tipo.is_primitive() {
AirTree::let_assignment(name, assignment.hoist_over(val)) AirTree::let_assignment(name, assignment.hoist_over(val))
} else { } else {
let expect = let expect = self.expect_type_assign(
self.expect_type(tipo, val.clone(), &mut index_map, pattern.location()); tipo,
val.clone(),
&mut index_map,
pattern.location(),
);
let assign = AirTree::let_assignment("_", assignment.hoist_over(expect)); let assign = AirTree::let_assignment("_", assignment.hoist_over(expect));
AirTree::let_assignment(name, assign.hoist_over(val)) AirTree::let_assignment(name, assign.hoist_over(val))
} }
@ -576,8 +580,12 @@ impl<'a> CodeGenerator<'a> {
if tipo.is_primitive() { if tipo.is_primitive() {
AirTree::let_assignment(name, assignment.hoist_over(val)) AirTree::let_assignment(name, assignment.hoist_over(val))
} else { } else {
let expect = let expect = self.expect_type_assign(
self.expect_type(tipo, val.clone(), &mut index_map, pattern.location()); tipo,
val.clone(),
&mut index_map,
pattern.location(),
);
let assign = AirTree::let_assignment("_", assignment.hoist_over(expect)); let assign = AirTree::let_assignment("_", assignment.hoist_over(expect));
AirTree::let_assignment(name, assign.hoist_over(val)) AirTree::let_assignment(name, assign.hoist_over(val))
} }
@ -912,7 +920,7 @@ impl<'a> CodeGenerator<'a> {
} }
} }
pub fn expect_type( pub fn expect_type_assign(
&mut self, &mut self,
tipo: &Arc<Type>, tipo: &Arc<Type>,
value: AirTree, value: AirTree,
@ -942,14 +950,14 @@ impl<'a> CodeGenerator<'a> {
AirTree::local_var(&pair_name, inner_list_type.clone()), AirTree::local_var(&pair_name, inner_list_type.clone()),
); );
let expect_fst = self.expect_type( let expect_fst = self.expect_type_assign(
&inner_pair_types[0], &inner_pair_types[0],
AirTree::local_var(fst_name, inner_pair_types[0].clone()), AirTree::local_var(fst_name, inner_pair_types[0].clone()),
defined_data_types, defined_data_types,
location, location,
); );
let expect_snd = self.expect_type( let expect_snd = self.expect_type_assign(
&inner_pair_types[1], &inner_pair_types[1],
AirTree::local_var(snd_name, inner_pair_types[1].clone()), AirTree::local_var(snd_name, inner_pair_types[1].clone()),
defined_data_types, defined_data_types,
@ -997,7 +1005,7 @@ impl<'a> CodeGenerator<'a> {
let assign = AirTree::let_assignment(&list_name, value); let assign = AirTree::let_assignment(&list_name, value);
let expect_item = self.expect_type( let expect_item = self.expect_type_assign(
inner_list_type, inner_list_type,
AirTree::local_var(&item_name, inner_list_type.clone()), AirTree::local_var(&item_name, inner_list_type.clone()),
defined_data_types, defined_data_types,
@ -1048,14 +1056,14 @@ impl<'a> CodeGenerator<'a> {
AirTree::local_var(pair_name, tipo.clone()), AirTree::local_var(pair_name, tipo.clone()),
); );
let expect_fst = self.expect_type( let expect_fst = self.expect_type_assign(
&tuple_inner_types[0], &tuple_inner_types[0],
AirTree::local_var(fst_name, tuple_inner_types[0].clone()), AirTree::local_var(fst_name, tuple_inner_types[0].clone()),
defined_data_types, defined_data_types,
location, location,
); );
let expect_snd = self.expect_type( let expect_snd = self.expect_type_assign(
&tuple_inner_types[1], &tuple_inner_types[1],
AirTree::local_var(snd_name, tuple_inner_types[1].clone()), AirTree::local_var(snd_name, tuple_inner_types[1].clone()),
defined_data_types, defined_data_types,