Remove some prints and switch an uneeded isize to usize since it can't be negative
This commit is contained in:
parent
19b4b9df0f
commit
c1ed0dcbb5
|
@ -217,10 +217,8 @@ impl<'a> CodeGenerator<'a> {
|
||||||
|
|
||||||
fn finalize(&mut self, mut term: Term<Name>) -> Program<Name> {
|
fn finalize(&mut self, mut term: Term<Name>) -> Program<Name> {
|
||||||
term = self.special_functions.apply_used_functions(term);
|
term = self.special_functions.apply_used_functions(term);
|
||||||
println!("PROG BEFORE IS {}", term.to_pretty());
|
|
||||||
let program = aiken_optimize_and_intern(self.new_program(term));
|
|
||||||
|
|
||||||
println!("PROG IS {}", program.to_pretty());
|
let program = aiken_optimize_and_intern(self.new_program(term));
|
||||||
|
|
||||||
// This is very important to call here.
|
// This is very important to call here.
|
||||||
// If this isn't done, re-using the same instance
|
// If this isn't done, re-using the same instance
|
||||||
|
|
|
@ -64,7 +64,6 @@ fn assert_uplc(source_code: &str, expected: Term<Name>, should_fail: bool, verbo
|
||||||
version: (1, 1, 0),
|
version: (1, 1, 0),
|
||||||
term: expected,
|
term: expected,
|
||||||
};
|
};
|
||||||
println!("BEFORE OPT IS {}", expected.to_pretty());
|
|
||||||
|
|
||||||
let expected = optimize::aiken_optimize_and_intern(expected);
|
let expected = optimize::aiken_optimize_and_intern(expected);
|
||||||
|
|
||||||
|
|
|
@ -90,8 +90,8 @@ pub const NO_INLINE: &str = "__no_inline__";
|
||||||
#[derive(PartialEq, PartialOrd, Default, Debug, Clone)]
|
#[derive(PartialEq, PartialOrd, Default, Debug, Clone)]
|
||||||
pub struct VarLookup {
|
pub struct VarLookup {
|
||||||
found: bool,
|
found: bool,
|
||||||
occurrences: isize,
|
occurrences: usize,
|
||||||
delays: isize,
|
delays: usize,
|
||||||
no_inline: bool,
|
no_inline: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -123,7 +123,7 @@ impl VarLookup {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn delay_if_found(self, delay_amount: isize) -> Self {
|
pub fn delay_if_found(self, delay_amount: usize) -> Self {
|
||||||
if self.found {
|
if self.found {
|
||||||
Self {
|
Self {
|
||||||
found: self.found,
|
found: self.found,
|
||||||
|
@ -1113,7 +1113,7 @@ impl Term<Name> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Term::Delay(body) => {
|
Term::Delay(body) => {
|
||||||
let not_forced = isize::from(force_stack.pop().is_none());
|
let not_forced = usize::from(force_stack.pop().is_none());
|
||||||
|
|
||||||
body.var_occurrences(search_for, arg_stack, force_stack)
|
body.var_occurrences(search_for, arg_stack, force_stack)
|
||||||
.delay_if_found(not_forced)
|
.delay_if_found(not_forced)
|
||||||
|
@ -1130,7 +1130,7 @@ impl Term<Name> {
|
||||||
{
|
{
|
||||||
VarLookup::new()
|
VarLookup::new()
|
||||||
} else {
|
} else {
|
||||||
let not_applied: isize = isize::from(arg_stack.pop().is_none());
|
let not_applied = usize::from(arg_stack.pop().is_none());
|
||||||
body.var_occurrences(search_for, arg_stack, force_stack)
|
body.var_occurrences(search_for, arg_stack, force_stack)
|
||||||
.delay_if_found(not_applied)
|
.delay_if_found(not_applied)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue