waalge
/
aiken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: finish up generic match cases

This commit is contained in:
Kasey White 2022-12-12 21:34:32 -05:00 committed by KtorZ
parent e43063d447
commit d78e2c9c6f
No known key found for this signature in database
GPG Key ID: 33173CB6F77F4277
3 changed files with 81 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/lang/src/tipo.rs
View File

@ -446,7 +446,7 @@ impl TypeVar {
} }
pub fn get_uplc_type(&self) -> Option<UplcType> { pub fn get_uplc_type(&self) -> Option<UplcType> {
match dbg!(self) { match self {
Self::Link { tipo } => Some(tipo.get_uplc_type()), Self::Link { tipo } => Some(tipo.get_uplc_type()),
_ => None, _ => None,
} }

92
crates/lang/src/uplc.rs
View File

@ -102,12 +102,8 @@ impl<'a> CodeGenerator<'a> {
self.build_ir(&body, &mut ir_stack, scope); self.build_ir(&body, &mut ir_stack, scope);
print!("{ir_stack:#?}");
self.define_ir(&mut ir_stack); self.define_ir(&mut ir_stack);
print!("{ir_stack:#?}");
let mut term = self.uplc_code_gen(&mut ir_stack); let mut term = self.uplc_code_gen(&mut ir_stack);
if self.needs_field_access { if self.needs_field_access {
@ -134,8 +130,6 @@ impl<'a> CodeGenerator<'a> {
term, term,
}; };
println!("{}", program.to_pretty());
let mut interner = Interner::new(); let mut interner = Interner::new();
interner.program(&mut program); interner.program(&mut program);
@ -1447,8 +1441,6 @@ impl<'a> CodeGenerator<'a> {
} }
fn gen_uplc(&mut self, ir: Air, arg_stack: &mut Vec<Term<Name>>) { fn gen_uplc(&mut self, ir: Air, arg_stack: &mut Vec<Term<Name>>) {
// println!("IR IS {ir:#?} AND ARG STACK IS {arg_stack:#?}");
match ir { match ir {
Air::Int { value, .. } => { Air::Int { value, .. } => {
let integer = value.parse().unwrap(); let integer = value.parse().unwrap();
@ -3809,11 +3801,85 @@ impl<'a> CodeGenerator<'a> {
}; };
} }
} }
Air::ListClause { .. } => todo!(), Air::ListClause {
Air::ClauseGuard { .. } => todo!(), scope,
Air::RecordAccess { .. } => todo!(), tipo,
Air::FieldsExpose { .. } => todo!(), tail_name,
Air::Tuple { .. } => todo!(), complex_clause,
next_tail_name,
} => {
if tipo.is_generic() {
let mut tipo = tipo.clone();
find_generics_to_replace(&mut tipo, &generic_types);
new_air[index] = Air::ListClause {
scope,
tipo,
tail_name,
complex_clause,
next_tail_name,
};
}
}
Air::ClauseGuard {
tipo,
scope,
subject_name,
} => {
if tipo.is_generic() {
let mut tipo = tipo.clone();
find_generics_to_replace(&mut tipo, &generic_types);
new_air[index] = Air::ClauseGuard {
scope,
subject_name,
tipo,
};
}
}
Air::RecordAccess {
scope,
index: record_index,
tipo,
} => {
if tipo.is_generic() {
let mut tipo = tipo.clone();
find_generics_to_replace(&mut tipo, &generic_types);
new_air[index] = Air::RecordAccess {
scope,
index: record_index,
tipo,
};
}
}
Air::FieldsExpose {
scope,
count,
indices,
} => {
let mut new_indices = vec![];
for (ind, name, tipo) in indices {
if tipo.is_generic() {
let mut tipo = tipo.clone();
find_generics_to_replace(&mut tipo, &generic_types);
}
new_indices.push((ind, name, tipo));
}
new_air[index] = Air::FieldsExpose {
scope,
count,
indices: new_indices,
};
}
Air::Tuple { scope, tipo, count } => {
if tipo.is_generic() {
let mut tipo = tipo.clone();
find_generics_to_replace(&mut tipo, &generic_types);
new_air[index] = Air::Tuple { scope, count, tipo };
}
}
Air::Todo { .. } => todo!(), Air::Todo { .. } => todo!(),
Air::RecordUpdate { .. } => todo!(), Air::RecordUpdate { .. } => todo!(),
Air::TupleAccessor { .. } => todo!(), Air::TupleAccessor { .. } => todo!(),

2
examples/tests/b/lib/main.ak
View File

@ -7,5 +7,5 @@ pub fn repeat(x: a, n: Int) -> List(a) {
} }
test repeat_1() { test repeat_1() {
repeat("aiken", 1) == ["aiken"] repeat("aiken", 2) == ["aiken", "aiken"]
} }