eyeprolog 1.1.25 → 1.1.27

package/package.json

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

package/src/quads.js

@@ -106,6 +106,11 @@ function checkAlternative(program, quad, alternative, options) {
     if (leaf.more && !leaf.hasExpectation) return { ok: true };
     const matches = matchLeaf(quad.query, leaf, actual, position);
     if (leaf.unexpected ? matches : !matches) return { ok: false };
+    // An unexpected error description is a negative assertion about that
+    // particular error pattern.  A different exception may be present and is
+    // checked by other descriptions; do not make the final 'no error' test
+    // turn a successful negative match back into a failure.
+    if (leaf.unexpected && leaf.error != null) return { ok: true };
     if (leaf.more) return { ok: true };
     if (!leaf.unexpected && (leaf.false || leaf.error != null)) {
       return { ok: position === leaves.length - 1 };
@@ -252,7 +257,7 @@ function matchLeaf(query, leaf, actual, position) {
   }
   if (leaf.error != null) {
     return position === actual.solutions.length && actual.error != null &&
-      errorMatches(leaf.error, actual.error.term) && outputMatches(leaf.output, actual.error.output);
+      errorMatches(query, leaf.error, actual.error.term) && outputMatches(leaf.output, actual.error.output);
   }
   const solution = actual.solutions[position];
   if (!solution || !outputMatches(leaf.output, solution.output)) return false;
@@ -297,12 +302,15 @@ function namedVariables(term) {
   return found;
 }
 
-function patternVariant(pattern, patternEnv, actual, actualEnv, pairs = new Map(), reverse = new Map()) {
+function patternVariant(
+  pattern, patternEnv, actual, actualEnv, pairs = new Map(), reverse = new Map(), fixedPatternNames = null,
+) {
   pattern = deref(pattern, patternEnv);
   actual = deref(actual, actualEnv);
   if (pattern.type === ATOM && pattern.name === '...') return true;
   if (pattern.type === VAR || actual.type === VAR) {
     if (pattern.type !== VAR || actual.type !== VAR) return false;
+    if (fixedPatternNames?.has(pattern.name)) return pattern.name === actual.name;
     const paired = pairs.get(pattern.name);
     const reversed = reverse.get(actual.name);
     if (paired != null || reversed != null) return paired === actual.name && reversed === pattern.name;
@@ -312,7 +320,9 @@ function patternVariant(pattern, patternEnv, actual, actualEnv, pairs = new Map(
   }
   if (pattern.type !== actual.type || pattern.name !== actual.name || pattern.arity !== actual.arity) return false;
   for (let index = 0; index < pattern.arity; index++) {
-    if (!patternVariant(pattern.args[index], patternEnv, actual.args[index], actualEnv, pairs, reverse)) return false;
+    if (!patternVariant(
+      pattern.args[index], patternEnv, actual.args[index], actualEnv, pairs, reverse, fixedPatternNames,
+    )) return false;
   }
   return true;
 }
@@ -334,16 +344,26 @@ function errorTerm(error) {
   return compound('error', [atom('system_error'), variable('$quad_context')]);
 }
 
-function errorMatches(expected, actual) {
+function errorMatches(query, expected, actual) {
+  // Variables named in the query keep their identity in answer descriptions.
+  // Seed both directions so a query variable can match only that same query
+  // variable, while variables introduced by the description (for example _X)
+  // remain fresh pattern variables.  This is especially important for throw/1:
+  // ISO requires the thrown ball to be a renamed copy, so throw(g(_X)) may
+  // describe throw(g(X)), but throw(g(X)) must not.
+  const queryNames = new Set(namedVariables(query).map((item) => item.name));
+  const matches = (pattern, term) => patternVariant(
+    pattern, new Env(), term, new Env(), new Map(), new Map(), queryNames);
+
   if (expected.type === COMPOUND && expected.name === 'throw' && expected.arity === 1 &&
       actual.type === COMPOUND && actual.name === '$quad_thrown' && actual.arity === 1) {
-    return patternVariant(expected.args[0], new Env(), actual.args[0], new Env());
+    return matches(expected.args[0], actual.args[0]);
   }
   if (actual.type !== COMPOUND || actual.name !== 'error' || actual.arity !== 2) return false;
   if (expected.type === COMPOUND && expected.name === 'error' && expected.arity === 2) {
-    return patternVariant(expected, new Env(), actual, new Env());
+    return matches(expected, actual);
   }
-  return patternVariant(expected, new Env(), actual.args[0], new Env());
+  return matches(expected, actual.args[0]);
 }
 
 function isErrorDescription(term) {

package/src/repl.js

@@ -370,6 +370,17 @@ function formatAnswer(engine, state, variables, env) {
   const bindings = [];
   const queryVariableNames = new Set(variables.map((variable) => variable.name));
   const names = new Map(variables.map((variable) => [variable.name, variable.name]));
+  const operators = [...state.program.operators.values()];
+  // Answer substitutions are displayed as `Variable = Value`.  Format Value
+  // in the right-operand context of the active infix `=/2` definition so an
+  // operator term such as `a = b` is parenthesized rather than producing the
+  // invalid `T = a = b`.  ISO does not standardize a top level, but the term
+  // syntax used by the display must still respect the current operator table.
+  const equality = operators.find((definition) =>
+    definition.name === '=' && ['xfx', 'xfy', 'yfx'].includes(definition.specifier));
+  const valueMaxPriority = equality == null
+    ? 699
+    : equality.specifier === 'xfy' ? equality.priority : equality.priority - 1;
   let generated = 0;
 
   for (const variable of variables) collectUnboundVariables(engine, variable, env, names, () => `_${letterName(generated++)}`);
@@ -379,8 +390,9 @@ function formatAnswer(engine, state, variables, env) {
         (value.name === variable.name || !queryVariableNames.has(value.name))) continue;
     bindings.push(`${variable.name} = ${engine.formatTermForWrite(value, env, {
       quoted: true,
-      operators: [...state.program.operators.values()],
+      operators,
       variableNames: names,
+      maxPriority: valueMaxPriority,
     })}`);
   }
   return bindings.length === 0 ? 'true' : bindings.join(', ');

package/src/write.js

@@ -208,5 +208,8 @@ export function formatTermForWrite(term, env = new Env(), options = {}) {
     compact: options.compact === true,
     operatorAtomsAsArgs: options.operatorAtomsAsArgs === true,
   };
-  return format(term, env, normalized, operatorTable(options.operators), 1200);
+  const maxPriority = Number.isInteger(options.maxPriority)
+    ? Math.max(0, Math.min(1200, options.maxPriority))
+    : 1200;
+  return format(term, env, normalized, operatorTable(options.operators), maxPriority);
 }

package/test/run-regression.mjs

@@ -243,6 +243,24 @@ why(
         assertEqual(result.stdout, 'quads: 12 run, 12 passed, 0 failed.\n', 'quad report');
       },
     },
+    {
+      name: 'runQuads distinguishes query variables from renamed throw variables',
+      run: () => {
+        const source = `?- throw(g(X)).\n` +
+          `   throw(g(_X)).\n` +
+          `   throw(g(X)), unexpected.\n`;
+        const result = publicApi.runQuads(Program.parseSources([{ text: source, filename: 'throw-copy-quad.pl' }]));
+        assertEqual(result.total, 1, 'quad total');
+        assertEqual(result.passed, 1, 'quad passed');
+        assertEqual(result.failed, 0, 'quad failed');
+        assertEqual(result.stdout, 'quads: 1 run, 1 passed, 0 failed.\n', 'quad report');
+
+        const forbiddenFresh = publicApi.runQuads(
+          `?- throw(g(X)).\n   throw(g(_X)), unexpected.\n`,
+        );
+        assertEqual(forbiddenFresh.failed, 1, 'fresh thrown variable is detected');
+      },
+    },
     {
       name: 'runQuads matches the corrected ISO phrase quad boundaries',
       run: () => {
@@ -567,6 +585,23 @@ c4 ?- call((!;1)).
         assertEqual(result.stderr, '', 'stderr');
       },
     },
+    {
+      name: 'REPL parenthesizes operator-valued answer substitutions',
+      run: () => {
+        const result = runCli([], {
+          input: 'T = (a=b).\nU = (a,b).\nV = (a;b).\nW = (a+b).\nhalt.\n',
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertEqual(result.stdout,
+          '?-    T = (a = b).\n' +
+          '?-    U = (a, b).\n' +
+          '?-    V = (a ; b).\n' +
+          '?-    W = a + b.\n' +
+          '?- ',
+          'stdout');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
     {
       name: 'REPL accepts multiline period-terminated queries',
       run: () => {

package/the-art-of-eyeprolog.md

@@ -6191,7 +6191,11 @@ When another answer exists in an interactive terminal, press `;`, Space, or
 enumeration, `a` enumerates all remaining answers, `f` enumerates the next
 five, and `h` displays the answer-control help. A
 period-terminated query with no solutions prints `false.`; a solution without
-visible variable bindings prints `true.`. Use `[file].` or `['file.pl'].` to
+visible variable bindings prints `true.`. Answer substitutions are rendered as
+valid Prolog syntax under the current operator table: when a bound value would
+not be a valid right operand of the displayed `=/2`, EyeProlog adds parentheses,
+for example `T = (a = b).` rather than the invalid `T = a = b.`. Use `[file].`
+or `['file.pl'].` to
 consult local source, and `halt.` or `halt(Status).` to leave the top level.
 Up and Down recall queries from the current session. Explicit `eyeprolog -h`
 displays command-line help.
@@ -6300,7 +6304,11 @@ accepted as a negative answer.
 Answer descriptions support ordered answers separated by `;`, acceptable
 alternatives separated by `|`, `true`, `false`, standard error descriptions,
 and the `unexpected` annotation for an answer that must not occur (`inattendue`
-is its synonym). `...` and `ad_infinitum` accept further answers. Multiple
+is its synonym). Variables named in the query keep their identity inside answer
+descriptions; variables introduced only by a description are fresh. For example,
+a query `throw(g(X))` is described by `throw(g(_X))`, while
+`throw(g(X)), unexpected` verifies that ISO `throw/1` did not retain the query
+variable in the renamed exception term. `...` and `ad_infinitum` accept further answers. Multiple
 indented descriptions after one query must all hold. `inputs/1` supplies and
 checks consumed characters; `outputs/1` checks emitted characters. `sto` marks
 an answer description that this finite-tree implementation skips. `loops` is