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

Handle stub_b = b as false

Browse Source
This commit is contained in:
Nicolas Luck
2023-10-03 20:12:11 +02:00
parent 4968fa0024
commit 7b128a9f00
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/machine/lib_machine.rs
View File

@@ -95,13 +95,11 @@ impl Machine {
loop { loop {
self.dispatch_loop(); self.dispatch_loop();
if self.machine_st.fail { //println!("b: {}", self.machine_st.b);
// NOTE: only print results on success //println!("stub_b: {}", stub_b);
self.machine_st.fail = false; //println!("fail: {}", self.machine_st.fail);
println!("false");
matches.push(QueryResolutionLine::False); if self.machine_st.ball.stub.len() != 0 {
break;
} else if self.machine_st.ball.stub.len() != 0 {
// NOTE: this means an exception was thrown, at which // NOTE: this means an exception was thrown, at which
// point we backtracked to the stub choice point. // point we backtracked to the stub choice point.
// this should halt the search for solutions as it // this should halt the search for solutions as it
@@ -130,6 +128,22 @@ impl Machine {
return Err(error_string); return Err(error_string);
} }
if self.machine_st.fail {
// NOTE: only print results on success
self.machine_st.fail = false;
println!("fail!");
matches.push(QueryResolutionLine::False);
break;
};
if self.machine_st.b == stub_b && term_write_result.var_dict.len() == 0 {
// NOTE: only print results on success
self.machine_st.fail = false;
println!("b == stub_b");
matches.push(QueryResolutionLine::False);
break;
};
let mut bindings: BTreeMap<String, Value> = BTreeMap::new(); let mut bindings: BTreeMap<String, Value> = BTreeMap::new();
for (var_key, term_to_be_printed) in &term_write_result.var_dict { for (var_key, term_to_be_printed) in &term_write_result.var_dict {