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

print attribute goals alongside variable bindings as a single, unified goals

Browse Source
This commit is contained in:
Mark Thom
2019-03-24 00:26:29 -06:00
parent 0351936a58
commit 11198fdb31
3 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/prolog/write.rs
View File

@@ -371,33 +371,46 @@ fn next_step(mut stdout: RawTerminal<std::io::Stdout>) -> ContinueResult
pub fn print(wam: &mut Machine, result: EvalSession) {
match result {
EvalSession::InitialQuerySuccess(alloc_locs, mut heap_locs) => {
EvalSession::InitialQuerySuccess(alloc_locs, mut heap_locs) => {
let orig_heap_locs = heap_locs.clone();
loop {
wam.remove_unbound_vars(&mut heap_locs);
wam.remove_unbound_vars(&orig_heap_locs, &mut heap_locs);
if wam.or_stack_is_empty() {
if heap_locs.is_empty() {
println!("true.");
let attr_goals = wam.attribute_goals(&orig_heap_locs);
if !attr_goals.is_empty() {
println!("{}.", attr_goals);
} else {
println!("true.");
}
return;
}
} else if heap_locs.is_empty() {
} else if heap_locs.is_empty() && orig_heap_locs.is_empty() {
print!("true");
stdout().flush().unwrap();
}
let mut raw_stdout = stdout().into_raw_mode().unwrap();
if !heap_locs.is_empty() {
let mut output = PrinterOutputter::new();
let mut output = PrinterOutputter::new();
let bindings = wam.heap_view(&heap_locs, output).result();
write!(raw_stdout, "{}", bindings).unwrap();
raw_stdout.flush().unwrap();
}
let attr_goals = wam.attribute_goals(&heap_locs);
let attr_goals = wam.attribute_goals(&orig_heap_locs);
if !attr_goals.is_empty() {
write!(raw_stdout, "\r\n{}\r\n", attr_goals).unwrap();
if !attr_goals.is_empty() {
if heap_locs.is_empty() {
write!(raw_stdout, "{}", attr_goals).unwrap();
} else {
write!(raw_stdout, ", {}", attr_goals).unwrap();
}
}
@@ -425,9 +438,9 @@ pub fn print(wam: &mut Machine, result: EvalSession) {
write!(raw_stdout, "{}\r\n", error_string(e)).unwrap();
raw_stdout.flush().unwrap();
return;
}
}
} else {
if heap_locs.is_empty() {
if heap_locs.is_empty() && attr_goals.is_empty() {
write!(raw_stdout, "true.\r\n").unwrap();
} else {
write!(raw_stdout, ".\r\n").unwrap();