rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Mark Thom
2017-05-10 10:21:02 -06:00
parent 6fa5bad5bf
commit 91b9aed33a
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/prolog/codegen.rs
View File

@@ -258,7 +258,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker> {
match toc {
&TermOrCut::Term(Term::Clause(_, ref name, _))
| &TermOrCut::Term(Term::Constant(_, Constant::Atom(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);
}

10
src/prolog/machine.rs
View File

@@ -310,7 +310,7 @@ impl Machine {
self.ms.p = self.ms.or_stack[b].bp;
if let CodePtr::TopLevel(_, 0) = self.ms.p {
return EvalSession::QueryFailure
return EvalSession::QueryFailure;
}
self.run_query(alloc_locs, heap_locs);
@@ -346,16 +346,10 @@ impl Machine {
result += "[]",
CellView::Con(&Constant::Atom(ref atom)) =>
result += atom.as_str(),
CellView::HeapVar(cell_num) => {
CellView::HeapVar(cell_num) | CellView::StackVar(_, cell_num) => {
result += "_";
result += cell_num.to_string().as_str();
},
CellView::StackVar(fr, sc) => {
result += "_";
result += fr.to_string().as_str();
result += "_";
result += sc.to_string().as_str();
},
CellView::Str(_, ref name) =>
result += name.as_str(),
CellView::TToken(TToken::Bar) => {