From 6822be4bc96149145a6c04c525b8760d64d5593c Mon Sep 17 00:00:00 2001 From: Mark Thom Date: Tue, 28 Feb 2017 13:28:06 -0700 Subject: [PATCH] minor tweaks. --- src/l2/codegen.rs | 12 +----------- src/l2/machine.rs | 3 +-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/l2/codegen.rs b/src/l2/codegen.rs index 1b11bf4d..7948e40a 100644 --- a/src/l2/codegen.rs +++ b/src/l2/codegen.rs @@ -239,17 +239,7 @@ impl<'a> TermMarker<'a> { fn advance_at_header(&mut self, term: &'a Term) { self.arg_c = 1; - self.temp_c = max(term.subterms(), - self.bindings.values() - .filter_map(|vr| { - match vr { - &VarReg::Norm(RegType::Temp(reg)) | - &VarReg::ArgAndNorm(RegType::Temp(reg), _) => - Some(reg), - _ => None - } - }) - .max().unwrap_or(0)) + 1; + self.temp_c = max(term.subterms(), self.temp_c) + 1; } fn advance(&mut self, term: &'a Term) { diff --git a/src/l2/machine.rs b/src/l2/machine.rs index 869950d6..8fa6e662 100644 --- a/src/l2/machine.rs +++ b/src/l2/machine.rs @@ -172,8 +172,7 @@ impl Machine { } if succeeded { - let result = Some(self.heap_view(heap_locs)); - result + Some(self.heap_view(heap_locs)) } else { None } -- 2.54.0