eyeprolog 1.5.21 → 1.5.23

package/src/write.js

@@ -152,6 +152,20 @@ function writeString(value) {
   return out + '"';
 }
 
+function quotedListCharacter(item, doubleQuotes) {
+  if (doubleQuotes === 'chars') {
+    if (item.type !== ATOM || Array.from(item.name).length !== 1) return null;
+    return item.name;
+  }
+  if (doubleQuotes === 'codes') {
+    if (item.type !== NUMBER || !/^\d+$/.test(item.name)) return null;
+    const code = BigInt(item.name);
+    if (code < 0n || code > 0x10ffffn || (code >= 0xd800n && code <= 0xdfffn)) return null;
+    return String.fromCodePoint(Number(code));
+  }
+  return null;
+}
+
 function quotedListSplice(term, env, doubleQuotes) {
   if (doubleQuotes !== 'chars' && doubleQuotes !== 'codes') return null;
   const characters = [];
@@ -164,16 +178,9 @@ function quotedListSplice(term, env, doubleQuotes) {
     if (!isCons(cursor)) {
       return characters.length === 0 ? null : { text: characters.join(''), tail: cursor };
     }
-    const item = deref(cursor.args[0], env);
-    if (doubleQuotes === 'chars') {
-      if (item.type !== ATOM || Array.from(item.name).length !== 1) return null;
-      characters.push(item.name);
-    } else {
-      if (item.type !== NUMBER || !/^\d+$/.test(item.name)) return null;
-      const code = BigInt(item.name);
-      if (code < 0n || code > 0x10ffffn || (code >= 0xd800n && code <= 0xdfffn)) return null;
-      characters.push(String.fromCodePoint(Number(code)));
-    }
+    const character = quotedListCharacter(deref(cursor.args[0], env), doubleQuotes);
+    if (character == null) return null;
+    characters.push(character);
     cursor = cursor.args[1];
   }
 }
