eyeprolog 1.5.57 → 1.5.59

package/package.json

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

package/src/errors.js

@@ -2,7 +2,7 @@
 // Keep these independent of the ISO builtin registry so syntax, DCG, program,
 // and solver layers can report Prolog errors without importing the whole ISO
 // implementation (and without creating semantic-layer import cycles).
-import { termToString } from './term.js';
+import { atom, compound, emptyList, numberTerm, termToString } from './term.js';
 
 export class PrologError extends Error {
   constructor(formal, culprit = null) {
@@ -21,3 +21,34 @@ export class HaltSignal extends Error {
     this.code = code;
   }
 }
+
+// ISO 7.12.2 leaves the second argument of error/2 implementation defined.
+// Reporting which built-in raised the error is far more useful than a constant,
+// so built-in call sites attach the predicate indicator when the raising code
+// did not supply a context of its own. The indicator term is built once per
+// registry entry and reused, so the error path allocates nothing extra.
+function builtinErrorContext(def, goal) {
+  let context = def._errorContextTerm;
+  if (context === undefined) {
+    // A one-element list, not a bare indicator: error contexts are lists so
+    // that library(error)'s call_with_error_context/2 can prepend its own
+    // elements and still yield a proper list (issue #98).
+    context = compound('.', [
+      compound('/', [atom(goal.name), numberTerm(goal.arity)]),
+      emptyList(),
+    ]);
+    def._errorContextTerm = context;
+  }
+  return context;
+}
+
+// Shared, pre-built error instances are thrown many times from different
+// built-ins, so tagging one with a context would leak the first thrower's
+// indicator into every later report. They keep the default context, which also
+// preserves the ground-error-term cache in formalErrorTerm.
+export function attachBuiltinErrorContext(error, def, goal) {
+  if (!(error instanceof PrologError)) return error;
+  if (error.contextTerm != null || error._sharedInstance === true) return error;
+  error.contextTerm = builtinErrorContext(def, goal);
+  return error;
+}

package/src/iso.js

@@ -22,7 +22,7 @@ import {
 let isoFresh = 0;
 
 export { PrologError, HaltSignal } from './errors.js';
-import { PrologError, HaltSignal } from './errors.js';
+import { HaltSignal, PrologError, attachBuiltinErrorContext } from './errors.js';
 
 class ThrownTerm extends Error {
   constructor(term) {
@@ -2452,6 +2452,7 @@ function numberListText(list, env, kind, valueIsBound, solver = null) {
 }
 
 const numberSyntaxError = new PrologError('syntax_error(number)');
+numberSyntaxError._sharedInstance = true;
 
 function numberListBuiltin(kind) {
   return function* ({ solver, goal, env }) {
@@ -3090,7 +3091,11 @@ function* phraseSolutions({ solver, goal, env }, state) {
     solver.trimInnerTableScope('phrase');
   }
 }
-const defaultErrorContext = atom('eyeprolog');
+// ISO 7.12.2 leaves this implementation defined. EyeProlog uses a list of
+// context elements so that contexts compose: the raising built-in contributes
+// its predicate indicator and each enclosing call_with_error_context/2
+// prepends its own element, always yielding a proper list (issue #98).
+const defaultErrorContext = emptyList();
 
 function parseFormalErrorTerm(text) {
   const open = text.indexOf('(');
@@ -3161,8 +3166,17 @@ function* catchSolutions({ solver, goal, env }, state) {
       // isolated in a child solver. Running it directly avoids constructing a
       // complete Solver for hot caught failures such as number_chars/2 syntax
       // probes, while the cloned environment keeps catch/3's rollback boundary.
-      const iterator = direct.handler({ solver, goal: invoked, env: env.clone() });
-      const result = iterator.next();
+      let iterator;
+      let result;
+      try {
+        iterator = direct.handler({ solver, goal: invoked, env: env.clone() });
+        result = iterator.next();
+      } catch (caught) {
+        // This fast path bypasses the solver's builtin frame, so it has to
+        // attach the raising predicate's indicator itself (see
+        // attachBuiltinErrorContext in solver.js).
+        throw attachBuiltinErrorContext(caught, direct, invoked);
+      }
       if (result.done) solver.stats.deterministic_builtin_failures++;
       else {
         solver.stats.deterministic_builtin_successes++;

package/src/lib/error.pl

@@ -121,5 +121,12 @@ representation_error(Flag) :- throw(error(representation_error(Flag), [])).
 resource_error(Resource) :- throw(error(resource_error(Resource), [])).
 resource_error(Resource, Context) :- throw(error(resource_error(Resource), Context)).
 
+%  Context elements are assembled only when an error actually propagates, so
+%  the success path costs nothing. The added element is copied so that
+%  variables in it are not shared with the goal's bindings, which would
+%  otherwise be undone as the error unwinds.
 call_with_error_context(Goal, Pair) :-
-    catch(Goal, error(Error, Context), throw(error(Error, [Pair|Context]))).
+    catch(Goal,
+          error(Error, Context),
+          ( copy_term(Pair, Element),
+            throw(error(Error, [Element|Context])) )).

package/src/repl.js

@@ -867,6 +867,10 @@ function formatError(engine, state, error) {
     collectUnboundVariables(engine, term, env, variableNames, () => `_${letterName(generated++)}`);
     return `${engine.formatTermForWrite(term, env, {
       quoted: true,
+      // Match the spacing successful answers use: operator layout only where
+      // ISO 6.3.4/6.4 needs it to keep the text readable back as the same
+      // term, so contexts print as [outer-1, atom_length/2].
+      minimalOperatorSpacing: true,
       operators: [...state.program.operators.values()],
       variableNames,
       doubleBar: !state.strictIso,

package/src/solver.js

@@ -6,6 +6,7 @@ import {
   numberTerm, numberTextFromDouble, properListItems, termIsGround, termToString, unify, variable, variantTerms,
 } from './term.js';
 import { numberValueKey, sameNumberValue } from './number-value.js';
+import { attachBuiltinErrorContext } from './errors.js';
 import { PrologError, getStrictIsoRegistry } from './iso.js';
 import { getEyePrologRegistry } from './standard-library.js';
 import { selectClauseCandidates, selectClauseCandidatesForValues, selectGroundClauseCandidates } from './program-indexing.js';
@@ -757,8 +758,14 @@ export class Solver {
         if (builtinReady) {
           const deterministic = def.deterministic ||
             def.deterministicWhen?.({ solver: this, goal, env }) === true;
-          const iterator = def.handler({ solver: this, goal, env });
-          const firstResult = iterator.next();
+          let iterator;
+          let firstResult;
+          try {
+            iterator = def.handler({ solver: this, goal, env });
+            firstResult = iterator.next();
+          } catch (caught) {
+            throw attachBuiltinErrorContext(caught, def, goal);
+          }
           if (deterministic) {
             if (!firstResult.done) this.stats.deterministic_builtin_successes++;
             else this.stats.deterministic_builtin_failures++;

package/test/conformance/ISO-IMPLEMENTATION-DEFINED.md

@@ -67,7 +67,7 @@ Status values are:
 | 7.11.2.2 | Effect when `debug=on` | The flag is accepted and stored; it does not change goal semantics or enable a debugger. | **defined** — `src/solver.js`; no semantic branch depends on `debug`. |
 | 7.11.2.3 | Default `max_arity` | `unbounded`: EyeProlog imposes no fixed semantic ceiling on compound-term arity. Practical host allocation exhaustion is a resource condition. This flag is distinct from any potential implementation-specific procedure-arity limit; EyeProlog currently declares no separate finite procedure limit. | **defined** — `src/iso-limits.js`, `src/solver.js`, `src/parser.js`, `src/iso.js`; strict regression coverage. |
 | 7.11.2.5 | Default `double_quotes` | `chars`. | **defined** — `src/solver.js`, parser flag state. |
-| 7.12.1 | Second argument of `error/2` | The default context term is the atom `eyeprolog`. A few implementation-specific diagnostics may deliberately supply a more specific context term. | **defined** — `formalErrorTerm()` in `src/iso.js`. |
+| 7.12.1 | Second argument of `error/2` | A list of context elements, innermost last. A built-in contributes its own predicate indicator, so `atom_length(1.0, _)` raises `error(type_error(atom, 1.0), [atom_length/2])`. Errors raised outside a built-in frame, and errors thrown from shared pre-built instances reused by several built-ins, use `[]`. Each enclosing `call_with_error_context/2` prepends a copy of its own element, so contexts compose into proper lists. | **defined** — `attachBuiltinErrorContext()` in `src/errors.js`, `formalErrorTerm()` in `src/iso.js`, `call_with_error_context/2` in `src/lib/error.pl`. |
 | 7.12.2(f) | Implementation-defined representation limits | Character and character-code operations are limited to Unicode scalar values; surrogates and values above U+10FFFF are representation errors. Arity/integer values are modeled as unbounded but may hit host/resource limits. Float input overflow uses the implementation-specific `max_float`/`min_float` representation names documented by the STC-oriented tests. | **defined** — parser/ISO numeric and character guards. |
 | 8.17.1 | Implementation-defined flag value ranges | Strict mode exposes only Part 1 core flags and their standard value sets. Normal mode additionally exposes EyeProlog's `occurs_check` and `default_procedure_access` flags. With `bounded=false`, `max_integer` and `min_integer` have no current or selectable value and their `current_prolog_flag/2` queries fail. Valid alternative values of fixed standard flags are distinguished from invalid values so `set_prolog_flag/2` reports permission versus domain errors as prescribed. | **defined** — strict registry/flag filtering in `src/solver.js`; strict flag tests. |
 | 8.17.3 | Other effects of `halt/0` | Terminates EyeProlog execution and returns host/process status `0`; it produces no Prolog solution. | **defined** — `HaltSignal`, `haltBuiltin()`, CLI/runner handling. |

package/test/conformance/expected/iso/exceptions_and_flags.pl

@@ -1,3 +1,3 @@
-answer(7, red, caught(eyeprolog), first, caught(eyeprolog)).
-answer(7, red, caught(eyeprolog), second, caught(eyeprolog)).
+answer(7, red, caught([atom_length / 2]), first, caught([])).
+answer(7, red, caught([atom_length / 2]), second, caught([])).
 flags(off, on, [pair(bounded, false), pair(integer_rounding_function, toward_zero), pair(char_conversion, on), pair(debug, off), pair(max_arity, unbounded), pair(unknown, fail), pair(double_quotes, chars), pair(occurs_check, true), pair(default_procedure_access, private)]).

package/test/regression/cases-regression.mjs

@@ -1475,7 +1475,7 @@ c4 ?- call((!;1)).
         });
         assertEqual(result.status, 0, 'exit status');
         assertEqual(result.stdout,
-          '?-    error(type_error(callable, (write(3), 3)), eyeprolog).\n' +
+          '?-    error(type_error(callable, (write(3),3)), []).\n' +
           '?- ',
           'fully instantiated call/1 culprit');
         assertEqual(result.stderr, '', 'stderr');
@@ -1891,7 +1891,7 @@ c4 ?- call((!;1)).
         assertIncludes(repl.stdout, 'T = ./*. .', 'REPL dotted graphic atom answer');
         assertNotIncludes(repl.stdout, "T = './*.'", 'REPL dotted graphic atom has no spurious quotes');
         assertIncludes(repl.stdout, 'T = ok.', 'REPL following read answer');
-        assertIncludes(repl.stdout, 'error(syntax_error(read_term), eyeprolog)', 'REPL syntax error');
+        assertIncludes(repl.stdout, 'error(syntax_error(read_term), [read/1])', 'REPL syntax error');
         assertEqual(repl.stderr, '', 'REPL stderr');
 
         const continuedGraphic = runCli([], {
@@ -2719,8 +2719,8 @@ c4 ?- call((!;1)).
         });
         assertEqual(result.status, 0, 'exit status');
         assertEqual(result.stdout,
-          '?-    error(type_error(list, [1, [], _A | 2]), eyeprolog).\n' +
-          '?-    error(type_error(list, [1, [], _A | 2]), eyeprolog).\n' +
+          '?-    error(type_error(list, [1, [], _A | 2]), [number_chars/2]).\n' +
+          '?-    error(type_error(list, [1, [], _A | 2]), [number_chars/2]).\n' +
           '?- ',
           'stdout');
         assertEqual(result.stderr, '', 'stderr');
@@ -2734,8 +2734,8 @@ c4 ?- call((!;1)).
         });
         assertEqual(result.status, 0, 'exit status');
         assertEqual(result.stdout,
-          '?-    error(instantiation_error, eyeprolog).\n' +
-          '?-    Error = instantiation_error, Imp_def = eyeprolog.\n' +
+          '?-    error(instantiation_error, [(is)/2]).\n' +
+          '?-    Error = instantiation_error, Imp_def = [(is)/2].\n' +
           '?- ',
           'stdout');
         assertEqual(result.stderr, '', 'stderr');
@@ -3710,7 +3710,7 @@ child.stdin.write(\`consult(${consultedAtom}).\\n\`);
           '?-    V = fail.\n' +
           '?-    true.\n' +
           '?-    true.\n' +
-          '?-    error(existence_error(procedure, missing_after_consult / 0), eyeprolog).\n' +
+          '?-    error(existence_error(procedure, missing_after_consult/0), []).\n' +
           '?- ',
           'stdout');
         assertEqual(result.stderr, '', 'stderr');
@@ -4044,7 +4044,7 @@ child.stdin.write(\`consult(${consultedAtom}).\\n\`);
         const result = runCli([], { input: 'statistics(nonsense, Value).\nhalt.\n' });
         assertEqual(result.status, 0, 'exit status');
         assertIncludes(result.stdout,
-          'error(domain_error(statistics_key, nonsense), eyeprolog).',
+          'error(domain_error(statistics_key, nonsense), [statistics/2]).',
           'statistics key error');
         assertEqual(result.stderr, '', 'stderr');
       },
@@ -4463,6 +4463,42 @@ answer(Result) :- countdown(2048, Result), Result = 2048.
         assertNotIncludes(result.stderr, 'unknown directive', 'not a directive message');
       },
     },
+    {
+      // Issue #98: error contexts are lists of context elements, so a built-in
+      // error composes with library(error)'s call_with_error_context/2 into a
+      // proper list instead of the improper [Element|eyeprolog] it used to be.
+      name: 'error contexts compose into proper lists (issue #98)',
+      run: () => {
+        const input = ':- use_module(library(error)).\n%% goal: answer(X)\n' +
+          'answer(C) :- catch(call_with_error_context(atom_length(1.0,_), outer-1), error(_,C), true).\n';
+        const result = runCli(['-'], { input });
+        assertEqual(result.status, 0, `exit status; stderr=${result.stderr}`);
+        assertIncludes(result.stdout, 'answer([outer - 1, atom_length / 2])', 'composed context');
+      },
+    },
+    {
+      // Nesting prepends outermost-first and keeps the raising predicate last.
+      name: 'nested call_with_error_context/2 accumulates outermost first',
+      run: () => {
+        const input = ':- use_module(library(error)).\n%% goal: answer(X)\n' +
+          'answer(C) :- catch(call_with_error_context(call_with_error_context(atom_length(1.0,_), inner-1), outer-2), error(_,C), true).\n';
+        const result = runCli(['-'], { input });
+        assertEqual(result.status, 0, `exit status; stderr=${result.stderr}`);
+        assertIncludes(result.stdout, 'answer([outer - 2, inner - 1, atom_length / 2])', 'nesting order');
+      },
+    },
+    {
+      // UWN asked for copy_term/2 semantics on the added element so that
+      // variables in it are not shared with bindings undone during unwinding.
+      name: 'call_with_error_context/2 copies the context element',
+      run: () => {
+        const input = ':- use_module(library(error)).\n%% goal: answer(X)\n' +
+          'answer(ok) :- catch(call_with_error_context(atom_length(1.0,_), ctx(V)), error(_,[ctx(W)|_]), (V == W -> fail ; true)).\n';
+        const result = runCli(['-'], { input });
+        assertEqual(result.status, 0, `exit status; stderr=${result.stderr}`);
+        assertIncludes(result.stdout, 'answer(ok)', 'context element is a fresh copy');
+      },
+    },
     {
       name: 'double dash permits option-shaped file names',
       run: () => {
@@ -5082,7 +5118,7 @@ answer(Result) :- countdown(2048, Result), Result = 2048.
             goal: 'answer(T)',
             ioOptions: { input: invalidOctal },
           }).stdout,
-          'answer(error(syntax_error(read_term), eyeprolog)).\n',
+          'answer(error(syntax_error(read_term), [read / 1])).\n',
           'read/1 rejects non-octal numeric escape',
         );
       },

package/test/run-iso-strict.mjs

@@ -649,7 +649,7 @@ export function runIsoStrict(reporter = new TestReporter()) {
           'close(tmp_in)',
           'current_input(C)',
           'stream_property(C,alias(user_input))',
-          'catch(set_input(tmp_in),error(existence_error(stream,tmp_in),eyeprolog),true)',
+          'catch(set_input(tmp_in),error(existence_error(stream,tmp_in),[set_input/1]),true)',
         ].join(','),
       }).stats.completed_goal_lists, 1, 'stream-term, alias lifetime, target/current input, and close fallback');
 
@@ -856,14 +856,14 @@ export function runIsoStrict(reporter = new TestReporter()) {
 
   reporter.test('closes the ISO 7.12 processor error envelope and classification rows', () => {
     const caught = [
-      "catch(atom_length(X,N),error(instantiation_error,eyeprolog),true)",
-      "catch(atom_length(1,N),error(type_error(atom,1),eyeprolog),true)",
-      "catch(op(1300,xfx,foo),error(domain_error(operator_priority,1300),eyeprolog),true)",
-      "catch(call(no_such_predicate),error(existence_error(procedure,no_such_predicate/0),eyeprolog),true)",
-      "catch(abolish(atom/1),error(permission_error(modify,static_procedure,atom/1),eyeprolog),true)",
-      "catch(char_code(C,1114112),error(representation_error(character_code),eyeprolog),true)",
-      "catch(X is 1/0,error(evaluation_error(zero_divisor),eyeprolog),true)",
-      "catch(X is 1<<4294967296,error(resource_error(memory),eyeprolog),true)",
+      "catch(atom_length(X,N),error(instantiation_error,[atom_length/2]),true)",
+      "catch(atom_length(1,N),error(type_error(atom,1),[atom_length/2]),true)",
+      "catch(op(1300,xfx,foo),error(domain_error(operator_priority,1300),[op/3]),true)",
+      "catch(call(no_such_predicate),error(existence_error(procedure,no_such_predicate/0),[]),true)",
+      "catch(abolish(atom/1),error(permission_error(modify,static_procedure,atom/1),[abolish/1]),true)",
+      "catch(char_code(C,1114112),error(representation_error(character_code),[char_code/2]),true)",
+      "catch(X is 1/0,error(evaluation_error(zero_divisor),[(is)/2]),true)",
+      "catch(X is 1<<4294967296,error(resource_error(memory),[(is)/2]),true)",
     ];
     for (const goal of caught) {
       equal(run('', { isoStrict: true, goal }).stats.completed_goal_lists, 1, goal);
@@ -871,14 +871,14 @@ export function runIsoStrict(reporter = new TestReporter()) {
 
     equal(run('', {
       isoStrict: true,
-      goal: "catch(read_term(T,[]),error(syntax_error(read_term),eyeprolog),true)",
+      goal: "catch(read_term(T,[]),error(syntax_error(read_term),[read_term/2]),true)",
       ioOptions: { input: "'unterminated." },
     }).stats.completed_goal_lists, 1, 'syntax error uses error/2 envelope and implementation-defined context');
 
     const systemSolver = new Solver(Program.parse('', { isoStrict: true }), { isoStrict: true });
     systemSolver.io.flush = () => { throw new Error('simulated host I/O failure'); };
     equal([...systemSolver.solve([
-      parseGoalText('catch(flush_output(user_output),error(system_error,eyeprolog),true)', { isoStrict: true }),
+      parseGoalText('catch(flush_output(user_output),error(system_error,[flush_output/1]),true)', { isoStrict: true }),
     ], new Env(), 0)].length, 1, 'system error uses error/2 envelope and implementation-defined context');
 
     // ISO 7.12 deliberately leaves the choice implementation-dependent when