eyeprolog 1.5.59 → 1.5.61

package/package.json

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

package/src/errors.js

@@ -33,8 +33,14 @@ function builtinErrorContext(def, goal) {
     // 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).
+    // A one-element list holding a predicate-F/A pair: contexts are lists so
+    // call_with_error_context/2 can prepend, and elements are pairs so the
+    // convention is uniform with library-supplied elements (issues #98, #99).
     context = compound('.', [
-      compound('/', [atom(goal.name), numberTerm(goal.arity)]),
+      compound('-', [
+        atom('predicate'),
+        compound('/', [atom(goal.name), numberTerm(goal.arity)]),
+      ]),
       emptyList(),
     ]);
     def._errorContextTerm = context;

package/src/iso.js

@@ -3219,6 +3219,11 @@ function* catchSolutions({ solver, goal, env }, state) {
     if (child != null) solver.absorbStatsFrom(child);
   }
 }
+// library(error) call_with_error_context/2, as a primitive rather than a
+// Prolog catch/3 wrapper (issue #98). Context elements are assembled only while
+// an error unwinds, so the success path pays for neither a clause resolution
+// nor a Prolog-level catch frame. The element is copied as it is added, so
+// variables in it cannot alias bindings that the unwinding undoes.
 function* throwBuiltin({ goal, env }) {
   const ball = deref(goal.args[0], env);
   if (ball.type === VAR) throw new PrologError('instantiation_error');

package/src/lib/error.pl

@@ -17,56 +17,62 @@
 
 :- meta_predicate(call_with_error_context(0, +)).
 
+%  The context is supplied once here rather than handed over manually at every
+%  raise site: the raise sites throw with [] and this wrapper prepends its
+%  element, so contexts stay proper lists and compose with any enclosing
+%  call_with_error_context/2 (issue #98).
 must_be(Type, Term) :-
-    ( var(Type) -> instantiation_error(must_be/2)
-    ; error__must_be(Type, Term)
-    ).
+    call_with_error_context(
+        ( var(Type) -> instantiation_error
+        ; error__must_be(Type, Term)
+        ),
+        predicate-must_be/2).
 
 error__must_be(integer, Term) :- !,
-    ( var(Term) -> instantiation_error(must_be/2)
+    ( var(Term) -> instantiation_error
     ; integer(Term) -> true
-    ; type_error(integer, Term, must_be/2)
+    ; type_error(integer, Term)
     ).
 error__must_be(atom, Term) :- !,
-    ( var(Term) -> instantiation_error(must_be/2)
+    ( var(Term) -> instantiation_error
     ; atom(Term) -> true
-    ; type_error(atom, Term, must_be/2)
+    ; type_error(atom, Term)
     ).
 error__must_be(number, Term) :- !,
-    ( var(Term) -> instantiation_error(must_be/2)
+    ( var(Term) -> instantiation_error
     ; number(Term) -> true
-    ; type_error(number, Term, must_be/2)
+    ; type_error(number, Term)
     ).
 error__must_be(var, Term) :- !,
     ( var(Term) -> true
-    ; throw(error(uninstantiation_error(Term), must_be/2))
+    ; throw(error(uninstantiation_error(Term), []))
     ).
 error__must_be(ground, Term) :- !,
-    ( ground(Term) -> true ; instantiation_error(must_be/2) ).
+    ( ground(Term) -> true ; instantiation_error ).
 error__must_be(acyclic, Term) :- !,
-    ( acyclic_term(Term) -> true ; type_error(acyclic_term, Term, must_be/2) ).
+    ( acyclic_term(Term) -> true ; type_error(acyclic_term, Term) ).
 error__must_be(list, Term) :- !,
     error__proper_list(Term).
 error__must_be(list(Type), Term) :- !,
     error__proper_list_of(Term, Type).
 error__must_be(pair, Term) :- !,
-    ( var(Term) -> instantiation_error(must_be/2)
+    ( var(Term) -> instantiation_error
     ; Term = _-_ -> true
-    ; type_error(pair, Term, must_be/2)
+    ; type_error(pair, Term)
     ).
 error__must_be(not_less_than_zero, Term) :- !,
     must_be(integer, Term),
-    ( Term >= 0 -> true ; domain_error(not_less_than_zero, Term, must_be/2) ).
+    ( Term >= 0 -> true ; domain_error(not_less_than_zero, Term) ).
 error__must_be(Type, Term) :-
-    ( var(Term) -> instantiation_error(must_be/2)
-    ; type_error(Type, Term, must_be/2)
+    ( var(Term) -> instantiation_error
+    ; type_error(Type, Term)
     ).
 
 error__proper_list([]) :- !.
 error__proper_list([_|Tail]) :- !, error__proper_list(Tail).
 error__proper_list(Term) :-
-    ( var(Term) -> instantiation_error(must_be/2)
-    ; type_error(list, Term, must_be/2)
+    ( var(Term) -> instantiation_error
+    ; type_error(list, Term)
     ).
 
 error__proper_list_of([], _) :- !.
@@ -74,8 +80,8 @@ error__proper_list_of([Head|Tail], Type) :- !,
     must_be(Type, Head),
     error__proper_list_of(Tail, Type).
 error__proper_list_of(Term, _) :-
-    ( var(Term) -> instantiation_error(must_be/2)
-    ; type_error(list, Term, must_be/2)
+    ( var(Term) -> instantiation_error
+    ; type_error(list, Term)
     ).
 
 can_be(Type, Term) :-
@@ -122,11 +128,22 @@ 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.
+%  the prepend costs nothing on success. The enclosing catch/3 frame is not
+%  free, though: see issue #98 for measurements and the primitive design that
+%  would remove it.
 call_with_error_context(Goal, Pair) :-
+    error__require_pair(Pair),
     catch(Goal,
           error(Error, Context),
           ( copy_term(Pair, Element),
             throw(error(Error, [Element|Context])) )).
+
+%  The element must be a pair (issue #99). This cannot go through must_be/2:
+%  must_be/2 declares its own context with call_with_error_context/2, so
+%  checking with must_be/2 here would recurse. The reported context matches
+%  what must_be(pair, _) would have produced.
+error__require_pair(Pair) :-
+    ( var(Pair) -> throw(error(instantiation_error, [predicate-must_be/2]))
+    ; Pair = _-_ -> true
+    ; throw(error(type_error(pair, Pair), [predicate-must_be/2]))
+    ).

package/src/lib/random.pl

@@ -10,7 +10,7 @@
 :- module(random, [maybe/0, maybe/1, maybe/2, random/1, random/3, random_integer/3, set_random/1]).
 
 :- use_module(library(iso_ext), [bb_get/2, bb_put/2]).
-:- use_module(library(error), [instantiation_error/1, type_error/3]).
+:- use_module(library(error), [call_with_error_context/2, instantiation_error/0, type_error/2]).
 
 maybe :-
     random_integer(0, 2, 0).
@@ -28,15 +28,10 @@ maybe(K, N) :-
 random(Value) :-
     eyeprolog__random_value(Value).
 
+%  Context declared once per predicate instead of at each raise site, so the
+%  raise sites throw with [] and contexts stay proper composable lists.
 random_integer(Lower, Upper, R) :-
-    ( var(Lower) -> instantiation_error(random_integer/3)
-    ; var(Upper) -> instantiation_error(random_integer/3)
-    ; integer(Lower) -> true
-    ; type_error(integer, Lower, random_integer/3)
-    ),
-    ( integer(Upper) -> true
-    ; type_error(integer, Upper, random_integer/3)
-    ),
+    call_with_error_context(random__check_integer_range(Lower, Upper), predicate-random_integer/3),
     Lower < Upper,
     random__current_seed(Seed0),
     random(Seed0, _, Seed),
@@ -44,15 +39,28 @@ random_integer(Lower, Upper, R) :-
     R is Lower + Seed mod (Upper - Lower).
 
 set_random(Seed) :-
-    ( var(Seed) -> instantiation_error(set_random/1)
+    call_with_error_context(random__set_seed(Seed), predicate-set_random/1).
+
+random__check_integer_range(Lower, Upper) :-
+    ( var(Lower) -> instantiation_error
+    ; var(Upper) -> instantiation_error
+    ; integer(Lower) -> true
+    ; type_error(integer, Lower)
+    ),
+    ( integer(Upper) -> true
+    ; type_error(integer, Upper)
+    ).
+
+random__set_seed(Seed) :-
+    ( var(Seed) -> instantiation_error
     ; Seed = seed(S) ->
-        ( var(S) -> instantiation_error(set_random/1)
+        ( var(S) -> instantiation_error
         ; integer(S) ->
             random__random_normalize_seed(S, Normalized),
             bb_put('$random_seed', Normalized)
-        ; type_error(integer, S, set_random/1)
+        ; type_error(integer, S)
         )
-    ; type_error(random_state, Seed, set_random/1)
+    ; type_error(random_state, Seed)
     ).
 
 random__current_seed(Seed) :- bb_get('$random_seed', Seed), !.

package/src/repl.js

@@ -861,8 +861,16 @@ function formatError(engine, state, error) {
     // 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.
+    // A thrown ball that is already an error/2 envelope is the same thing a
+    // built-in raises, so display it the same way. Wrapping only that case in
+    // throw/1 made one error print two different ways depending on whether the
+    // engine or Prolog code raised it. Other balls keep the wrapper, because
+    // throw(foo) has no error/2 envelope to show.
+    const thrownBall = error.name === 'ThrownTerm' ? engine.deref(error.term, env) : null;
+    const thrownIsErrorEnvelope = thrownBall != null
+      && thrownBall.type === 'compound' && thrownBall.name === 'error' && thrownBall.arity === 2;
     const term = error.name === 'ThrownTerm'
-      ? engine.compound('throw', [error.term])
+      ? (thrownIsErrorEnvelope ? thrownBall : engine.compound('throw', [error.term]))
       : formalErrorTerm(error);
     collectUnboundVariables(engine, term, env, variableNames, () => `_${letterName(generated++)}`);
     return `${engine.formatTermForWrite(term, env, {

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` | 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.1 | Second argument of `error/2` | A list of context elements, innermost last. Elements are pairs; a built-in contributes `predicate-F/A`, so `atom_length(1.0, _)` raises `error(type_error(atom, 1.0), [predicate-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([atom_length / 2]), first, caught([])).
-answer(7, red, caught([atom_length / 2]), second, caught([])).
+answer(7, red, caught([predicate - atom_length / 2]), first, caught([])).
+answer(7, red, caught([predicate - 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

@@ -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), [read/1])', 'REPL syntax error');
+        assertIncludes(repl.stdout, 'error(syntax_error(read_term), [predicate-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]), [number_chars/2]).\n' +
-          '?-    error(type_error(list, [1, [], _A | 2]), [number_chars/2]).\n' +
+          '?-    error(type_error(list, [1, [], _A | 2]), [predicate-number_chars/2]).\n' +
+          '?-    error(type_error(list, [1, [], _A | 2]), [predicate-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, [(is)/2]).\n' +
-          '?-    Error = instantiation_error, Imp_def = [(is)/2].\n' +
+          '?-    error(instantiation_error, [predicate-(is)/2]).\n' +
+          '?-    Error = instantiation_error, Imp_def = [predicate-(is)/2].\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), [statistics/2]).',
+          'error(domain_error(statistics_key, nonsense), [predicate-statistics/2]).',
           'statistics key error');
         assertEqual(result.stderr, '', 'stderr');
       },
@@ -4473,7 +4473,63 @@ answer(Result) :- countdown(2048, Result), Result = 2048.
           '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');
+        assertIncludes(result.stdout, 'answer([outer - 1, predicate - atom_length / 2])', 'composed context');
+      },
+    },
+    {
+      // Issue #98: library predicates declare their context once with
+      // call_with_error_context/2 rather than handing it over manually at each
+      // raise site. Manual handover produced a bare, non-list context, so it
+      // composed into an improper list.
+      name: 'library predicates yield composable contexts, not manual ones',
+      run: () => {
+        const input = ':- use_module(library(error)).\n:- use_module(library(random)).\n%% goal: answer(X)\n' +
+          'answer(C) :- catch(must_be(integer, a), error(_,C), true).\n';
+        const result = runCli(['-'], { input });
+        assertEqual(result.status, 0, `exit status; stderr=${result.stderr}`);
+        assertIncludes(result.stdout, 'answer([predicate - must_be / 2])', 'must_be context is a list');
+
+        const composed = ':- use_module(library(error)).\n%% goal: answer(X)\n' +
+          'answer(C) :- catch(call_with_error_context(must_be(integer, a), outer-1), error(_,C), true).\n';
+        const nested = runCli(['-'], { input: composed });
+        assertEqual(nested.status, 0, `nested exit status; stderr=${nested.stderr}`);
+        assertIncludes(nested.stdout, 'answer([outer - 1, predicate - must_be / 2])', 'composes as a proper list');
+      },
+    },
+    {
+      // An error/2 ball raised by Prolog throw/1 is the same thing a built-in
+      // raises, so the top level must display it the same way. Only balls
+      // without an error/2 envelope keep the throw/1 wrapper.
+      name: 'uncaught error/2 balls display without a throw/1 wrapper',
+      run: () => {
+        const repl = runCli([], {
+          input: 'must_be(integer, a).\nthrow(foo).\nhalt.\n',
+        });
+        assertIncludes(repl.stdout, 'error(type_error(integer, a), [predicate-must_be/2])', 'thrown ISO error');
+        assertNotIncludes(repl.stdout, 'throw(error(type_error', 'no throw/1 wrapper on error/2');
+        assertIncludes(repl.stdout, 'throw(foo)', 'non-error ball keeps the wrapper');
+      },
+    },
+    {
+      // Issue #99: the context element must be a pair, as in Scryer and
+      // Trealla, and predicate contexts use the predicate-F/A convention.
+      name: 'call_with_error_context/2 requires a pair as its context element',
+      run: () => {
+        const bad = ':- use_module(library(error)).\n%% goal: answer(X)\n' +
+          'answer(C) :- catch(call_with_error_context(true, x), error(E,_), C = E).\n';
+        const result = runCli(['-'], { input: bad });
+        assertEqual(result.status, 0, `exit status; stderr=${result.stderr}`);
+        assertIncludes(result.stdout, 'answer(type_error(pair, x))', 'non-pair element rejected');
+
+        const unbound = ':- use_module(library(error)).\n%% goal: answer(X)\n' +
+          'answer(C) :- catch(call_with_error_context(true, _), error(E,_), C = E).\n';
+        const varResult = runCli(['-'], { input: unbound });
+        assertIncludes(varResult.stdout, 'answer(instantiation_error)', 'unbound element rejected');
+
+        const good = ':- use_module(library(error)).\n%% goal: answer(X)\n' +
+          'answer(ok) :- call_with_error_context(true, a-b).\n';
+        const okResult = runCli(['-'], { input: good });
+        assertIncludes(okResult.stdout, 'answer(ok)', 'pair element accepted');
       },
     },
     {
@@ -4484,7 +4540,7 @@ answer(Result) :- countdown(2048, Result), Result = 2048.
           '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');
+        assertIncludes(result.stdout, 'answer([outer - 2, inner - 1, predicate - atom_length / 2])', 'nesting order');
       },
     },
     {
@@ -4493,7 +4549,7 @@ answer(Result) :- countdown(2048, Result), Result = 2048.
       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';
+          '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');
@@ -5118,7 +5174,7 @@ answer(Result) :- countdown(2048, Result), Result = 2048.
             goal: 'answer(T)',
             ioOptions: { input: invalidOctal },
           }).stdout,
-          'answer(error(syntax_error(read_term), [read / 1])).\n',
+          'answer(error(syntax_error(read_term), [predicate - 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),[set_input/1]),true)',
+          'catch(set_input(tmp_in),error(existence_error(stream,tmp_in),[predicate-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,[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(atom_length(X,N),error(instantiation_error,[predicate-atom_length/2]),true)",
+      "catch(atom_length(1,N),error(type_error(atom,1),[predicate-atom_length/2]),true)",
+      "catch(op(1300,xfx,foo),error(domain_error(operator_priority,1300),[predicate-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)",
+      "catch(abolish(atom/1),error(permission_error(modify,static_procedure,atom/1),[predicate-abolish/1]),true)",
+      "catch(char_code(C,1114112),error(representation_error(character_code),[predicate-char_code/2]),true)",
+      "catch(X is 1/0,error(evaluation_error(zero_divisor),[predicate-(is)/2]),true)",
+      "catch(X is 1<<4294967296,error(resource_error(memory),[predicate-(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),[read_term/2]),true)",
+      goal: "catch(read_term(T,[]),error(syntax_error(read_term),[predicate-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,[flush_output/1]),true)', { isoStrict: true }),
+      parseGoalText('catch(flush_output(user_output),error(system_error,[predicate-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