From: Mark Thom Date: Wed, 10 May 2017 16:47:05 +0000 (-0600) Subject: remove dead code X-Git-Tag: v0.8.110~731 X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=9afa37a94baea4dfd7030d2d01d42339b59bc205;p=scryer-prolog.git remove dead code --- diff --git a/src/prolog/codegen.rs b/src/prolog/codegen.rs index 00d07d4b..635b829d 100644 --- a/src/prolog/codegen.rs +++ b/src/prolog/codegen.rs @@ -22,27 +22,17 @@ pub enum EvalSession<'a> { SubsequentQuerySuccess, } -impl<'a> EvalSession<'a> { - #[allow(dead_code)] - pub fn failed_query(&self) -> bool { - if let &EvalSession::QueryFailure = self { - true - } else { - false - } - } -} - -impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker> { +impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker> +{ pub fn new() -> Self { - CodeGenerator { marker: Allocator::new(), + CodeGenerator { marker: Allocator::new(), var_count: HashMap::new() } } pub fn take_vars(self) -> AllocVarDict<'a> { self.marker.take_bindings() } - + fn update_var_count(&mut self, iter: Iter) where Iter : Iterator> { @@ -258,11 +248,10 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker> { match toc { &TermOrCut::Term(Term::Clause(_, ref name, _)) - | &TermOrCut::Term(Term::Constant(_, Constant::Atom(ref name))) => { - if let &mut Line::Control(ref mut ctrl) = body.last_mut().unwrap() { - *ctrl = ControlInstruction::Execute(name.clone(), last_arity); - } - }, + | &TermOrCut::Term(Term::Constant(_, Constant::Atom(ref name))) => + if let &mut Line::Control(ref mut ctrl) = body.last_mut().unwrap() { + *ctrl = ControlInstruction::Execute(name.clone(), last_arity); + }, _ => dealloc_index = body.len() }; @@ -514,9 +503,9 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker> { _ => {} }; } - - Self::compile_cleanup(&mut code, query.len() - 1, query.last().unwrap()); - + + Self::compile_cleanup(&mut code, query.len() - 1, query.last().unwrap()); + code }