eyeprolog 1.5.61 → 1.5.63

package/README.md

@@ -69,14 +69,15 @@ printf 'human(socrates).\nmortal(X) :- human(X).\n' |
 - [Example decks](examples/deck/README.md) — explainable RDF/Prolog scenarios with reproducible roundtrips
 - [Introduction to EyeProlog](https://eyereasoner.github.io/eyeprolog/examples/deck/introduction-to-eyeprolog) — short presentation deck for first-time audiences
 - [Symbiotic Knowledge Graphs](https://eyereasoner.github.io/eyeprolog/examples/deck/symbiotic-knowledge-graphs) — RDF ↔ Prolog heatwave-response demo for human/AI/KG co-evolution
-- [rdf-prolog-roundtrip](https://github.com/eyereasoner/rdf-prolog-roundtrip) — standalone RDF 1.2 ↔ ISO Prolog bridge used by the RDF examples
+- [rdf-prolog-interchange](https://github.com/eyereasoner/rdf-prolog-interchange) — standalone RDF 1.2 ↔ ISO Prolog bridge used by the RDF examples
+- [RDF and Prolog: Two Standards-Based Legs](https://github.com/eyereasoner/rdf-prolog-interchange/blob/main/why-rdf-prolog.md) — why W3C RDF and ISO Prolog form the foundation
 - [ISO conformance review](test/conformance/ISO-COMPLIANCE.md) — supported Part 1 profile
 - [Latest Neumerkel conformity](test/conformance/NEUMERKEL-LATEST.md) — tracked result from the current live upstream inventory
 - [Conformance report](conformance-report.md) — generated executable conformance status, local corpus summary, and known deviations
 - [OpenRuleBench](openrulebench/README.md) — portable benchmark profile
 ## RDF, Prolog, and symbiotic knowledge graphs
 
-EyeProlog can sit behind an RDF knowledge graph without inventing a private graph representation. [`rdf-prolog-roundtrip`](https://github.com/eyereasoner/rdf-prolog-roundtrip) converts RDF 1.2 datasets to ordinary `rdf(Subject, Predicate, Object, Graph)` facts, EyeProlog applies portable rules, and ground `rdf/4` results can be converted back to RDF.
+EyeProlog can sit behind an RDF knowledge graph without inventing a private graph representation. [`rdf-prolog-interchange`](https://github.com/eyereasoner/rdf-prolog-interchange) converts RDF 1.2 datasets to ordinary `rdf(Subject, Predicate, Object, Graph)` facts, EyeProlog applies portable rules, and ground `rdf/4` results can be converted back to RDF.
 
 The checked [Symbiotic Knowledge Graphs example](examples/symbiotic-knowledge-graph.pl) uses named graphs and RDF 1.2 triple terms to distinguish trusted knowledge, AI-proposed statements, and human review. Its [wide-audience companion](https://eyereasoner.github.io/eyeprolog/examples/deck/symbiotic-knowledge-graphs) explains why this is a useful present-day software model for human/AI/KG co-evolution: RDF supplies shared semantic memory, Prolog supplies explicit deliberation, AI supplies new hypotheses, and people remain participants in meaning and judgment.
 

package/examples/cross-organization-data-sharing.pl

@@ -1,4 +1,4 @@
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/data/README.md

@@ -4,7 +4,7 @@ This directory contains source and materialized data that support runnable examp
 
 ## Symbiotic Knowledge Graphs
 
-The heatwave-response example uses [`rdf-prolog-roundtrip`](https://github.com/eyereasoner/rdf-prolog-roundtrip) as its RDF boundary:
+The heatwave-response example uses [`rdf-prolog-interchange`](https://github.com/eyereasoner/rdf-prolog-interchange) as its RDF boundary:
 
 ```text
 symbiotic-knowledge-graph-input.nq

package/examples/data/symbiotic-knowledge-graph-rules.pl

@@ -1,6 +1,6 @@
 % Symbiotic knowledge graph rules for EyeProlog.
 %
-% The source rdf/4 facts above are generated by rdf-prolog-roundtrip from
+% The source rdf/4 facts above are generated by rdf-prolog-interchange from
 % symbiotic-knowledge-graph-input.nq.  RDF stays the interchange and storage
 % model; these rules provide the explicit reasoning and governance layer.
 
@@ -317,10 +317,10 @@ knowledge_exchange_fact(prolog_to_rdf, materialized_ground_rdf4).
 
 pipeline_step(N, Description) :- pipeline_step_fact(N, Description).
 pipeline_step_fact(1, 'RDF 1.2 N-Quads: named graphs keep source and governance boundaries explicit').
-pipeline_step_fact(2, 'rdf-prolog-roundtrip: RDF becomes ordinary rdf/4 Prolog facts without a solver').
+pipeline_step_fact(2, 'rdf-prolog-interchange: RDF becomes ordinary rdf/4 Prolog facts without a solver').
 pipeline_step_fact(3, 'EyeProlog: ISO Prolog rules validate candidates, apply review policy, and derive actions').
 pipeline_step_fact(4, 'EyeProlog: result_rdf/4 materializes accepted knowledge and decisions as ground RDF-shaped facts').
-pipeline_step_fact(5, 'rdf-prolog-roundtrip: ground rdf/4 facts become RDF again for publication or federation').
+pipeline_step_fact(5, 'rdf-prolog-interchange: ground rdf/4 facts become RDF again for publication or federation').
 
 cognitive_parallel(Prolog, Human) :- cognitive_parallel_fact(Prolog, Human).
 cognitive_parallel_fact(fact, remembered_assertion).

package/examples/deck/introduction-to-eyeprolog.md

@@ -166,7 +166,7 @@ Boolean constraints are compact when the domain is “on/off”, “selected/not
 
 ## RDF and knowledge graphs
 
-EyeProlog pairs naturally with RDF through `rdf-prolog-roundtrip`:
+EyeProlog pairs naturally with RDF through `rdf-prolog-interchange`:
 
 ```text
 RDF dataset

package/examples/deck/symbiotic-knowledge-graphs.md

@@ -10,7 +10,7 @@ The demonstration does not claim that EyeProlog is a brain-computer interface. I
 
 The architecture uses two small projects with deliberately separate jobs:
 
-- [`rdf-prolog-roundtrip`](https://github.com/eyereasoner/rdf-prolog-roundtrip) moves RDF 1.2 datasets to and from ordinary `rdf/4` Prolog facts. It contains no Prolog solver.
+- [`rdf-prolog-interchange`](https://github.com/eyereasoner/rdf-prolog-interchange) moves RDF 1.2 datasets to and from ordinary `rdf/4` Prolog facts. It contains no Prolog solver.
 - [EyeProlog](https://github.com/eyereasoner/eyeprolog) reasons over those facts with explicit ISO Prolog rules.
 
 That separation is the central design choice. **RDF remains the shared interchange and publication layer; Prolog becomes the transparent reasoning layer.**
@@ -105,7 +105,7 @@ p2 confidencePercent 93
 
 The embedded triple is a **statement being talked about**. It is not yet an asserted operational fact.
 
-After `rdf-prolog-roundtrip`, the same structure is an ordinary Prolog term:
+After `rdf-prolog-interchange`, the same structure is an ordinary Prolog term:
 
 ```prolog
 rdf(
@@ -246,10 +246,10 @@ That closeness makes it easier for a person to enter the machine's reasoning loo
 
 Without RDF, the Prolog example could be dismissed as a hand-written toy knowledge base.
 
-With `rdf-prolog-roundtrip`, the roles are clearer:
+With `rdf-prolog-interchange`, the roles are clearer:
 
 - RDF provides Web identifiers, graph boundaries, literals, RDF 1.2 triple terms, and interoperable publication;
-- `rdf-prolog-roundtrip` preserves those structures as ordinary ISO Prolog terms;
+- `rdf-prolog-interchange` preserves those structures as ordinary ISO Prolog terms;
 - EyeProlog applies explicit rules and explores alternatives;
 - materialized conclusions return to RDF.
 
@@ -279,7 +279,7 @@ A direct neural interface would change the input/output channel. It would not re
 
 ## Reproduce the roundtrip
 
-Assuming `rdf-prolog-roundtrip` and EyeProlog are available on `PATH`:
+Assuming `rdf-prolog-interchange` and EyeProlog are available on `PATH`:
 
 ```sh
 rdf-to-prolog \
@@ -327,5 +327,5 @@ The deepest reason Prolog fits this vision is not nostalgia or syntax. It is tha
 ## References
 
 - Ruben Taelman, [*Symbiotic Knowledge Graphs: A Vision for Semantic Brain-Computer Interfaces*](https://rubensworks.github.io/article-iswc2026-vision-symbiotic-knowledge-graphs/).
-- [`eyereasoner/rdf-prolog-roundtrip`](https://github.com/eyereasoner/rdf-prolog-roundtrip) — standalone RDF 1.2 ↔ ISO Prolog roundtripping toolkit.
+- [`eyereasoner/rdf-prolog-interchange`](https://github.com/eyereasoner/rdf-prolog-interchange) — standalone RDF 1.2 ↔ ISO Prolog roundtripping toolkit.
 - [`eyereasoner/eyeprolog`](https://github.com/eyereasoner/eyeprolog) — ISO Prolog reasoning and proof engine.

package/examples/dpv-odrl-purpose-mapping.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/explainable-ev-depot-configuration.pl

@@ -1,4 +1,4 @@
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/odrl-dpv-fpv-trust-flow.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/odrl-dpv-healthcare-risk-ranked.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/odrl-dpv-risk-ranked.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/odrl-policy-advanced.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/odrl-policy.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/operational-incident-response.pl

@@ -1,4 +1,4 @@
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/output/symbiotic-knowledge-graph.pl

@@ -29,10 +29,10 @@ knowledge_exchange(machine_to_human, recommendation(after_review, riverside, ope
 knowledge_exchange(rdf_to_prolog, ordinary_rdf4_facts).
 knowledge_exchange(prolog_to_rdf, materialized_ground_rdf4).
 pipeline_step(1, 'RDF 1.2 N-Quads: named graphs keep source and governance boundaries explicit').
-pipeline_step(2, 'rdf-prolog-roundtrip: RDF becomes ordinary rdf/4 Prolog facts without a solver').
+pipeline_step(2, 'rdf-prolog-interchange: RDF becomes ordinary rdf/4 Prolog facts without a solver').
 pipeline_step(3, 'EyeProlog: ISO Prolog rules validate candidates, apply review policy, and derive actions').
 pipeline_step(4, 'EyeProlog: result_rdf/4 materializes accepted knowledge and decisions as ground RDF-shaped facts').
-pipeline_step(5, 'rdf-prolog-roundtrip: ground rdf/4 facts become RDF again for publication or federation').
+pipeline_step(5, 'rdf-prolog-interchange: ground rdf/4 facts become RDF again for publication or federation').
 cognitive_parallel(fact, remembered_assertion).
 cognitive_parallel(rule, reusable_generalization).
 cognitive_parallel(query, explicit_question).

package/examples/rdf12-annotated-claims.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/rdf12-annotation.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/rdf12-directional-language.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/rdf12-nested-triple-term.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/rdf12-trig-graph-join.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/rdf12-trig-named-graph.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/rdf12-trig-triple-term.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/rdf12-triple-term.pl

@@ -1,7 +1,7 @@
-% Adapted from rdf-prolog-roundtrip.
+% Adapted from rdf-prolog-interchange.
 % This standalone program combines generated RDF input with its ISO Prolog rules.
 
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/sbom-vulnerability-response.pl

@@ -1,4 +1,4 @@
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/scientific-evidence-graph.pl

@@ -1,4 +1,4 @@
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 

package/examples/symbiotic-knowledge-graph.pl

@@ -1,4 +1,4 @@
-% Generated by rdf-prolog-roundtrip.
+% Generated by rdf-prolog-interchange.
 
 % RDF terms use rdf(Subject, Predicate, Object, Graph).
 
@@ -63,7 +63,7 @@ rdf(iri('https://example.org/city/review/r3'), iri('https://example.org/vocab/no
 % Rules
 % Symbiotic knowledge graph rules for EyeProlog.
 %
-% The source rdf/4 facts above are generated by rdf-prolog-roundtrip from
+% The source rdf/4 facts above are generated by rdf-prolog-interchange from
 % symbiotic-knowledge-graph-input.nq.  RDF stays the interchange and storage
 % model; these rules provide the explicit reasoning and governance layer.
 
@@ -380,10 +380,10 @@ knowledge_exchange_fact(prolog_to_rdf, materialized_ground_rdf4).
 
 pipeline_step(N, Description) :- pipeline_step_fact(N, Description).
 pipeline_step_fact(1, 'RDF 1.2 N-Quads: named graphs keep source and governance boundaries explicit').
-pipeline_step_fact(2, 'rdf-prolog-roundtrip: RDF becomes ordinary rdf/4 Prolog facts without a solver').
+pipeline_step_fact(2, 'rdf-prolog-interchange: RDF becomes ordinary rdf/4 Prolog facts without a solver').
 pipeline_step_fact(3, 'EyeProlog: ISO Prolog rules validate candidates, apply review policy, and derive actions').
 pipeline_step_fact(4, 'EyeProlog: result_rdf/4 materializes accepted knowledge and decisions as ground RDF-shaped facts').
-pipeline_step_fact(5, 'rdf-prolog-roundtrip: ground rdf/4 facts become RDF again for publication or federation').
+pipeline_step_fact(5, 'rdf-prolog-interchange: ground rdf/4 facts become RDF again for publication or federation').
 
 cognitive_parallel(Prolog, Human) :- cognitive_parallel_fact(Prolog, Human).
 cognitive_parallel_fact(fact, remembered_assertion).

package/package.json

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

package/src/lib/error.pl

@@ -21,34 +21,39 @@
 %  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).
+%  The context is named in exactly one place -- error__must_be_throw/1 -- so no
+%  raise site hands one over (issue #98). It is a throw helper rather than a
+%  call_with_error_context/2 wrapper because wrapping a Prolog goal in catch/3
+%  costs a child Solver on every call, and must_be/2 succeeds almost always.
 must_be(Type, Term) :-
-    call_with_error_context(
-        ( var(Type) -> instantiation_error
-        ; error__must_be(Type, Term)
-        ),
-        predicate-must_be/2).
+    ( var(Type) -> error__must_be_throw(instantiation_error)
+    ; error__must_be(Type, Term)
+    ).
+
+error__must_be_throw(Formal) :-
+    throw(error(Formal, [predicate-must_be/2])).
 
 error__must_be(integer, Term) :- !,
-    ( var(Term) -> instantiation_error
+    ( var(Term) -> error__must_be_throw(instantiation_error)
     ; integer(Term) -> true
-    ; type_error(integer, Term)
+    ; error__must_be_throw(type_error(integer, Term))
     ).
 error__must_be(atom, Term) :- !,
-    ( var(Term) -> instantiation_error
+    ( var(Term) -> error__must_be_throw(instantiation_error)
     ; atom(Term) -> true
-    ; type_error(atom, Term)
+    ; error__must_be_throw(type_error(atom, Term))
     ).
 error__must_be(number, Term) :- !,
-    ( var(Term) -> instantiation_error
+    ( var(Term) -> error__must_be_throw(instantiation_error)
     ; number(Term) -> true
-    ; type_error(number, Term)
+    ; error__must_be_throw(type_error(number, Term))
     ).
 error__must_be(var, Term) :- !,
     ( var(Term) -> true
     ; throw(error(uninstantiation_error(Term), []))
     ).
 error__must_be(ground, Term) :- !,
-    ( ground(Term) -> true ; instantiation_error ).
+    ( ground(Term) -> true ; error__must_be_throw(instantiation_error) ).
 error__must_be(acyclic, Term) :- !,
     ( acyclic_term(Term) -> true ; type_error(acyclic_term, Term) ).
 error__must_be(list, Term) :- !,
@@ -56,23 +61,23 @@ error__must_be(list, Term) :- !,
 error__must_be(list(Type), Term) :- !,
     error__proper_list_of(Term, Type).
 error__must_be(pair, Term) :- !,
-    ( var(Term) -> instantiation_error
+    ( var(Term) -> error__must_be_throw(instantiation_error)
     ; Term = _-_ -> true
-    ; type_error(pair, Term)
+    ; error__must_be_throw(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) ).
 error__must_be(Type, Term) :-
-    ( var(Term) -> instantiation_error
-    ; type_error(Type, Term)
+    ( var(Term) -> error__must_be_throw(instantiation_error)
+    ; error__must_be_throw(type_error(Type, Term))
     ).
 
 error__proper_list([]) :- !.
 error__proper_list([_|Tail]) :- !, error__proper_list(Tail).
 error__proper_list(Term) :-
-    ( var(Term) -> instantiation_error
-    ; type_error(list, Term)
+    ( var(Term) -> error__must_be_throw(instantiation_error)
+    ; error__must_be_throw(type_error(list, Term))
     ).
 
 error__proper_list_of([], _) :- !.
@@ -80,7 +85,7 @@ 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
+    ( var(Term) -> error__must_be_throw(instantiation_error)
     ; type_error(list, Term)
     ).
 
@@ -138,12 +143,15 @@ call_with_error_context(Goal, Pair) :-
           ( 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.
+%  The element must be a pair (issue #99). The test is inlined rather than
+%  delegated to must_be(pair, _) so that the wrapper stays independent of the
+%  rest of this module. The reported context matches what must_be(pair, _)
+%  produces.
+%  Written as indexed clauses rather than an if-then-else: this runs on every
+%  call_with_error_context/2 call, and an if-then-else costs several times what
+%  first-argument clause selection does.
+error__require_pair(Pair) :- var(Pair), !,
+    throw(error(instantiation_error, [predicate-must_be/2])).
+error__require_pair(_-_) :- !.
 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]))
-    ).
+    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), [call_with_error_context/2, instantiation_error/0, type_error/2]).
+
 
 maybe :-
     random_integer(0, 2, 0).
@@ -31,7 +31,7 @@ random(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) :-
-    call_with_error_context(random__check_integer_range(Lower, Upper), predicate-random_integer/3),
+    random__check_integer_range(Lower, Upper),
     Lower < Upper,
     random__current_seed(Seed0),
     random(Seed0, _, Seed),
@@ -39,28 +39,31 @@ random_integer(Lower, Upper, R) :-
     R is Lower + Seed mod (Upper - Lower).
 
 set_random(Seed) :-
-    call_with_error_context(random__set_seed(Seed), predicate-set_random/1).
+    random__set_seed(Seed).
+
+random__throw(Formal, Predicate) :-
+    throw(error(Formal, [predicate-Predicate])).
 
 random__check_integer_range(Lower, Upper) :-
-    ( var(Lower) -> instantiation_error
-    ; var(Upper) -> instantiation_error
+    ( var(Lower) -> random__throw(instantiation_error, random_integer/3)
+    ; var(Upper) -> random__throw(instantiation_error, random_integer/3)
     ; integer(Lower) -> true
-    ; type_error(integer, Lower)
+    ; random__throw(type_error(integer, Lower), random_integer/3)
     ),
     ( integer(Upper) -> true
-    ; type_error(integer, Upper)
+    ; random__throw(type_error(integer, Upper), random_integer/3)
     ).
 
 random__set_seed(Seed) :-
-    ( var(Seed) -> instantiation_error
+    ( var(Seed) -> random__throw(instantiation_error, set_random/1)
     ; Seed = seed(S) ->
-        ( var(S) -> instantiation_error
+        ( var(S) -> random__throw(instantiation_error, set_random/1)
         ; integer(S) ->
             random__random_normalize_seed(S, Normalized),
             bb_put('$random_seed', Normalized)
-        ; type_error(integer, S)
+        ; random__throw(type_error(integer, S), set_random/1)
         )
-    ; type_error(random_state, Seed)
+    ; random__throw(type_error(random_state, Seed), set_random/1)
     ).
 
 random__current_seed(Seed) :- bb_get('$random_seed', Seed), !.

package/src/lib/si.pl

@@ -8,6 +8,7 @@
     character_si/1,
     term_si/1,
     chars_si/1,
+    compare_si/3,
     dif_si/2,
     not_si/1,
     when_si/2
@@ -16,24 +17,24 @@
 :- meta_predicate(not_si(0)).
 :- meta_predicate(when_si(+, 0)).
 
-atom_si(A) :- ( var(A) -> throw(error(instantiation_error, atom_si/1)) ; atom(A) ).
-integer_si(I) :- ( var(I) -> throw(error(instantiation_error, integer_si/1)) ; integer(I) ).
-atomic_si(A) :- ( var(A) -> throw(error(instantiation_error, atomic_si/1)) ; atomic(A) ).
+atom_si(A) :- ( var(A) -> throw(error(instantiation_error, [predicate-atom_si/1])) ; atom(A) ).
+integer_si(I) :- ( var(I) -> throw(error(instantiation_error, [predicate-integer_si/1])) ; integer(I) ).
+atomic_si(A) :- ( var(A) -> throw(error(instantiation_error, [predicate-atomic_si/1])) ; atomic(A) ).
 
 list_si(List) :- si__list(List).
 si__list([]).
 si__list([_|Tail]) :- !, si__list(Tail).
 si__list(Term) :-
-    ( var(Term) -> throw(error(instantiation_error, list_si/1)) ; fail ).
+    ( var(Term) -> throw(error(instantiation_error, [predicate-list_si/1])) ; fail ).
 
 character_si(C) :-
-    ( var(C) -> throw(error(instantiation_error, character_si/1))
+    ( var(C) -> throw(error(instantiation_error, [predicate-character_si/1]))
     ; atom(C), atom_length(C, 1)
     ).
 
 term_si(Term) :-
     ( ground(Term) -> acyclic_term(Term)
-    ; throw(error(instantiation_error, term_si/1))
+    ; throw(error(instantiation_error, [predicate-term_si/1]))
     ).
 
 chars_si(Chars) :-
@@ -44,19 +45,56 @@ si__chars([C|Cs]) :- character_si(C), si__chars(Cs).
 
 dif_si(X, Y) :-
     X \== Y,
-    ( X \= Y -> true ; throw(error(instantiation_error, dif_si/2)) ).
+    ( X \= Y -> true ; throw(error(instantiation_error, [predicate-dif_si/2])) ).
 
 not_si(Goal) :- term_si(Goal), \+ Goal.
 
 when_si(Condition, Goal) :-
     ( si__condition(Condition) ->
         ( call(Condition) -> call(Goal)
-        ; throw(error(instantiation_error, when_si/2)) )
+        ; throw(error(instantiation_error, [predicate-when_si/2])) )
     ; throw(error(domain_error(when_condition_si, Condition), when_si/2))
     ).
 
-si__condition(Condition) :- var(Condition), !, throw(error(instantiation_error, when_si/2)).
+si__condition(Condition) :- var(Condition), !, throw(error(instantiation_error, [predicate-when_si/2])).
 si__condition(ground(_)).
 si__condition(nonvar(_)).
 si__condition((A,B)) :- si__condition(A), si__condition(B).
 si__condition((A;B)) :- si__condition(A), si__condition(B).
+
+%  compare_si(Order, A, B) holds when compare(Order, A, B) holds for *every*
+%  instance of A and B, and raises an instantiation_error otherwise. The point
+%  is to raise it as rarely as possible: an unbound variable only matters when
+%  it is what decides the ordering. So f(X) @< g(Y) is decided by the functor
+%  names, f(X,a) @< f(X,b) by the second arguments, and X == X gives (=), while
+%  f(a) vs f(Y) and X vs 1 are genuinely undecided.
+compare_si(Order, A, B) :-
+    (  A == B
+    -> Order = (=)
+    ;  si__order_decided(A, B)
+    -> compare(Order, A, B)
+    ;  throw(error(instantiation_error, [predicate-compare_si/3]))
+    ).
+
+%  Both arguments are known to be non-identical here.
+si__order_decided(A, B) :- ( var(A) ; var(B) ), !, fail.
+si__order_decided(A, B) :-
+    compound(A), compound(B), !,
+    functor(A, NameA, ArityA),
+    functor(B, NameB, ArityB),
+    (  ArityA =\= ArityB -> true
+    ;  NameA \== NameB -> true
+    ;  A =.. [_|ArgsA],
+       B =.. [_|ArgsB],
+       si__args_decided(ArgsA, ArgsB)
+    ).
+%  Otherwise both are non-variables and at least one is atomic, so either the
+%  type order or the values themselves settle it and no instantiation can
+%  change the outcome.
+si__order_decided(_, _).
+
+si__args_decided([A|As], [B|Bs]) :-
+    (  A == B
+    -> si__args_decided(As, Bs)
+    ;  si__order_decided(A, B)
+    ).

package/src/library-autoload-index.js

@@ -90,6 +90,7 @@ export const eyePrologLibraryAutoload = Object.freeze({
   "chars_utf8bytes/2": "charsio",
   "circuit/1": "clpz",
   "clpz_t/2": "clpz",
+  "compare_si/3": "si",
   "complement/2": "ugraphs",
   "compose/3": "ugraphs",
   "cond_t/3": "reif",