handle TCO when setting up verify_attributes interrupts

diff --git a/Cargo.toml b/Cargo.toml
index c9f70a8baf3848ec1cdc926847316078af444e0a..f3a72dd0fba69819c017b0e54db5d0ec3d4df9db 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scryer-prolog"
-version = "0.8.107"
+version = "0.8.108"
 authors = ["Mark Thom <[email protected]>"]
 build = "build.rs"
 repository = "https://github.com/mthom/scryer-prolog"

diff --git a/src/prolog/machine/attributed_variables.rs b/src/prolog/machine/attributed_variables.rs
index 118bb0823ffefc3a2e7b3903d29009eebb44795c..d3ad71d0b41fd8a3100b02c0886f811f5259574c 100644 (file)
--- a/src/prolog/machine/attributed_variables.rs
+++ b/src/prolog/machine/attributed_variables.rs
@@ -40,7 +40,12 @@ impl AttrVarInitializer {
 impl MachineState {
     pub(super) fn push_attr_var_binding(&mut self, h: usize, addr: Addr) {
         if self.attr_var_init.bindings.is_empty() {
-            self.attr_var_init.cp = self.p.local();
+            if self.last_call {
+                self.attr_var_init.cp = self.cp;
+            } else {
+                self.attr_var_init.cp = self.p.local();
+            }
+            
             self.p = CodePtr::VerifyAttrInterrupt(self.attr_var_init.verify_attrs_loc);
         }
 

diff --git a/src/prolog/machine/mod.rs b/src/prolog/machine/mod.rs
index 32cfd9c580e0f069d1d03ec061137713658618cf..bd19074197687901ee0a81bafe2f99480b929e8b 100644 (file)
--- a/src/prolog/machine/mod.rs
+++ b/src/prolog/machine/mod.rs
@@ -1046,7 +1046,7 @@ impl MachineState {
 
             match self.p {
                 CodePtr::VerifyAttrInterrupt(_) => {
-                    self.p = CodePtr::Local(self.attr_var_init.cp);// + 1);
+                    self.p = CodePtr::Local(self.attr_var_init.cp);
 
                     if !self.verify_attr_stepper(indices, policies, code_repo, prolog_stream) {
                         if self.fail {