eyeprolog 1.5.56 → 1.5.57

package/package.json

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

package/src/cli.js

@@ -335,6 +335,7 @@ Options:
   --proof-detail mode   Use abstract or expanded proof detail (implies --proof).
   --verify-proof file   Verify why/2 proof certificates against the input program.
   -q, --quads           Run embedded quad tests and fail if any do not hold.
+                        Note: -q is quads, not quiet; --quiet has no short form.
   --quiet               Suppress answer terms while preserving Prolog output.
   -s, --stats           Print solver and memory statistics to stderr after execution.
   --iso-strict          Use ISO/IEC 13211-1 core + Corrigenda 1-3 only;

package/src/parser.js

@@ -1138,7 +1138,7 @@ class Parser {
         }
         const operator = this.applyOperatorDirective(directive, line);
         if (!coreDirective && !extensionDirective && !operator) {
-          throw new Error(`parse line ${line}: bad term`);
+          throw new Error(`parse line ${line}: ${unsupportedDirectiveMessage(directive, this.strictIso)}`);
         }
         this.expect(TOK.DOT, '.');
         this.applyParserFlagDirective(directive, line);
@@ -1911,3 +1911,76 @@ export function parseGoalText(text, options = {}) {
   }
   return head.args[0];
 }
+
+// Directives are accepted from a fixed list, so an unrecognized one is a
+// different mistake from unparseable input and deserves a different message.
+// The three cases below cover what people actually write: a bare goal that
+// belongs in initialization/1, a misspelt directive name, and a term that is
+// not a directive at all.
+const CORE_DIRECTIVE_INDICATORS = [
+  'dynamic/1', 'multifile/1', 'discontiguous/1', 'initialization/1', 'include/1',
+  'ensure_loaded/1', 'char_conversion/2', 'set_prolog_flag/2', 'op/3',
+];
+const EXTENSION_DIRECTIVE_INDICATORS = [
+  'use_module/1', 'use_module/2', 'meta_predicate/1', 'attribute/1', 'table/1',
+  'public/1', 'module/2',
+];
+
+function directiveNameDistance(a, b) {
+  // Small Levenshtein distance, used only to suggest a near-miss spelling.
+  const rows = a.length + 1;
+  const cols = b.length + 1;
+  let previous = Array.from({ length: cols }, (_, i) => i);
+  for (let i = 1; i < rows; i++) {
+    const current = [i];
+    for (let j = 1; j < cols; j++) {
+      current[j] = Math.min(
+        previous[j] + 1,
+        current[j - 1] + 1,
+        previous[j - 1] + (a[i - 1] === b[j - 1] ? 0 : 1),
+      );
+    }
+    previous = current;
+  }
+  return previous[cols - 1];
+}
+
+function nearestDirectiveName(name, available) {
+  let best = null;
+  let bestDistance = Infinity;
+  for (const indicator of available) {
+    const candidate = indicator.slice(0, indicator.lastIndexOf('/'));
+    const distance = directiveNameDistance(name, candidate);
+    if (distance < bestDistance) {
+      bestDistance = distance;
+      best = candidate;
+    }
+  }
+  // Only suggest a genuinely close spelling, not the alphabetically nearest.
+  return bestDistance <= Math.max(1, Math.floor(name.length / 3)) ? best : null;
+}
+
+function unsupportedDirectiveMessage(directive, strictIso) {
+  const available = strictIso
+    ? CORE_DIRECTIVE_INDICATORS
+    : [...CORE_DIRECTIVE_INDICATORS, ...EXTENSION_DIRECTIVE_INDICATORS];
+  if (directive.type !== COMPOUND && directive.type !== ATOM) {
+    return 'a directive must be a callable term';
+  }
+  const name = directive.name;
+  const arity = directive.type === COMPOUND ? directive.arity : 0;
+  const indicator = `${name}/${arity}`;
+  const known = available.filter((entry) => entry.slice(0, entry.lastIndexOf('/')) === name);
+  if (known.length > 0) {
+    return `directive ${indicator} has the wrong arity; expected ${known.join(' or ')}`;
+  }
+  const suggestion = nearestDirectiveName(name, available);
+  if (suggestion != null) {
+    return `unknown directive ${indicator}; did you mean ${suggestion}?`;
+  }
+  // A goal such as `:- write(hello), nl.` is well-formed but is not one of the
+  // recognized declarations, so point at initialization/1 rather than reporting
+  // a syntax error.
+  return `unknown directive ${indicator}; to run a goal at load time use ` +
+    ':- initialization(Goal).';
+}

