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

change redundant if branches

This commit is contained in:
microproofs 2024-01-23 12:36:56 -05:00 committed by Kasey
parent e523ae63f3
commit 51f1f2b67f
1 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
crates/aiken-lang/src/gen_uplc.rs
View File

@ -3770,6 +3770,14 @@ impl<'a> CodeGenerator<'a> {
} }
}; };
let convert_data_to_type = |term, tipo| {
if error_term == Term::Error {
builder::convert_data_to_type(term, tipo)
} else {
builder::convert_data_to_type_debug(term, tipo, error_term.clone())
}
};
match ir { match ir {
Air::Int { value } => Some(Term::integer(value.parse().unwrap())), Air::Int { value } => Some(Term::integer(value.parse().unwrap())),
Air::String { value } => Some(Term::string(value)), Air::String { value } => Some(Term::string(value)),
@ -4506,11 +4514,7 @@ impl<'a> CodeGenerator<'a> {
Air::CastFromData { tipo, .. } => { Air::CastFromData { tipo, .. } => {
let mut term = arg_stack.pop().unwrap(); let mut term = arg_stack.pop().unwrap();
term = if error_term == Term::Error { term = convert_data_to_type(term, &tipo);
builder::convert_data_to_type(term, &tipo)
} else {
builder::convert_data_to_type_debug(term, &tipo, error_term)
};
if extract_constant(&term).is_some() { if extract_constant(&term).is_some() {
let mut program: Program<Name> = Program { let mut program: Program<Name> = Program {
@ -5221,37 +5225,17 @@ impl<'a> CodeGenerator<'a> {
assert!(names.len() == 2); assert!(names.len() == 2);
if names[1] != "_" { if names[1] != "_" {
term = term term = term.lambda(names[1].clone()).apply(convert_data_to_type(
.lambda(names[1].clone())
.apply(if error_term == Term::Error {
builder::convert_data_to_type(
Term::snd_pair().apply(Term::var(format!("__tuple_{list_id}"))), Term::snd_pair().apply(Term::var(format!("__tuple_{list_id}"))),
&inner_types[1], &inner_types[1],
) ));
} else {
builder::convert_data_to_type_debug(
Term::snd_pair().apply(Term::var(format!("__tuple_{list_id}"))),
&inner_types[1],
error_term.clone(),
)
});
} }
if names[0] != "_" { if names[0] != "_" {
term = term term = term.lambda(names[0].clone()).apply(convert_data_to_type(
.lambda(names[0].clone())
.apply(if error_term == Term::Error {
builder::convert_data_to_type(
Term::fst_pair().apply(Term::var(format!("__tuple_{list_id}"))), Term::fst_pair().apply(Term::var(format!("__tuple_{list_id}"))),
&inner_types[0], &inner_types[0],
) ))
} else {
builder::convert_data_to_type_debug(
Term::fst_pair().apply(Term::var(format!("__tuple_{list_id}"))),
&inner_types[0],
error_term,
)
})
} }
term = term.lambda(format!("__tuple_{list_id}")).apply(value); term = term.lambda(format!("__tuple_{list_id}")).apply(value);