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

backtrack attributed variable bindings after failure (#242)

Browse Source
This commit is contained in:
Mark Thom
2019-11-29 13:47:22 -04:00
parent 2d719ab6b7
commit 3e49db1a29
7 changed files with 90 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/prolog/machine/machine_state.rs
View File

@@ -445,11 +445,13 @@ pub(crate) trait CallPolicy: Any {
machine_st.heap.truncate(machine_st.or_stack[b].h);
let attr_var_init_b = machine_st.or_stack[b].attr_var_init_b;
machine_st
.attr_var_init
.attr_var_queue
.truncate(attr_var_init_b);
let attr_var_init_queue_b = machine_st.or_stack[b].attr_var_init_queue_b;
let attr_var_init_bindings_b = machine_st.or_stack[b].attr_var_init_bindings_b;
machine_st.attr_var_init.backtrack(
attr_var_init_queue_b,
attr_var_init_bindings_b,
);
machine_st.hb = machine_st.heap.h;
machine_st.p += 1;
@@ -491,11 +493,13 @@ pub(crate) trait CallPolicy: Any {
machine_st.heap.truncate(machine_st.or_stack[b].h);
let attr_var_init_b = machine_st.or_stack[b].attr_var_init_b;
machine_st
.attr_var_init
.attr_var_queue
.truncate(attr_var_init_b);
let attr_var_init_queue_b = machine_st.or_stack[b].attr_var_init_queue_b;
let attr_var_init_bindings_b = machine_st.or_stack[b].attr_var_init_bindings_b;
machine_st.attr_var_init.backtrack(
attr_var_init_queue_b,
attr_var_init_bindings_b,
);
machine_st.hb = machine_st.heap.h;
machine_st.p += offset;
@@ -533,11 +537,13 @@ pub(crate) trait CallPolicy: Any {
machine_st.heap.truncate(machine_st.or_stack[b].h);
let attr_var_init_b = machine_st.or_stack[b].attr_var_init_b;
machine_st
.attr_var_init
.attr_var_queue
.truncate(attr_var_init_b);
let attr_var_init_queue_b = machine_st.or_stack[b].attr_var_init_queue_b;
let attr_var_init_bindings_b = machine_st.or_stack[b].attr_var_init_bindings_b;
machine_st.attr_var_init.backtrack(
attr_var_init_queue_b,
attr_var_init_bindings_b,
);
machine_st.b = machine_st.or_stack[b].b;
machine_st.or_stack.truncate(machine_st.b);
@@ -580,12 +586,14 @@ pub(crate) trait CallPolicy: Any {
machine_st.heap.truncate(machine_st.or_stack[b].h);
let attr_var_init_b = machine_st.or_stack[b].attr_var_init_b;
machine_st
.attr_var_init
.attr_var_queue
.truncate(attr_var_init_b);
let attr_var_init_queue_b = machine_st.or_stack[b].attr_var_init_queue_b;
let attr_var_init_bindings_b = machine_st.or_stack[b].attr_var_init_bindings_b;
machine_st.attr_var_init.backtrack(
attr_var_init_queue_b,
attr_var_init_bindings_b,
);
machine_st.b = machine_st.or_stack[b].b;
machine_st.or_stack.truncate(machine_st.b);