@@ -351,15 +358,26 @@ function format(term, env, options, table, maxPriority = 1200, context = 'term')
 
     if (!options.ignoreOps) {
       const parts = [];
+      let quotedSuffix = [];
       let cursor = resolved;
       while (true) {
         cursor = deref(cursor, env);
         const separator = options.compact ? ',' : ', ';
-        if (isEmptyList(cursor)) return `[${parts.join(separator)}]`;
+        if (isEmptyList(cursor)) {
+          if (quotedSuffix.length > 1 && quotedSuffix.length < parts.length) {
+            const prefix = parts.slice(0, parts.length - quotedSuffix.length);
+            return `[${prefix.join(separator)}|${writeString(quotedSuffix.join(''))}]`;
+          }
+          return `[${parts.join(separator)}]`;
+        }
         if (!isCons(cursor)) {
           const tailSeparator = options.compact ? '|' : ' | ';
           return `[${parts.join(separator)}${tailSeparator}${format(cursor, env, options, table, 999, 'argument')}]`;
         }
+        const item = deref(cursor.args[0], env);
+        const character = quotedListCharacter(item, options.doubleQuotes);
+        if (character == null) quotedSuffix = [];
+        else quotedSuffix.push(character);
         parts.push(format(cursor.args[0], env, options, table, 999, 'argument'));
         cursor = cursor.args[1];
       }

package/test/benchmark.mjs

@@ -128,6 +128,48 @@ function changeText(item) {
   return `${change < 0 ? '↓' : '↑'} ${value}`;
 }
 
+function summarizeResults(results) {
+  const comparable = results.filter((item) =>
+    Number.isFinite(item.medianMs) &&
+    item.medianMs > 0 &&
+    Number.isFinite(item.baselineMs) &&
+    item.baselineMs > 0);
+
+  if (comparable.length === 0) {
+    return {
+      comparable: 0,
+      total: results.length,
+      ratio: null,
+      changePercent: null,
+      currentTotalMs: null,
+      baselineTotalMs: null,
+      totalRatio: null,
+      totalChangePercent: null,
+    };
+  }
+
+  const ratio = Math.exp(
+    comparable.reduce(
+      (sum, item) => sum + Math.log(item.medianMs / item.baselineMs),
+      0,
+    ) / comparable.length,
+  );
+  const currentTotalMs = comparable.reduce((sum, item) => sum + item.medianMs, 0);
+  const baselineTotalMs = comparable.reduce((sum, item) => sum + item.baselineMs, 0);
+  const totalRatio = currentTotalMs / baselineTotalMs;
+
+  return {
+    comparable: comparable.length,
+    total: results.length,
+    ratio,
+    changePercent: (ratio - 1) * 100,
+    currentTotalMs,
+    baselineTotalMs,
+    totalRatio,
+    totalChangePercent: (totalRatio - 1) * 100,
+  };
+}
+
 function runWorker(item) {
   const child = spawnSync(process.execPath, [
     path.join(root, 'test', 'benchmark-worker.mjs'),
@@ -176,6 +218,8 @@ for (const item of selected) {
   });
 }
 
+const summary = summarizeResults(results);
+
 if (options.save != null) {
   await fs.mkdir(path.dirname(options.save), { recursive: true });
   const saved = {
@@ -202,6 +246,7 @@ if (options.json) {
     targetMs: options.targetMs,
     baseline: baselinePath,
     baselineWarning,
+    summary,
     results,
   }, null, 2)}\n`);
 } else {
@@ -220,9 +265,25 @@ if (options.json) {
   printRow(headers);
   printRow(widths.map((width) => '-'.repeat(width)));
   for (const row of rows) printRow(row);
+
+  if (summary.comparable > 0) {
+    process.stdout.write(
+      `\nSuite score: ${summary.ratio.toFixed(3)}x baseline ` +
+      `(${changeText({ changePercent: summary.changePercent })}); ` +
+      `equal-weight geometric mean across ${summary.comparable}/${summary.total} comparable benchmarks.\n`,
+    );
+    process.stdout.write(
+      `Time-weighted total: ${formatMs(summary.currentTotalMs)} vs ${formatMs(summary.baselineTotalMs)} ` +
+      `(${changeText({ changePercent: summary.totalChangePercent })}).\n`,
+    );
+  }
+
   process.stdout.write(`\n${results.length} benchmarks; ${options.runs} measured batch${options.runs === 1 ? '' : 'es'} each after ${options.warmup} warm-up batch${options.warmup === 1 ? '' : 'es'}, calibrated after one priming execution toward ${options.targetMs} ms per batch.\n`);
   if (baselineWarning) process.stdout.write(`${baselineWarning}\n`);
   if (baselinePath == null && !baselineWarning) process.stdout.write('No timing baseline found; run npm run benchmark:baseline to create .benchmarks/baseline.json.\n');
   if (options.save != null) process.stdout.write(`Saved timing baseline: ${path.relative(root, options.save)}\n`);
   process.stdout.write('Change compares the current median/op directly with the saved baseline median/op; the measured range is shown separately.\n');
+  if (summary.comparable > 0) {
+    process.stdout.write('Suite score is the geometric mean of current/baseline ratios, so every benchmark has equal relative weight; Time-weighted total compares summed medians and is dominated by longer workloads.\n');
+  }
 }

package/test/conformance/ISO-COMPLIANCE.md

@@ -19,7 +19,7 @@ relevant implementation-dependent overlap choice to an explicit audit outcome.
 
 | Requirement | Status | EyeProlog evidence / remaining work |
 | --- | --- | --- |
-| 5.1(a) prepare conforming Prolog text | covered | Clause 6 token/term production and rejection families are mapped by the strict production gate and the complete 372-case vendored WG17 syntax matrix; 7.4 preparation/directive behavior is separately closed. |
+| 5.1(a) prepare conforming Prolog text | covered | Clause 6 token/term production and rejection families are mapped by the strict production gate and the complete 366-case vendored WG17 syntax matrix; 7.4 preparation/directive behavior is separately closed. |
 | 5.1(b) execute conforming Prolog goals | covered | Clause 7 term/control/execution semantics, the higher-level 7.10 stream model, 7.11 flags, the 7.12 error envelope, all 8.2-8.17 built-in rows, and Clause 9 arithmetic have explicit executable dispositions. |
 | 5.1(c) reject nonconforming text/read-terms | covered | WG17 negative syntax cases, focused malformed-production/escape/comment/operator cases, read-term syntax errors, and strict rejection of implementation-specific syntax provide explicit rejection evidence across the Clause 6 families. |
 | 5.1(d) document permitted variations | covered | The clause-by-clause [ISO 5.4 decision index](ISO-IMPLEMENTATION-DEFINED.md) records every explicit implementation-defined decision found in the Part 1 + Corrigenda baseline and separately inventories implementation-specific extension families. The index retains an `audit gap` category for future discoveries; no current release-facing row depends on one. |
@@ -31,7 +31,7 @@ relevant implementation-dependent overlap choice to an explicit audit outcome.
 
 | Standard area | Status | Current evidence |
 | --- | --- | --- |
-| Clause 6 — tokens, terms, lists, operators, quoted text | covered | The strict Clause 6 gate maps atomic/variable/compound/operator/list/curly/double-quoted term forms, layout/comments, quoted escapes, integer bases/character codes, floating tokens, and solo/meta token boundaries, with malformed counterparts rejected. The complete 372-case WG17 syntax matrix provides independent production-level coverage, and a cross-profile gate verifies that normal syntax extensions preserve every strict-accepted standard observation. The implementation-defined 6.5/6.6 PCS/collation choices are documented separately. |
+| Clause 6 — tokens, terms, lists, operators, quoted text | covered | The strict Clause 6 gate maps atomic/variable/compound/operator/list/curly/double-quoted term forms, layout/comments, quoted escapes, integer bases/character codes, floating tokens, and solo/meta token boundaries, with malformed counterparts rejected. The complete 366-case WG17 syntax matrix provides independent production-level coverage, and a cross-profile gate verifies that normal syntax extensions preserve every strict-accepted standard observation. The implementation-defined 6.5/6.6 PCS/collation choices are documented separately. |
 | 7.1-7.3 — term types, term order, unification | covered | [ISO-TERM-SEMANTICS-MATRIX.md](ISO-TERM-SEMANTICS-MATRIX.md) records the five mutually exclusive strict term types, derived variable/compound/list notions, the complete standard-order classes and implementation-dependent variable-order choice, NSTO MGU/failure behavior, and EyeProlog's permitted consistent occurs-check failure for Part 1's undefined STO ordinary-unification cases. The normal JavaScript API string term is documented as a 5.5.4 extension and rejected at strict program/goal entry. |
 | 7.4 — Prolog text and directives | covered | [ISO-PROLOG-TEXT-EXECUTION-MATRIX.md](ISO-PROLOG-TEXT-EXECUTION-MATRIX.md) closes the preparation/directive rows: declaration semantics, source clauses, cross-text operators/character conversion/flags, initialization order/lifetime, `include/1`, and one-time `ensure_loaded/1`, with implementation-defined cross-text choices indexed under 5.4. |
 | 7.5-7.6 — database and term/clause conversion | covered | [ISO-PROLOG-TEXT-EXECUTION-MATRIX.md](ISO-PROLOG-TEXT-EXECUTION-MATRIX.md) closes static/dynamic and private/public procedure semantics, clause order, logical-update visibility, empty/unknown lifetime, and term/body/clause conversion. Source and runtime assertion conversion recurse through `,/2`, `;/2`, and `->/2`, preserve variable identity, and protect standardized static/control procedures. |
@@ -286,7 +286,7 @@ post-N289 STC drafts remain review input until standardized.
 | Criterion | Status | Evidence |
 | --- | --- | --- |
 | Clause 5 processor obligations have explicit dispositions | covered | `ISO-PROCESSOR-REQUIREMENTS.md` gives explicit outcomes for 5.1-5.5, including the strict/normal extension boundary. |
-| Clause 6 lexical/syntactic requirements have explicit dispositions | covered | the strict Clause 6 production/rejection gate and the 372-case vendored WG17 matrix cover the standard families; cross-profile preservation verifies that normal extensions do not reinterpret strict-accepted text. |
+| Clause 6 lexical/syntactic requirements have explicit dispositions | covered | the strict Clause 6 production/rejection gate and the 366-case vendored WG17 matrix cover the standard families; cross-profile preservation verifies that normal extensions do not reinterpret strict-accepted text. |
 | Clause 7 semantic requirements have explicit dispositions | covered | 7.1-7.12 now have explicit semantic, implementation-defined, or error-envelope dispositions backed by strict tests and the specialized matrices. |
 | Clause 8 built-in modes/errors have explicit dispositions | covered | `ISO-BUILTIN-MODE-ERROR-MATRIX.md` closes 8.2-8.17 row by row |
 | Clause 9 evaluable-functor requirements have explicit dispositions | covered | `ISO-EVALUABLE-FUNCTOR-MATRIX.md` plus the strict arithmetic regression closes the published Part 1 + Corrigenda arithmetic rows |
@@ -294,7 +294,7 @@ post-N289 STC drafts remain review input until standardized.
 | Implementation-specific strict/normal boundary is documented and tested | covered | all 5.5 hooks have explicit dispositions; the WG17 cross-profile gate verifies syntax-preservation for standard text accepted by the strict reader. |
 | Published Corrigenda 1-3 are incorporated | covered | dedicated conformance/strict tests and this ledger track all three published Corrigenda |
 | Current post-N289 draft is tracked without silently changing the published baseline | covered | `STC-DRAFT-STATUS.md` tracks reviewed draft items separately from normative requirements |
-| Independent external syntax corpus is an offline release gate | covered | the vendored WG17 syntax matrix has 372 executable dispositions checked against its upstream expectations |
+| Independent external syntax corpus is an offline release gate | covered | the vendored WG17 syntax matrix has 366 executable dispositions checked against its upstream expectations |
 | Third-party standard-core regression provenance is retained | covered | adapted Logtalk, Scryer, Trealla, and SWI-Prolog cases retain source identifiers and licenses in `THIRD_PARTY.md` |
 | No unexplained deviation remains in the release-facing ledger | covered | the release-facing ledger contains no remaining `audit` rows; documented variation points are implementation-defined/specific or draft-only rather than unexplained deviations. |
 

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

@@ -124,7 +124,7 @@ families; `--iso-strict` is intended to remove their Part 1 interpretation.
 | 5.5.9 Built-in predicates | EyeProlog libraries, CLP(Z), statistics, Part 3 `phrase/2-3`, and bundled-library autoloaded predicates | Strict registry contains only the Part 1 + Corrigenda core registry. |
 | 5.5.10 Evaluable functors | Normal mode additionally accepts the EyeProlog evaluable atom `e`; the remaining arithmetic functors accepted by strict mode are the Part 1 + Corrigenda set. | Strict mode rejects `e/0` as non-evaluable and retains the Corrigendum arithmetic additions. **covered** — strict extension-boundary regression plus `src/iso-arithmetic.js`. |
 | 5.5.11 Reserved atoms | None | None. |
-| Cor.3 5.5.12 Options | Extra library/host options may exist outside core option lists | Normal mode additionally accepts the EyeProlog `write_term/2-3` options `double_quotes(true|false)` and `spacing(true|false)`. `double_quotes(true)` is orthogonal to `ignore_ops(true)`: eligible character/code lists retain double-quoted notation while operator terms use functional notation, and the order of those distinct options does not affect the result. `spacing(false)` emits only lexically required separators; `spacing(true)` adds conventional layout around operators. Strict core excludes these implementation-specific extensions and accepts only the Part 1 plus Corrigendum 3 write-option surface; unknown extension options raise `domain_error(write_option,...)`. |
+| Cor.3 5.5.12 Options | Extra library/host options may exist outside core option lists | Normal mode additionally accepts the EyeProlog `write_term/2-3` options `double_quotes(true|false)` and `spacing(true|false)`. `double_quotes(true)` is orthogonal to `ignore_ops(true)`: eligible character/code lists, including a proper list's maximal character/code suffix of at least two elements, retain double-quoted notation while operator terms use functional notation, and the order of those distinct options does not affect the result. `spacing(false)` emits only lexically required separators; `spacing(true)` adds conventional layout around operators. Strict core excludes these implementation-specific extensions and accepts only the Part 1 plus Corrigendum 3 write-option surface; unknown extension options raise `domain_error(write_option,...)`. |
 
 Normal mode provides documented module and DCG compatibility profiles whose
 features overlap standardized Part 2 and Part 3 facilities. They are extensions

package/test/conformance/README.md

@@ -145,7 +145,7 @@ are recorded in [THIRD_PARTY.md](THIRD_PARTY.md).
 
 The corpus has 386 cases in `iso/` and 802 file-based conformance cases in
 total. Of those, 11 cases in `stc/` are explicitly labelled working-draft
-review evidence rather than normative ISO claims. The separate strict-reader WG17 matrix has 372 executable dispositions.
+review evidence rather than normative ISO claims. The separate strict-reader WG17 matrix has 366 executable dispositions.
 The generated `conformance-report.md` is the authoritative source for the current
 executable WG17 syntax result and file-based category totals. Together with regression, documentation-sync, API, example,
 and book-example checks, `npm test` is the release gate.

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

@@ -1,7 +1,7 @@
 # WG17 syntax traceability status
 
 Source: [Conformity Testing I: Syntax](https://www.complang.tuwien.ac.at/ulrich/iso-prolog/conformity_testing)  
-Upstream inventory checked: 2026-08-28
+Upstream inventory checked: 2026-09-01
 
 This ledger counts an upstream case when its WG17 identifier, query, and
 expected ISO disposition are stored in the offline executable matrix. Every
@@ -20,25 +20,25 @@ A represented case still has to pass the executable upstream assertion in
 
 | Measure | Count |
 | --- | ---: |
-| Active upstream cases | 372 |
-| Upstream cases represented in the executable matrix | 372 (100.0%) |
+| Active upstream cases | 366 |
+| Upstream cases represented in the executable matrix | 366 (100.0%) |
 | Not yet traced one-by-one | 0 |
 | Deleted upstream identifiers | #20, #273 |
 
 The matrix runs in strict ISO stream-reader mode as part of `npm test`. The
 3 upstream `waits` cases are checked through EyeProlog's interactive input
-hook. All 372 executable cases are independently checked against the
-upstream Codex expectation. 372 cases additionally retain exact reviewed
-outcomes for stronger regression checking; 0 cases currently rely on the upstream assertion alone.
+hook. All 366 executable cases are independently checked against the
+upstream Codex expectation. 365 cases additionally retain exact reviewed
+outcomes for stronger regression checking; 1 case currently relies on the upstream assertion alone.
 
 ## Traceable evidence
 
 | Executable evidence | Referenced IDs | WG17 cases |
 | --- | ---: | --- |
-| [complete offline executable matrix](../run-wg17.mjs) | 372 | #1–#19, #21–#272, #274–#374 |
+| [complete offline executable matrix](../run-wg17.mjs) | 366 | #1–#19, #21–#272, #274–#368 |
 
-The evidence groups overlap. Their union is **372** active cases:
-#1–#19, #21–#272, #274–#374.
+The evidence groups overlap. Their union is **366** active cases:
+#1–#19, #21–#272, #274–#368.
 
 ## Untraced upstream identifiers
 

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

@@ -1 +1 @@
-univ_results(foo(a, b), [foo, a, b], "a", ['.', 1, []], [1.0]).
+univ_results(foo(a, b), [foo|"ab"], "a", ['.', 1, []], [1.0]).

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

@@ -1,6 +1,6 @@
 {
   "source": "https://www.complang.tuwien.ac.at/ulrich/iso-prolog/conformity_testing",
-  "checkedOn": "2026-08-16",
+  "checkedOn": "2026-09-01",
   "protocol": "Each query is read and executed in strict ISO mode; /**/ rows reuse the preceding setup.",
   "cases": [
     {
@@ -4139,16 +4139,8 @@
       "query": "write_canonical(B+B).",
       "input": "write_canonical(B+B).",
       "readCount": 1,
-      "expected": "e.g. +(_1,\n_1)",
-      "outcome": {
-        "type": "success",
-        "stages": [
-          {
-            "output": "+(_A,_A)",
-            "variables": "['B'=B]"
-          }
-        ]
-      }
+      "expected": "e.g. +(_1,_1)",
+      "assertion": "upstream"
     },
     {
       "id": 228,
@@ -5565,99 +5557,8 @@
           }
         ]
       }
-    },
-    {
-      "id": 369,
-      "query": "writeq(?-).",
-      "input": "writeq(?-).",
-      "readCount": 1,
-      "expected": "?-",
-      "outcome": {
-        "type": "success",
-        "stages": [
-          {
-            "output": "?-",
-            "variables": "[]"
-          }
-        ]
-      }
-    },
-    {
-      "id": 370,
-      "query": "writeq(./*).",
-      "input": "writeq(./*).",
-      "readCount": 1,
-      "expected": "./*",
-      "outcome": {
-        "type": "success",
-        "stages": [
-          {
-            "output": "./*",
-            "variables": "[]"
-          }
-        ]
-      }
-    },
-    {
-      "id": 371,
-      "query": "writeq({*}).",
-      "input": "writeq({*}).",
-      "readCount": 1,
-      "expected": "{*}",
-      "outcome": {
-        "type": "success",
-        "stages": [
-          {
-            "output": "{*}",
-            "variables": "[]"
-          }
-        ]
-      }
-    },
-    {
-      "id": 372,
-      "query": "writeq(.*).",
-      "input": "writeq(.*).",
-      "readCount": 1,
-      "expected": ".*",
-      "outcome": {
-        "type": "success",
-        "stages": [
-          {
-            "output": ".*",
-            "variables": "[]"
-          }
-        ]
-      }
-    },
-    {
-      "id": 373,
-      "query": "writeq(...*).",
-      "input": "writeq(...*).",
-      "readCount": 1,
-      "expected": "...*",
-      "outcome": {
-        "type": "success",
-        "stages": [
-          {
-            "output": "...*",
-            "variables": "[]"
-          }
-        ]
-      }
-    },
-    {
-      "id": 374,
-      "query": "Finis ().",
-      "input": "Finis ().",
-      "readCount": 1,
-      "expected": "syntax err.",
-      "outcome": {
-        "type": "error",
-        "formal": "syntax_error(read_term)"
-      }
     }
   ],
   "sourceRevision": "1.300",
-  "sourceSha256": "d7ca05e90cfafe786d5edca4783e691a356a35508c50b62f5a99bd9057e2cd05"
+  "sourceSha256": "b6590c1c5269e8e62a1ec72a8f04f21f123a77709854a8a66c436df25f3ff418"
 }

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

@@ -1,14 +1,14 @@
 {
   "source": "https://www.complang.tuwien.ac.at/ulrich/iso-prolog/conformity_testing",
-  "checkedOn": "2026-08-28",
+  "checkedOn": "2026-09-01",
   "upstream": {
     "firstId": 1,
-    "lastId": 374,
+    "lastId": 368,
     "deletedIds": [
       20,
       273
     ],
-    "activeCases": 372
+    "activeCases": 366
   },
   "evidence": [
     {