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

feat: Make traces produced by expect dependent on

Browse Source 
the value of the tracing flag.
This commit is contained in:
microproofs
2023-06-23 13:36:41 -04:00
committed by Kasey
parent dbfa08a5a7
commit db369da96e
11 changed files with 79 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates/aiken-lang/src/ast.rs
View File

@@ -1139,6 +1139,15 @@ impl From<bool> for Tracing {
}
}
impl From<Tracing> for bool {
fn from(value: Tracing) -> Self {
match value {
Tracing::NoTraces => false,
Tracing::KeepTraces => true,
}
}
}
#[derive(Copy, Clone, PartialEq, Eq)]
pub struct Span {
pub start: usize,

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

@@ -3,9 +3,7 @@ use std::{rc::Rc, sync::Arc};
use indexmap::{IndexMap, IndexSet};
use itertools::Itertools;
use uplc::{
ast::{
Constant as UplcConstant, DeBruijn, Name, NamedDeBruijn, Program, Term, Type as UplcType,
},
ast::{Constant as UplcConstant, Name, NamedDeBruijn, Program, Term, Type as UplcType},
builder::{CONSTR_FIELDS_EXPOSER, CONSTR_GET_FIELD, CONSTR_INDEX_EXPOSER, EXPECT_ON_LIST},
builtins::DefaultFunction,
machine::cost_model::ExBudget,
@@ -59,7 +57,7 @@ pub struct CodeGenerator<'a> {
needs_field_access: bool,
code_gen_functions: IndexMap<String, CodeGenFunction>,
zero_arg_functions: IndexMap<FunctionAccessKey, Vec<Air>>,
uplc_to_function: IndexMap<Program<DeBruijn>, FunctionAccessKey>,
tracing: bool,
}
impl<'a> CodeGenerator<'a> {
@@ -67,6 +65,7 @@ impl<'a> CodeGenerator<'a> {
functions: IndexMap<FunctionAccessKey, &'a TypedFunction>,
data_types: IndexMap<DataTypeKey, &'a TypedDataType>,
module_types: IndexMap<&'a String, &'a TypeInfo>,
tracing: bool,
) -> Self {
CodeGenerator {
defined_functions: IndexMap::new(),
@@ -77,7 +76,7 @@ impl<'a> CodeGenerator<'a> {
id_gen: IdGenerator::new().into(),
code_gen_functions: IndexMap::new(),
zero_arg_functions: IndexMap::new(),
uplc_to_function: IndexMap::new(),
tracing,
}
}
@@ -87,7 +86,6 @@ impl<'a> CodeGenerator<'a> {
self.id_gen = IdGenerator::new().into();
self.needs_field_access = false;
self.defined_functions = IndexMap::new();
self.uplc_to_function = IndexMap::new();
}
pub fn generate(
@@ -2624,9 +2622,11 @@ impl<'a> CodeGenerator<'a> {
);
}
trace_stack.trace(tipo.clone());
if self.tracing {
trace_stack.trace(tipo.clone());
trace_stack.string("Constr index did not match any type variant");
trace_stack.string("Constr index did not match any type variant");
}
trace_stack.error(tipo.clone());
@@ -4054,6 +4054,7 @@ impl<'a> CodeGenerator<'a> {
inner_types,
check_last_item,
true,
self.tracing,
)
.apply(value);
@@ -4406,13 +4407,16 @@ impl<'a> CodeGenerator<'a> {
let mut term = arg_stack.pop().unwrap();
let error_term =
Term::Error.trace(Term::string("Expected on incorrect constructor variant."));
let trace_term = if self.tracing {
Term::Error.trace(Term::string("Expected on incorrect constructor variant."))
} else {
Term::Error
};
term = Term::equals_integer()
.apply(Term::integer(constr_index.into()))
.apply(Term::var(CONSTR_INDEX_EXPOSER).apply(constr))
.delayed_if_else(term, error_term);
.delayed_if_else(term, trace_term);
arg_stack.push(term);
}
@@ -4420,13 +4424,16 @@ impl<'a> CodeGenerator<'a> {
let value = arg_stack.pop().unwrap();
let mut term = arg_stack.pop().unwrap();
let error_term =
Term::Error.trace(Term::string("Expected on incorrect boolean variant"));
let trace_term = if self.tracing {
Term::Error.trace(Term::string("Expected on incorrect boolean variant"))
} else {
Term::Error
};
if is_true {
term = value.delayed_if_else(term, error_term)
term = value.delayed_if_else(term, trace_term)
} else {
term = value.delayed_if_else(error_term, term)
term = value.delayed_if_else(trace_term, term)
}
arg_stack.push(term);
}
@@ -4747,6 +4754,7 @@ impl<'a> CodeGenerator<'a> {
inner_types,
check_last_item,
false,
self.tracing,
)
} else {
term
@@ -4762,12 +4770,15 @@ impl<'a> CodeGenerator<'a> {
let value = arg_stack.pop().unwrap();
let mut term = arg_stack.pop().unwrap();
let trace_term = if self.tracing {
Term::Error.trace(Term::string("Expected no fields for Constr"))
} else {
Term::Error
};
term = Term::var(CONSTR_FIELDS_EXPOSER)
.apply(value)
.delayed_choose_list(
term,
Term::Error.trace(Term::string("Expected no fields for Constr")),
);
.delayed_choose_list(term, trace_term);
arg_stack.push(term);
}
@@ -4775,10 +4786,13 @@ impl<'a> CodeGenerator<'a> {
let value = arg_stack.pop().unwrap();
let mut term = arg_stack.pop().unwrap();
term = value.delayed_choose_list(
term,
Term::Error.trace(Term::string("Expected no items for List")),
);
let trace_term = if self.tracing {
Term::Error.trace(Term::string("Expected no items for List"))
} else {
Term::Error
};
term = value.delayed_choose_list(term, trace_term);
arg_stack.push(term);
}
@@ -5026,6 +5040,7 @@ impl<'a> CodeGenerator<'a> {
tipo.get_inner_types(),
check_last_item,
false,
self.tracing,
)
.apply(value);
}

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

@@ -508,7 +508,16 @@ pub fn list_access_to_uplc(
tipos: Vec<Arc<Type>>,
check_last_item: bool,
is_list_accessor: bool,
tracing: bool,
) -> Term<Name> {
let trace_term = if tracing {
Term::Error.trace(Term::string(
"List/Tuple/Constr contains more items than expected",
))
} else {
Term::Error
};
if let Some((first, names)) = names.split_first() {
let (current_tipo, tipos) = tipos.split_first().unwrap();
@@ -567,12 +576,7 @@ pub fn list_access_to_uplc(
"tail_index_{}_{}",
current_index, id_list[current_index]
)))
.delayed_choose_list(
term,
Term::Error.trace(Term::string(
"List/Tuple/Constr contains more items than expected",
)),
)
.delayed_choose_list(term, trace_term)
} else {
term
}
@@ -588,12 +592,7 @@ pub fn list_access_to_uplc(
"tail_index_{}_{}",
current_index, id_list[current_index]
)))
.delayed_choose_list(
term,
Term::Error.trace(Term::string(
"List/Tuple/Constr contains more items than expected",
)),
)
.delayed_choose_list(term, trace_term)
} else {
term
}
@@ -614,6 +613,7 @@ pub fn list_access_to_uplc(
tipos.to_owned(),
check_last_item,
is_list_accessor,
tracing,
);
list_access_inner = match &list_access_inner {
@@ -652,6 +652,7 @@ pub fn list_access_to_uplc(
tipos.to_owned(),
check_last_item,
is_list_accessor,
tracing,
);
list_access_inner = match &list_access_inner {