eyeprolog 1.3.100 → 1.4.0

package/package.json

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

package/src/write.js

@@ -28,6 +28,11 @@ function quotedControlEscape(ch) {
 function atomNeedsQuotes(name) {
   if (!name) return true;
   if (name === '[]' || name === '{}') return false;
+  // `;` is a solo-character name token in ISO 6.4.2/6.5.3, so unlike most
+  // solo characters it is a valid atom without quotes. Keep `|` distinct:
+  // Corrigendum 2 makes the bar token equivalent to atom '|' only while it
+  // is being used as an operator; as an ordinary atom/functor it is quoted.
+  if (name === ';') return false;
   // A lone full stop is the end token, not a graphic atom.  Longer
   // graphic tokens may contain dots and are valid unquoted writeq/1 output
   // (WG17 #371-373: ./*, .*, ...*).  Only a token beginning with /* would
@@ -164,6 +169,10 @@ function writeNumberedVariable(index) {
 }
 
 function operatorName(name) {
+  // Corrigendum 2 adds a dedicated bar token to operator syntax. The atom
+  // itself still needs quoting in functional notation, but operator-form
+  // output must use the unquoted `|` token (WG17 #181/#290).
+  if (name === '|') return '|';
   if (name === '.' || name.startsWith('/*')) return quoteAtom(name);
   if (/^[a-z][A-Za-z0-9_]*$/.test(name)) return name;
   if (/^[!#$&*+\-./<=>?@^~\\;:]+$/.test(name)) return name;
@@ -274,6 +283,10 @@ function format(term, env, options, table, maxPriority = 1200, context = 'term')
   if (resolved.type === STRING) return writeString(resolved.name);
   if (resolved.type === ATOM) {
     if (!options.quoted) return resolved.name;
+    // Corrigendum 2's bare bar token exists only in operator syntax. It is
+    // not an atom token, so an ordinary atom `|` must remain quoted even when
+    // `|` is currently declared as an operator (for example as f('|')).
+    if (resolved.name === '|') return quoteAtom(resolved.name);
     // Top-level bindings are already delimited by their answer punctuation.
     // Keep valid dotted graphic tokens readable there without weakening the
     // ISO writeq/1 policy tested by WG17 #308.

package/test/conformance/ISO-COMPLIANCE.md

@@ -38,13 +38,13 @@ relevant implementation-dependent overlap choice to an explicit audit outcome.
 | 7.7 — execution and backtracking | covered | [ISO-PROLOG-TEXT-EXECUTION-MATRIX.md](ISO-PROLOG-TEXT-EXECUTION-MATRIX.md) closes ordinary clause selection/backtracking, source/database order, empty-versus-unknown procedures, logical-update visibility, and strict dispatch. EyeProlog automatic tabling, cycle guards, and recursive numeric shortcuts remain disabled in the strict profile. |
 | 7.8 — control constructs and exceptions | covered | [ISO-PROLOG-TEXT-EXECUTION-MATRIX.md](ISO-PROLOG-TEXT-EXECUTION-MATRIX.md) closes `true/0`, `fail/0`, `call/1`, cut, conjunction, disjunction, if-then(-else), and `catch/3`/`throw/1`, including Corrigendum 2 catchability of errors arising from the protected goal and Corrigendum 3 term-to-body conversion. The 8.15 built-in additions remain independently row-audited. |
 | 7.9 — expression evaluation | covered | [ISO-EVALUABLE-FUNCTOR-MATRIX.md](ISO-EVALUABLE-FUNCTOR-MATRIX.md) closes recursive evaluation, direct-variable precedence, corrected non-evaluable `F/N` errors (including STC #69), operand template/type rules, mixed arithmetic-comparison conversion, exceptional values, and finite-host resource normalization. The audit also fixes float-only `float_integer_part/1` and `float_fractional_part/1` so even huge valid integers reach `type_error(float,...)` before any I->F overflow. |
-| 7.10 — input/output concepts | covered | Higher-level stream semantics are pinned for non-atom ground stream terms, alias lifetime, current/target stream selection and fallback, write truncation, append positioning, contradictory stream options, exact binary round-tripping, flushing, standard-stream close behavior, and repositioned overwrite. The complete 8.11-8.14 built-in mode/error family remains row-audited in [ISO-BUILTIN-MODE-ERROR-MATRIX.md](ISO-BUILTIN-MODE-ERROR-MATRIX.md), while all implementation-defined stream choices are indexed in [ISO-IMPLEMENTATION-DEFINED.md](ISO-IMPLEMENTATION-DEFINED.md). |
+| 7.10 — input/output concepts | covered | Higher-level stream semantics are pinned for non-atom ground stream terms, alias lifetime, current/target stream selection and fallback, write truncation, append positioning, contradictory stream options, exact binary round-tripping, flushing, standard-stream close behavior, and repositioned overwrite. Term-output spelling is also checked lexically where ISO distinguishes token forms: Corrigendum 2 bar operators are written with bare `|`, ordinary atom/functor `|` remains quoted, and the semicolon name token is emitted bare by canonical output. The complete 8.11-8.14 built-in mode/error family remains row-audited in [ISO-BUILTIN-MODE-ERROR-MATRIX.md](ISO-BUILTIN-MODE-ERROR-MATRIX.md), while all implementation-defined stream choices are indexed in [ISO-IMPLEMENTATION-DEFINED.md](ISO-IMPLEMENTATION-DEFINED.md). |
 | 7.11 — flags | covered | The complete Part 1 flag set, selected defaults, standard value domains, changeability, `current_prolog_flag/2`, and `set_prolog_flag/2` error behavior have dedicated strict tests. EyeProlog selects `bounded=false` and `integer_rounding_function=toward_zero`; valid alternative values of those fixed flags reach `permission_error(modify,flag,...)`, while `max_integer` and `min_integer` have no current value. STC #70 is recorded explicitly: EyeProlog has no separate finite procedure-arity ceiling, so the optional `max_procedure_arity` flag is absent while `max_arity` remains `unbounded`. Strict mode excludes the EyeProlog `occurs_check` extension. |
 | 7.12 — errors | covered | The strict error-envelope gate exercises instantiation, type, domain, existence, permission, representation, evaluation, resource, syntax, and system errors through `error(Error, Context)`. Built-in rows provide the individual prescribed conditions, implementation-defined representation/context choices are documented, and simultaneous-error regressions pin deterministic EyeProlog choices without treating textual table order as normative. |
 | 8.2-8.17 — built-in predicates | covered | [ISO-BUILTIN-MODE-ERROR-MATRIX.md](ISO-BUILTIN-MODE-ERROR-MATRIX.md) now records the complete Part 1 + Corrigenda built-in family at one row per prescribed mode, success/failure behavior, individual error condition, and conditional/not-applicable branch. The row audit exposed and fixed source/runtime 7.6.2 body conversion/variable sharing, strict host-string leakage, input-code error timing, `close/2` force handling, and closed-stream `stream_property/2` behavior. Simultaneous-error choices are documented as implementation dependent under 7.12 unless separately constrained. |
 | Clause 9 — evaluable functors | covered | [ISO-EVALUABLE-FUNCTOR-MATRIX.md](ISO-EVALUABLE-FUNCTOR-MATRIX.md) records the published Part 1 + Corrigenda arithmetic templates and exceptional branches across 9.1, 9.3, and 9.4. It pins the unbounded integer model, `rndI`/`rndF`/`resultF` choices, float-only conversion rules, I->F overflow, explicit `exp/1` and power underflow, Corrigendum 2 additions and mixed-type `max/2`/`min/2` implementation-dependent choice, Corrigendum 3 negative-power correction, signed bitwise/shift choices, and resource-error translation. Post-N289 STC #75 remains a separately tracked draft proposal rather than a silent change to the published baseline. |
 | Corrigendum 1 | covered | Double-quoted atom/operator-priority corrections have dedicated cases. |
-| Corrigendum 2 | covered | Added predicates/functors, catch corrections, bar/operator and uninstantiation corrections have dedicated cases. |
+| Corrigendum 2 | covered | Added predicates/functors, catch corrections, bar/operator and uninstantiation corrections have dedicated cases, including the distinct bare `|` operator token required for term output. |
 | Corrigendum 3 | covered | Writer options, `variable_names/1`, canonical list output and negative-power corrections have dedicated cases. |
 
 ## Conformance corrections and audit closure

package/test/conformance/WG17-SYNTAX-STATUS.md

@@ -7,7 +7,10 @@ This ledger counts an upstream case when its WG17 identifier, query, and
 expected ISO disposition are stored in the offline executable matrix. Every
 case is executed against the upstream Codex expectation. Reviewed exact
 EyeProlog outcomes are additional regression locks and can never override the
-upstream assertion.
+upstream assertion. Writer expectations also preserve ISO-significant token
+spelling: in particular, a bare bar used as an operator is not treated as
+equivalent to a quoted atom, and a bare semicolon name token is not silently
+accepted in quoted form.
 
 ## Current standing
 

package/test/conformance/wg17-syntax-cases.json

@@ -3894,7 +3894,7 @@
             "variables": "[]"
           },
           {
-            "output": "a-->b,c'|'d",
+            "output": "a-->b,c|d",
             "variables": "[]"
           }
         ]
@@ -3914,7 +3914,7 @@
             "variables": "[]"
           },
           {
-            "output": "'|'(a,';'(b,c))",
+            "output": "'|'(a,;(b,c))",
             "variables": "[]"
           }
         ]
@@ -3934,7 +3934,7 @@
             "variables": "[]"
           },
           {
-            "output": "'|'(';'(a,b),c)",
+            "output": "'|'(;(a,b),c)",
             "variables": "[]"
           }
         ]
@@ -3965,7 +3965,7 @@
             "variables": "[]"
           },
           {
-            "output": "[(a'|'b)]",
+            "output": "[(a|b)]",
             "variables": "[]"
           }
         ]
