eyeprolog 1.3.16 → 1.3.18

package/package.json

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

package/src/iso.js

@@ -1370,6 +1370,7 @@ function writeBuiltin(mode) {
     const options = defaultTermWriteOptions(mode);
     solver.io.writeUnit(stream, formatTermForWrite(goal.args[goal.arity - 1], env, {
       ...options,
+      generateVariableNames: true,
       operators: solver.program.operators.values(),
     }));
     yield env;
@@ -1386,6 +1387,7 @@ function* writeTermBuiltin({ solver, goal, env }) {
   }
   solver.io.writeUnit(stream, formatTermForWrite(goal.args[goal.arity - 2], env, {
     ...options,
+    generateVariableNames: true,
     operators: solver.program.operators.values(),
   }));
   yield env;

package/src/repl.js

@@ -366,7 +366,6 @@ function terminalFullStop(source, solver = null) {
   let quote = null;
   let lineComment = false;
   let blockComment = false;
-  let depth = 0;
 
   for (let i = 0; i < source.length; i++) {
     const ch = source[i];
@@ -415,10 +414,12 @@ function terminalFullStop(source, solver = null) {
       quote = ch;
       continue;
     }
-    if ('([{'.includes(ch)) depth++;
-    else if (')]}'.includes(ch)) depth = Math.max(0, depth - 1);
-    else if (depth === 0 && isTerminatingFullStop(source, i, convert) &&
-             onlyLayoutAndComments(source.slice(i + 1))) return i;
+    // ISO 8.14.1.1 locates the end token lexically before read-term parsing.
+    // An unmatched opening bracket therefore must not make the top level wait
+    // for more input after a terminating full stop; parsing the collected text
+    // is what reports the syntax error (for example `[l.` or `{.`).
+    if (isTerminatingFullStop(source, i, convert) &&
+        onlyLayoutAndComments(source.slice(i + 1))) return i;
   }
   return -1;
 }

package/src/write.js

@@ -174,6 +174,40 @@ function printableReadVariableNames(term, env, explicit) {
   return names;
 }
 
+function generatedVariableName(index) {
+  const letter = String.fromCharCode(65 + (index % 26));
+  const suffix = Math.floor(index / 26);
+  return suffix === 0 ? `_${letter}` : `_${letter}${suffix}`;
+}
+
+function printableGeneratedVariableNames(term, env, explicit) {
+  const names = new Map(explicit);
+  const used = new Set(names.values());
+  const seenVariables = new Set();
+  const seenTerms = new Set();
+  const stack = [term];
+  let generated = 0;
+
+  while (stack.length) {
+    const current = deref(stack.pop(), env);
+    if (current.type === VAR) {
+      if (seenVariables.has(current.name)) continue;
+      seenVariables.add(current.name);
+      if (names.has(current.name)) continue;
+      let candidate;
+      do candidate = generatedVariableName(generated++); while (used.has(candidate));
+      names.set(current.name, candidate);
+      used.add(candidate);
+      continue;
+    }
+    if (current.type !== COMPOUND || seenTerms.has(current)) continue;
+    seenTerms.add(current);
+    for (let i = current.arity - 1; i >= 0; i--) stack.push(current.args[i]);
+  }
+
+  return names;
+}
+
 function format(term, env, options, table, maxPriority = 1200, context = 'term') {
   const resolved = deref(term, env);
   if (resolved.type === VAR) {
@@ -282,7 +316,9 @@ export function formatTermForWrite(term, env = new Env(), options = {}) {
     ignoreOps: options.ignoreOps === true,
     numbervars: options.numbervars !== false,
     doubleQuotes: options.doubleQuotes,
-    variableNames: printableReadVariableNames(term, env, explicitVariableNames),
+    variableNames: options.generateVariableNames === true
+      ? printableGeneratedVariableNames(term, env, explicitVariableNames)
+      : printableReadVariableNames(term, env, explicitVariableNames),
     compact: options.compact === true,
     operatorAtomsAsArgs: options.operatorAtomsAsArgs === true,
     dottedGraphicAtoms: options.dottedGraphicAtoms === true,

package/test/conformance/wg17-syntax-cases.json

@@ -4128,7 +4128,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "+(__anon0,__anon1)",
+            "output": "+(_A,_B)",
             "variables": "[]"
           }
         ]
@@ -4144,7 +4144,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "+(B,B)",
+            "output": "+(_A,_A)",
             "variables": "['B' = B]"
           }
         ]
@@ -5221,7 +5221,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "1 is __anon0",
+            "output": "1 is _A",
             "variables": "[]"
           }
         ]

package/test/run-regression.mjs

