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

fix attribute_goals/2 display bugs, cycle detection bug

Browse Source
This commit is contained in:
Mark Thom
2019-02-14 01:12:52 -07:00
parent f616b4ddfd
commit cd5549ee5b
12 changed files with 176 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/prolog/write.rs
View File

@@ -360,18 +360,20 @@ pub fn print(wam: &mut Machine, result: EvalSession) {
write!(stdout, "{}", bindings).unwrap();
stdout.flush().unwrap();
wam.attribute_goals(&heap_locs);
if !wam.or_stack_is_empty() {
stdout.flush().unwrap();
for c in stdin.keys() {
match c.unwrap() {
Key::Char(' ') | Key::Char(';') => {
write!(stdout, " ;\n\r").unwrap();
write!(stdout, " ;\r\n").unwrap();
result = wam.continue_query(&alloc_locs, &mut heap_locs);
break;
},
Key::Char('.') => {
write!(stdout, " .\n\r").unwrap();
write!(stdout, " .\r\n").unwrap();
return;
},
_ => {}
@@ -380,14 +382,14 @@ pub fn print(wam: &mut Machine, result: EvalSession) {
if let &EvalSession::Error(SessionError::QueryFailure) = &result
{
write!(stdout, "false.\n\r").unwrap();
write!(stdout, "false.\r\n").unwrap();
stdout.flush().unwrap();
return;
}
if let &EvalSession::Error(SessionError::QueryFailureWithException(ref e)) = &result
{
write!(stdout, "{}\n\r", error_string(e)).unwrap();
write!(stdout, "{}\r\n", error_string(e)).unwrap();
stdout.flush().unwrap();
return;
}