eyeprolog 1.1.26 → 1.1.27

package/package.json

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

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

@@ -585,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.