@@ -1410,6 +1410,27 @@ c4 ?- call((!;1)).
         assertEqual(result.stdout, 'ok', 'DCG hand-off benchmark result');
       },
     },
+    {
+      name: 'DCG state hand-off reaches the next non-terminal at 8192 cells (issue #49 comment 5347991607)',
+      run: () => {
+        const filename = path.join(tmp, `issue49-small-handoff-${tmpCounter++}.pl`);
+        fs.writeFileSync(filename,
+          ':- set_prolog_flag(occurs_check, true).\na --> ..., epsilon.\nepsilon --> [].\n');
+        const result = runCli([], {
+          input:
+            `[${sourceAtom(filename)}].\n` +
+            'use_module(library(lists)).\n' +
+            '\\+ \\+ (length(L,8192), phrase(a,L)).\n' +
+            'halt.\n',
+          timeout: 3000,
+        });
+        if (result.error) throw result.error;
+        assertEqual(result.status, 0, `small DCG hand-off status; stderr=${result.stderr}`);
+        assertNotIncludes(result.stdout, 'resource_error', 'small DCG hand-off resource error');
+        assertNotIncludes(result.stdout, 'depth_limit_exceeded', 'small DCG hand-off depth error');
+        assertEqual(result.stderr, '', 'small DCG hand-off stderr');
+      },
+    },
     {
       name: 'Trealla-style DCG hand-off reaches 65536 cells without the solver depth ceiling',
       run: () => {
@@ -1839,7 +1860,7 @@ c4 ?- call((!;1)).
           'check :- read(A), read(B), A \\== B, write_canonical(pair(A, B)), nl.\n',
           { goal: 'check', ioOptions: { input: 'V.\nV.\n' } },
         );
-        assertEqual(distinctReads.stdout, 'pair(V,V_1)\ncheck.\n', 'separate read variable sets');
+        assertEqual(distinctReads.stdout, 'pair(_A,_B)\ncheck.\n', 'separate read variable sets');
       },
     },
     {
@@ -1910,6 +1931,19 @@ c4 ?- call((!;1)).
         assertIncludes(result.stdout, '?- repeat, fail.', 'terminal query echo');
       },
     },
+    {
+      name: 'REPL stops at the end token before parsing unmatched brackets (issue #51)',
+      run: () => {
+        const result = runCli([], { input: '[l.\ntrue.\n{.\ntrue.\nhalt.\n' });
+        assertEqual(result.status, 0, 'exit status');
+        assertNotIncludes(result.stdout, '|    ', 'no continuation prompt after malformed end token');
+        assertEqual((result.stdout.match(/\?-    true\./g) ?? []).length, 2,
+          'following lines remain separate top-level queries');
+        assertEqual((result.stdout.match(/parse line 1:/g) ?? []).length, 2,
+          'both malformed bracketed queries report syntax errors');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
     {
       name: 'REPL accepts multiline period-terminated queries',
       run: () => {
@@ -2941,6 +2975,20 @@ child.stdin.write(\`consult(${consultedAtom}).\\n\`);
         }
       },
     },
+    {
+      name: 'writeq gives unnamed variables underscore-prefixed names (issue #53)',
+      run: () => {
+        const result = runCli([], {
+          input: "writeq(E).\nwriteq(pair(X,X,Y)).\nwrite_term(pair(X,Y), [variable_names(['Left'=X])]).\nhalt.\n",
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertIncludes(result.stdout, '  _A true.\n', 'single unnamed variable');
+        assertIncludes(result.stdout, '  pair(_A,_A,_B) true.\n', 'stable repeated variable names');
+        assertIncludes(result.stdout, '  pair(Left,_A) true.\n', 'explicit variable name plus generated fallback');
+        const fresh = run('emit :- writeq(E), nl.\n', { goal: 'emit' });
+        assertEqual(fresh.stdout, '_A\nemit.\n', 'fresh clause variable hides its internal suffix');
+      },
+    },
     {
       name: 'write predicates and write_term options select distinct formats',
       run: () => {

package/test/run-wg17.mjs

@@ -18,7 +18,7 @@ function runnerStage(index, maximum) {
   return `read_term(G${index}, [variable_names(V${index})]), ` +
     `(G${index} == end_of_file -> write('\\n<WG17-COMPLETE>') ; (` +
     `write('\\n<WG17-BEGIN-${index}>'), call(G${index}), ` +
-    `write('<WG17-VARS>'), writeq(V${index}), write('<WG17-END>'), ` +
+    `write('<WG17-VARS>'), write_term(V${index}, [quoted(true), variable_names(V${index})]), write('<WG17-END>'), ` +
     `${runnerStage(index + 1, maximum)}))`;
 }