@@ -5173,7 +5173,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "';'(a)",
+            "output": ";(a)",
             "variables": "[]"
           }
         ]
@@ -5189,7 +5189,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "';'(a)",
+            "output": ";(a)",
             "variables": "[]"
           }
         ]
@@ -5205,7 +5205,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "';'(a,b)",
+            "output": ";(a,b)",
             "variables": "[]"
           }
         ]

package/test/run-regression.mjs

@@ -4698,6 +4698,34 @@ function documentationSyncCases() {
           true,
           'non-semantic internal operator spacing remains flexible',
         );
+        const barWriter = {
+          id: 181,
+          query: "writeq((a-->b,c|d)).",
+          input: "op(1105,xfy,'|').\nwriteq((a-->b,c|d)).",
+        };
+        assertEqual(
+          matchesUpstreamExpectation(
+            'a-->b,c|d',
+            { type: 'success', stages: [{ output: "a-->b,c'|'d", variables: '[]' }] },
+            barWriter,
+          ),
+          false,
+          'quoted bar is not accepted in operator-form writer output',
+        );
+        const semicolonWriter = {
+          id: 331,
+          query: 'write_canonical(;(a,b)).',
+          input: 'write_canonical(;(a,b)).',
+        };
+        assertEqual(
+          matchesUpstreamExpectation(
+            ';(a,b)',
+            { type: 'success', stages: [{ output: "';'(a,b)", variables: '[]' }] },
+            semicolonWriter,
+          ),
+          false,
+          'quoted semicolon is not accepted when the ISO name token is bare',
+        );
         const repeated = {
           id: 227, input: 'write_canonical(B+B).',
           outcome: { type: 'success', stages: [{ output: '+(_A,_A)', variables: "['B' = B]" }] },

package/test/run-wg17.mjs

@@ -252,6 +252,48 @@ function termEquivalent(expected, actual, item) {
   }
 }
 
