eyeprolog 1.3.74 → 1.3.75

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.3.74",
+  "version": "1.3.75",
   "description": "EyeProlog turns facts and rules into answers and proofs.",
   "type": "module",
   "main": "./index.js",

package/src/iso.js

@@ -2556,19 +2556,32 @@ function residueVariablesSince(snapshot, env) {
   return names;
 }
 
-function* callResidueVarsBuiltin({ solver, goal, env }) {
+function callResidueVarsBuiltin({ solver, goal, env }) {
   const invoked = callable(goal.args[0], env);
   if (invoked.module == null) invoked.module = goal.module ?? 'user';
   const snapshot = residueSnapshot(env);
   const child = solver.cloneForInnerGoal();
-  try {
-    for (const answerEnv of child.solve([invoked], env, 0)) {
-      const next = answerEnv.clone();
-      if (unify(goal.args[1], listFromItems(residueVariablesSince(snapshot, answerEnv)), next)) yield next;
+  let pending = true;
+  // The wrapper iterator is resumable even for a deterministic Goal. Expose
+  // the child's actual search state so the top level does not print a phantom
+  // choicepoint after the final answer.
+  const iterator = (function* residueSolutions() {
+    try {
+      for (const answerEnv of child.solve([invoked], env, 0)) {
+        pending = child.hasPendingAlternatives();
+        const next = answerEnv.clone();
+        if (unify(goal.args[1], listFromItems(residueVariablesSince(snapshot, answerEnv)), next)) {
+          yield next;
+          if (!pending) return;
+        }
+      }
+      pending = false;
+    } finally {
+      solver.absorbStatsFrom(child);
     }
-  } finally {
-    solver.absorbStatsFrom(child);
-  }
+  })();
+  iterator.hasPendingAlternatives = () => pending;
+  return iterator;
 }
 
 function* freezeBuiltin({ solver, goal, env }) {

package/test/run-regression.mjs

@@ -178,6 +178,16 @@ check :- call_residue_vars(X in 1..3, Vs), Vs = [X].
 `;
         assertIncludes(run(clpzResidue, { goal: 'check' }).stdout, 'check.', 'call_residue_vars/2 includes CLP(Z) attributed variables');
 
+        const deterministicProgram = Program.parse(':- use_module(library(atts)).');
+        const deterministicSolver = new Solver(deterministicProgram);
+        const deterministicGoal = parseGoalText('call_residue_vars(true, Xs)');
+        const deterministicSolutions = deterministicSolver.solve([deterministicGoal], new Env(), 0);
+        const deterministicAnswer = deterministicSolutions.next();
+        assertEqual(deterministicAnswer.done, false, 'call_residue_vars/2 deterministic answer');
+        assertEqual(deterministicSolver.hasPendingAlternatives(), false,
+          'call_residue_vars/2 deterministic success has no leftover choicepoint');
+        deterministicSolutions.return();
+
         const residualFile = path.join(tmp, `atts-residual-${++tmpCounter}.pl`);
         fs.writeFileSync(residualFile, `:- use_module(library(atts)).
 :- attribute required/1.