eyeprolog 1.3.22 → 1.3.23

package/package.json

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

package/src/iso.js

@@ -1371,6 +1371,7 @@ function writeBuiltin(mode) {
     solver.io.writeUnit(stream, formatTermForWrite(goal.args[goal.arity - 1], env, {
       ...options,
       generateVariableNames: true,
+      variableNameState: solver.writeVariableState,
       operators: solver.program.operators.values(),
     }));
     yield env;
@@ -1388,6 +1389,7 @@ function* writeTermBuiltin({ solver, goal, env }) {
   solver.io.writeUnit(stream, formatTermForWrite(goal.args[goal.arity - 2], env, {
     ...options,
     generateVariableNames: true,
+    variableNameState: solver.writeVariableState,
     operators: solver.program.operators.values(),
   }));
   yield env;

package/src/solver.js

@@ -116,6 +116,11 @@ export class Solver {
       }
     }
     this.io = options.io ?? new StreamManager(options.ioOptions);
+    // Keep generated write-variable names stable for the lifetime of one
+    // top-level query. Inner/meta-call solvers share this state so separate
+    // write/1, writeq/1, write_canonical/1, and write_term/2-3 calls can refer
+    // to the same logical variable by the same printed name.
+    this.writeVariableState = options.writeVariableState ?? { depth: 0, names: new Map(), next: 0 };
     this.solveStacks = [];
     this.active = [];
     this.cutEpoch = 0;
@@ -163,6 +168,7 @@ export class Solver {
       io: this.io,
       innerTableScopes: this.innerTableScopes,
       inferenceObservation: this.inferenceObservation,
+      writeVariableState: this.writeVariableState,
       skipListTailTabling: options.skipListTailTabling ?? this.skipListTailTabling,
     });
     if (options.tableScope != null) {
@@ -279,6 +285,13 @@ export class Solver {
     if (!Array.isArray(goals)) goals = [goals];
     env.setOccursCheckHandler(this.occursCheckHandler);
 
+    const writeVariableState = this.writeVariableState;
+    if (writeVariableState.depth === 0) {
+      writeVariableState.names.clear();
+      writeVariableState.next = 0;
+    }
+    writeVariableState.depth++;
+
     const savedActive = this.active;
     let registeredStack = null;
     try {
@@ -651,6 +664,11 @@ export class Solver {
       const stackIndex = this.solveStacks.indexOf(registeredStack);
       if (stackIndex >= 0) this.solveStacks.splice(stackIndex, 1);
       this.active = savedActive;
+      writeVariableState.depth = Math.max(0, writeVariableState.depth - 1);
+      if (writeVariableState.depth === 0) {
+        writeVariableState.names.clear();
+        writeVariableState.next = 0;
+      }
     }
   }
 

package/src/write.js

@@ -180,13 +180,14 @@ function generatedVariableName(index) {
   return suffix === 0 ? `_${letter}` : `_${letter}${suffix}`;
 }
 
-function printableGeneratedVariableNames(term, env, explicit) {
+function printableGeneratedVariableNames(term, env, explicit, state = null) {
   const names = new Map(explicit);
-  const used = new Set(names.values());
+  const sharedNames = state?.names instanceof Map ? state.names : new Map();
+  const used = new Set([...sharedNames.values(), ...names.values()]);
   const seenVariables = new Set();
   const seenTerms = new Set();
   const stack = [term];
-  let generated = 0;
+  let generated = Number.isSafeInteger(state?.next) ? state.next : 0;
 
   while (stack.length) {
     const current = deref(stack.pop(), env);
@@ -194,8 +195,14 @@ function printableGeneratedVariableNames(term, env, explicit) {
       if (seenVariables.has(current.name)) continue;
       seenVariables.add(current.name);
       if (names.has(current.name)) continue;
+      const shared = sharedNames.get(current.name);
+      if (shared != null) {
+        names.set(current.name, shared);
+        continue;
+      }
       let candidate;
       do candidate = generatedVariableName(generated++); while (used.has(candidate));
+      sharedNames.set(current.name, candidate);
       names.set(current.name, candidate);
       used.add(candidate);
       continue;
@@ -205,6 +212,7 @@ function printableGeneratedVariableNames(term, env, explicit) {
     for (let i = current.arity - 1; i >= 0; i--) stack.push(current.args[i]);
   }
 
+  if (state != null) state.next = generated;
   return names;
 }
 
@@ -317,7 +325,7 @@ export function formatTermForWrite(term, env = new Env(), options = {}) {
     numbervars: options.numbervars !== false,
     doubleQuotes: options.doubleQuotes,
     variableNames: options.generateVariableNames === true
-      ? printableGeneratedVariableNames(term, env, explicitVariableNames)
+      ? printableGeneratedVariableNames(term, env, explicitVariableNames, options.variableNameState)
       : printableReadVariableNames(term, env, explicitVariableNames),
     compact: options.compact === true,
     operatorAtomsAsArgs: options.operatorAtomsAsArgs === true,

package/test/run-regression.mjs

@@ -2989,6 +2989,20 @@ child.stdin.write(\`consult(${consultedAtom}).\\n\`);
         assertEqual(fresh.stdout, '_A\nemit.\n', 'fresh clause variable hides its internal suffix');
       },
     },
+    {
+      name: 'write predicates keep generated variable names stable across calls (issue #53 comment 5356861151)',
+      run: () => {
+        const result = run([
+          "emit :- write_term(pair(A,B), []), write(' / '), write_term(user_output,B,[]), write(' / '), writeq(A), write(' / '), write_canonical(B), nl.",
+          "again :- write_canonical(B+B), nl.",
+        ].join('\n'), { goals: ['emit', 'again'] });
+        assertEqual(
+          result.stdout,
+          'pair(_A,_B) / _B / _A / _B\nemit.\n+(_A,_A)\nagain.\n',
+          'stable names across calls and reset at the next top-level query',
+        );
+      },
+    },
     {
       name: 'write predicates and write_term options select distinct formats',
       run: () => {