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

correct formatting bugs

Browse Source
This commit is contained in:
Mark Thom
2017-05-17 16:40:05 -06:00
parent 5efee09434
commit 0063329e3e
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/prolog/codegen.rs
View File

@@ -225,7 +225,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
(vs, has_deep_cut) (vs, has_deep_cut)
} }
fn add_conditional_call(compiled_query: &mut Code, term: &Term, pvs: usize) fn add_conditional_call(compiled_query: &mut Code, term: &Term, pvs: usize)
{ {
match term { match term {
@@ -317,7 +317,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
} }
fn compile_neck_cut_or(&mut self, fn compile_neck_cut_or(&mut self,
p1: &'a TermOrCut, p1: &'a TermOrCut,
body: &mut Code, body: &mut Code,
perm_vars: usize, perm_vars: usize,
is_exposed: bool, is_exposed: bool,
@@ -359,7 +359,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
body.insert(dealloc_index, Line::Control(ControlInstruction::Deallocate)); body.insert(dealloc_index, Line::Control(ControlInstruction::Deallocate));
} }
} }
pub fn compile_rule<'b: 'a>(&mut self, rule: &'b Rule) -> Code pub fn compile_rule<'b: 'a>(&mut self, rule: &'b Rule) -> Code
{ {
let iter = ChunkedIterator::from_rule(rule); let iter = ChunkedIterator::from_rule(rule);
@@ -483,10 +483,10 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
self.compile_neck_cut_or(p1, &mut code, perm_vars, true, query.len() == 1); self.compile_neck_cut_or(p1, &mut code, perm_vars, true, query.len() == 1);
self.compile_seq(&query[1 .. ], &vs, &mut code, true); self.compile_seq(&query[1 .. ], &vs, &mut code, true);
if perm_vars > 0 { if perm_vars > 0 {
let index = if let &Line::Control(_) = code.last().unwrap() { let index = if let &Line::Control(_) = code.last().unwrap() {
code.len() - 2 code.len() - 2
} else { } else {
code.len() - 1 code.len() - 1
}; };
@@ -495,7 +495,7 @@ impl<'a, TermMarker: Allocator<'a>> CodeGenerator<'a, TermMarker>
vs.mark_unsafe_vars_in_query(query); vs.mark_unsafe_vars_in_query(query);
} }
} }
Self::compile_cleanup(&mut code, query.len() - 1, query.last().unwrap()); Self::compile_cleanup(&mut code, query.len() - 1, query.last().unwrap());
code code

16
src/prolog/io.rs
View File

@@ -306,14 +306,16 @@ pub fn print(wam: &mut Machine, result: EvalSession) {
EvalSession::InitialQuerySuccess(alloc_locs, mut heap_locs) => { EvalSession::InitialQuerySuccess(alloc_locs, mut heap_locs) => {
print!("true"); print!("true");
if !wam.or_stack_is_empty() {
print!(" ");
}
println!(".");
if heap_locs.is_empty() { if heap_locs.is_empty() {
if !wam.or_stack_is_empty() {
print!(" ");
}
println!(".");
return; return;
} else {
println!("");
} }
loop { loop {
@@ -349,7 +351,7 @@ pub fn print(wam: &mut Machine, result: EvalSession) {
stdout.flush().unwrap(); stdout.flush().unwrap();
return; return;
} }
} else { } else {
break; break;
} }
} }