eyeprolog 1.1.26 → 1.1.28

package/package.json

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

package/src/iso.js

@@ -1783,7 +1783,7 @@ function* phraseBuiltin({ solver, goal, env }) {
     solver.absorbStatsFrom(child);
   }
 }
-function formalErrorTerm(error) {
+export function formalErrorTerm(error) {
   const context = error.contextTerm ?? atom('eyeprolog');
   if (error.formalTerm != null) return compound('error', [error.formalTerm, context]);
   const parse = (text) => {

package/src/repl.js

@@ -2,6 +2,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import { createInterface } from 'node:readline';
+import { formalErrorTerm } from './iso.js';
 
 const ANSWER_HELP = `
 SPACE, "n" or ";": next solution, if any
@@ -370,6 +371,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 +391,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(', ');
@@ -413,46 +426,17 @@ function formatError(engine, state, error) {
     const env = new engine.Env();
     const variableNames = new Map();
     let generated = 0;
-    if (error.formalTerm != null) {
-      collectUnboundVariables(engine, error.formalTerm, env, variableNames, () => `_${letterName(generated++)}`);
-      if (error.contextTerm != null) {
-        collectUnboundVariables(engine, error.contextTerm, env, variableNames, () => `_${letterName(generated++)}`);
-      }
-      const formal = engine.formatTermForWrite(error.formalTerm, env, {
-        quoted: true,
-        operators: [...state.program.operators.values()],
-        variableNames,
-      });
-      if (error.contextTerm != null) {
-        const context = engine.formatTermForWrite(error.contextTerm, env, {
-          quoted: true,
-          operators: [...state.program.operators.values()],
-          variableNames,
-        });
-        return `error(${formal}, ${context}).`;
-      }
-      return `error(${formal}).`;
-    }
-    if (error.culprit != null) {
-      collectUnboundVariables(engine, error.culprit, env, variableNames, () => `_${letterName(generated++)}`);
-    }
-    if (error.contextTerm != null) {
-      collectUnboundVariables(engine, error.contextTerm, env, variableNames, () => `_${letterName(generated++)}`);
-    }
-    const culprit = error.culprit == null ? '' : `, ${engine.formatTermForWrite(error.culprit, env, {
+    // ISO 7.12.1 represents processor errors as error(ErrorTerm, ImpDef).
+    // Reuse the same conversion as catch/3 so uncaught errors at the top
+    // level cannot lose the implementation-defined context or misplace a
+    // culprit as the second argument of error/2.
+    const term = formalErrorTerm(error);
+    collectUnboundVariables(engine, term, env, variableNames, () => `_${letterName(generated++)}`);
+    return `${engine.formatTermForWrite(term, env, {
       quoted: true,
       operators: [...state.program.operators.values()],
       variableNames,
-    })}`;
-    if (error.contextTerm != null) {
-      const context = engine.formatTermForWrite(error.contextTerm, env, {
-        quoted: true,
-        operators: [...state.program.operators.values()],
-        variableNames,
-      });
-      return `error(${error.formal}${culprit}, ${context}).`;
-    }
-    return `error(${error.formal}${culprit}).`;
+    })}.`;
   }
   const message = error?.message ?? String(error);
   return message.endsWith('.') ? message : `${message}.`;

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

@@ -533,8 +533,23 @@ c4 ?- call((!;1)).
         });
         assertEqual(result.status, 0, 'exit status');
         assertEqual(result.stdout,
-          '?-    error(type_error(list), [1, [], _A | 2]).\n' +
-          '?-    error(type_error(list), [1, [], _A | 2]).\n' +
+          '?-    error(type_error(list, [1, [], _A | 2]), eyeprolog).\n' +
+          '?-    error(type_error(list, [1, [], _A | 2]), eyeprolog).\n' +
+          '?- ',
+          'stdout');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
+    {
+      name: 'REPL uncaught ISO errors retain the error/2 implementation context',
+      run: () => {
+        const result = runCli([], {
+          input: '_ is _.\ncatch(_ is _, error(Error, Imp_def), true).\nhalt.\n',
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertEqual(result.stdout,
+          '?-    error(instantiation_error, eyeprolog).\n' +
+          '?-    Error = instantiation_error, Imp_def = eyeprolog.\n' +
           '?- ',
           'stdout');
         assertEqual(result.stderr, '', 'stderr');
@@ -585,6 +600,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

@@ -5803,11 +5803,14 @@ instances whose message contains the corresponding Prolog error term.
 `error(Formal,eyeprolog)` term. `throw/1` copies its ball before unwinding: bound
 parts are preserved, repeated variables remain shared within the copied ball,
 and unbound variables are fresh with respect to the protected goal and catcher.
-Catchable error terms follow the same variable-freshening rule. At the interactive
-top level, variables that occur in an uncaught ISO error are rendered with fresh
-answer names such as `_A` rather than reusing query-variable spellings such as
-`X` or `Xx`; this keeps the displayed error consistent with the copied exception
-term. An unmatched ball or error continues outward.
+Catchable error terms follow the same variable-freshening rule. The interactive
+top level uses the same ISO error envelope for uncaught processor errors, so an
+ordinary runtime error is displayed as `error(Formal,eyeprolog)` rather than
+dropping the implementation-defined second argument. Variables that occur in an
+uncaught ISO error are rendered with fresh answer names such as `_A` rather than
+reusing query-variable spellings such as `X` or `Xx`; this keeps the displayed
+error consistent with the copied exception term. An unmatched ball or error
+continues outward.
 
 Streams belong to one solver run and are shared by nested calls, exceptions,
 and solution collectors. `user_input` and `user_output` are always present.
@@ -6191,7 +6194,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.