package/src/program.js

@@ -1439,8 +1439,13 @@ function analyzeInteropPortability(program, extraGoals = []) {
 // this only affects user code, but within user code it acts at a distance
 // across included files.
 //
-// How strictly this is treated depends on how explicit the program was, which
-// follows the graded scheme SWI-Prolog uses for the same situation:
+// How strictly this is treated depends on how explicit the program was. The
+// first two tiers match what Trealla and Scryer do for the same program
+// (`:- use_module(library(lists)).` followed by clauses for append/3): both
+// warn and continue, Trealla with `overwriting user:'append'/3` and Scryer with
+// `overwriting append/3 because the clauses are discontiguous`. SWI-Prolog
+// treats imported predicates as weak symbols and warns likewise. No system
+// raises an error there, so neither does EyeProlog:
 //
 //   implicit autoload                          -> warning
 //   use_module(library(L))                     -> warning
@@ -1448,9 +1453,9 @@ function analyzeInteropPortability(program, extraGoals = []) {
 //
 // Only the last case is an outright contradiction: the program asked for that
 // exact predicate to be imported and then supplied clauses for it. The first
-// two stay warnings so that flat, module-free programs -- which load unchanged
-// on Scryer and Trealla, where the library is simply never imported -- keep
-// working. Note that ISO reserves permission_error(modify, static_procedure)
+// two stay warnings so that flat, module-free programs keep loading here
+// exactly as they do on Scryer and Trealla, which was checked directly rather
+// than inferred. Note that ISO reserves permission_error(modify, static_procedure)
 // for built-in predicates (7.5.3); library predicates are not built-ins, so
 // this error is raised only where the program's own import list demands it.
 function analyzeLibraryShadowing(program) {

package/test/conformance/ISO-PROLOG-TEXT-EXECUTION-MATRIX.md

@@ -23,7 +23,7 @@ chosen behavior is also indexed by `ISO-IMPLEMENTATION-DEFINED.md`.
 | 7.4.2.7 `include/1` | covered | The included text is prepared at the directive position and shares operator/character/flag preparation state with its parent. |
 | 7.4.2.8 `ensure_loaded/1` | covered | A source is prepared at most once in the current load graph, including repeated references and self/top-level references. |
 | 7.4.2.9 `set_prolog_flag/2` | covered | Preparation-time flag changes affect subsequent text and are replayed into execution state; strict flag names/values/changeability remain governed by the closed 7.11 review. |
-| 7.4.3 source clauses | covered | Source heads/bodies are validated like program clauses, standardized static/control procedures are protected, declarations can create empty procedures, and body conversion follows 7.6.2 while preserving head/body variable identity. The built-in restriction applies in every execution mode, so consulting a clause for a built-in predicate or control construct reports the same `permission_error(modify, static_procedure)` as `assert`ing one; EyeProlog's own library and extension predicates are not standard built-ins, so ISO does not protect them. They stay redefinable when they reach the program implicitly, through autoloading or a whole-module `use_module(library(L))`, but the redefinition is reported as a shadowing warning because it replaces the library predicate for all user code in the program. Naming a predicate in an explicit import list, `use_module(library(L), [Name/Arity])`, and then supplying clauses for it is a contradiction and reports `permission_error(modify, static_procedure)`. Bundled library modules keep resolving their own internal calls, so a user redefinition never changes library behaviour. Corpus: `error/iso/consult_redefines_builtin`. |
+| 7.4.3 source clauses | covered | Source heads/bodies are validated like program clauses, standardized static/control procedures are protected, declarations can create empty procedures, and body conversion follows 7.6.2 while preserving head/body variable identity. The built-in restriction applies in every execution mode, so consulting a clause for a built-in predicate or control construct reports the same `permission_error(modify, static_procedure)` as `assert`ing one; EyeProlog's own library and extension predicates are not standard built-ins, so ISO does not protect them. They stay redefinable when they reach the program implicitly, through autoloading or a whole-module `use_module(library(L))`, but the redefinition is reported as a shadowing warning because it replaces the library predicate for all user code in the program. Naming a predicate in an explicit import list, `use_module(library(L), [Name/Arity])`, and then supplying clauses for it is a contradiction and reports `permission_error(modify, static_procedure)`. Bundled library modules keep resolving their own internal calls, so a user redefinition never changes library behaviour. Trealla and Scryer also warn and continue for the whole-module case rather than raising an error, so the warning tiers match those systems. Corpus: `error/iso/consult_redefines_builtin`. |
 
 The strict release test `closes ISO 7.4 Prolog-text preparation and directive
 rows` exercises the cross-text operator/character/flag state, include and

package/test/conformance/expected-errors/syntax/extra_missing_head_rejected.txt

@@ -1 +1 @@
-parse line 1: bad term
+parse line 1: unknown directive q/1; to run a goal at load time use :- initialization(Goal).

package/test/regression/cases-regression.mjs

@@ -4427,6 +4427,42 @@ answer(Result) :- countdown(2048, Result), Result = 2048.
         assertIncludes(result.stdout, 'answer([1, 2, 3])', 'library append/2 still uses the library append/3');
       },
     },
+    {
+      // Directives come from a fixed list, so an unrecognized one is a
+      // different mistake from unparseable input and gets its own message
+      // instead of the generic parser 'bad term'.
+      name: 'unsupported directives report why they were rejected',
+      run: () => {
+        const goalDirective = runCli(['-'], { input: ':- write(hello), nl.\n' });
+        assertEqual(goalDirective.status, 1, 'goal directive status');
+        assertIncludes(goalDirective.stderr, 'unknown directive write/1', 'goal directive indicator');
+        assertIncludes(goalDirective.stderr, 'initialization(Goal)', 'goal directive remedy');
+        assertNotIncludes(goalDirective.stderr, 'bad term', 'no generic parser message');
+
+        const misspelt = runCli(['-'], { input: ':- dynamc(foo/1).\n' });
+        assertEqual(misspelt.status, 1, 'misspelt status');
+        assertIncludes(misspelt.stderr, 'did you mean dynamic?', 'near-miss suggestion');
+
+        const wrongArity = runCli(['-'], { input: ':- dynamic(foo/1, bar).\n' });
+        assertEqual(wrongArity.status, 1, 'wrong arity status');
+        assertIncludes(wrongArity.stderr, 'expected dynamic/1', 'arity guidance');
+
+        const notCallable = runCli(['-'], { input: ':- 42.\n' });
+        assertEqual(notCallable.status, 1, 'non-callable status');
+        assertIncludes(notCallable.stderr, 'must be a callable term', 'callable guidance');
+      },
+    },
+    {
+      // Genuinely malformed input must keep reporting a syntax error rather
+      // than being misreported as a directive problem.
+      name: 'malformed terms still report a parse error',
+      run: () => {
+        const result = runCli(['-'], { input: 'foo(1). bar(\n' });
+        assertEqual(result.status, 1, 'exit status');
+        assertIncludes(result.stderr, 'parse line', 'parse error');
+        assertNotIncludes(result.stderr, 'unknown directive', 'not a directive message');
+      },
+    },
     {
       name: 'double dash permits option-shaped file names',
       run: () => {