+function soloTokenQuoteSignature(text) {
+  const signature = [];
+  let quote = null;
+  const source = presentationText(text);
+  for (let index = 0; index < source.length; index++) {
+    const ch = source[index];
+    if (quote != null) {
+      if (ch === '\\') {
+        index++;
+        continue;
+      }
+      if (ch === quote) {
+        if (source[index + 1] === quote) {
+          index++;
+          continue;
+        }
+        quote = null;
+        continue;
+      }
+      if (ch === '|' || ch === ';' || ch === ',') signature.push(`${ch}:quoted`);
+      continue;
+    }
+    if (ch === "'") {
+      quote = ch;
+      continue;
+    }
+    if (ch === '|' || ch === ';' || ch === ',') signature.push(`${ch}:bare`);
+  }
+  return signature;
+}
+
+function preservesWriterSoloTokenSpelling(expected, actual, item) {
+  // For writer conformity cases, semantic term equivalence is deliberately
+  // not enough: ISO distinguishes the bare bar operator token from atom '|',
+  // and semicolon is itself a valid unquoted name token. This prevents the
+  // fallback parser comparison from accepting regressions such as `a'|'b` or
+  // canonical `';'(a,b)` when the WG17 expected spelling is `a|b` / `;(a,b)`.
+  if (!/\bwrite(?:q|_canonical|_term)?\s*\(/.test(item?.query ?? '')) return true;
+  return JSON.stringify(soloTokenQuoteSignature(expected)) ===
+    JSON.stringify(soloTokenQuoteSignature(actual));
+}
+
 function abbreviatedErrorMatches(expected, actual) {
   if (actual.type !== 'error') return false;
   const formal = actual.formal ?? '';
@@ -284,6 +326,7 @@ function textExpectationMatches(expectedText, actual, item, example = false) {
     // boundary, notably Cor.3 prefix-operator cases such as `- (1^2)`. Do not
     // erase that boundary before the semantic/layout-tolerant fallbacks below.
     if (!preservesLeadingOperatorParenLayout(left, right)) continue;
+    if (!preservesWriterSoloTokenSpelling(left, right, item)) continue;
     if (stripLayoutOutsideQuotes(left) === stripLayoutOutsideQuotes(right)) return true;
     if (termEquivalent(left, right, item)) return true;
     if (example) {

package/tools/report-wg17-syntax-coverage.mjs

@@ -95,7 +95,10 @@ This ledger counts an upstream case when its WG17 identifier, query, and
 expected ISO disposition are stored in the offline executable matrix. Every
 case is executed against the upstream Codex expectation. Reviewed exact
 EyeProlog outcomes are additional regression locks and can never override the
-upstream assertion.
+upstream assertion. Writer expectations also preserve ISO-significant token
+spelling: in particular, a bare bar used as an operator is not treated as
+equivalent to a quoted atom, and a bare semicolon name token is not silently
+accepted in quoted form.
 
 ## Current standing