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

refactor how tracing is popped off to be in one location in uplc_gen

Browse Source
This commit is contained in:
microproofs
2024-01-03 12:23:42 -05:00
committed by Kasey
parent 355e38d6e2
commit c7a1ff0959
3 changed files with 46 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/aiken-lang/src/gen_uplc/builder.rs
View File

@@ -28,7 +28,10 @@ use crate::{
tipo::Type,
};
use super::tree::{AirExpression, AirStatement, AirTree, TreePath};
use super::{
air::Air,
tree::{AirExpression, AirStatement, AirTree, TreePath},
};
pub type Variant = String;
@@ -1883,3 +1886,16 @@ pub fn get_src_code_by_span(
.expect("Out of bounds span")
.to_string()
}
pub fn air_holds_msg(air: &Air) -> bool {
match air {
Air::AssertConstr { .. } | Air::AssertBool { .. } | Air::FieldsEmpty | Air::ListEmpty => {
true
}
Air::FieldsExpose { is_expect, .. }
| Air::ListAccessor { is_expect, .. }
| Air::TupleAccessor { is_expect, .. } => *is_expect,
_ => false,
}
}

22
crates/aiken-lang/src/gen_uplc/tree.rs
View File

@@ -959,8 +959,10 @@ impl AirTree {
air_vec.push(Air::AssertConstr {
constr_index: *constr_index,
});
constr.create_air_vec(air_vec);
// msg is first so we can pop it off first in uplc_gen
// if traces are on
msg.create_air_vec(air_vec);
constr.create_air_vec(air_vec);
}
AirStatement::AssertBool {
is_true,
@@ -968,8 +970,8 @@ impl AirTree {
msg,
} => {
air_vec.push(Air::AssertBool { is_true: *is_true });
value.create_air_vec(air_vec);
msg.create_air_vec(air_vec);
value.create_air_vec(air_vec);
}
AirStatement::ClauseGuard {
subject_name,
@@ -1016,10 +1018,12 @@ impl AirTree {
indices: indices.clone(),
is_expect: msg.is_some(),
});
record.create_air_vec(air_vec);
msg.iter().for_each(|msg| {
msg.create_air_vec(air_vec);
});
record.create_air_vec(air_vec);
}
AirStatement::ListAccessor {
tipo,
@@ -1034,10 +1038,12 @@ impl AirTree {
tail: *tail,
is_expect: msg.is_some(),
});
list.create_air_vec(air_vec);
msg.iter().for_each(|msg| {
msg.create_air_vec(air_vec);
});
list.create_air_vec(air_vec);
}
AirStatement::ListExpose {
tipo,
@@ -1061,23 +1067,25 @@ impl AirTree {
tipo: tipo.clone(),
is_expect: msg.is_some(),
});
tuple.create_air_vec(air_vec);
msg.iter().for_each(|msg| {
msg.create_air_vec(air_vec);
});
tuple.create_air_vec(air_vec);
}
AirStatement::NoOp => {
air_vec.push(Air::NoOp);
}
AirStatement::FieldsEmpty { constr, msg } => {
air_vec.push(Air::FieldsEmpty);
constr.create_air_vec(air_vec);
msg.create_air_vec(air_vec);
constr.create_air_vec(air_vec);
}
AirStatement::ListEmpty { list, msg } => {
air_vec.push(Air::ListEmpty);
list.create_air_vec(air_vec);
msg.create_air_vec(air_vec);
list.create_air_vec(air_vec);
}
};
exp.create_air_vec(air_vec);