eyeprolog 1.2.28 → 1.2.30

package/README.md

@@ -104,6 +104,9 @@ modules, DCGs, quads, libraries, proofs, and the other documented extensions.
 
 The auditable processor-requirement checklist lives in
 [`test/conformance/ISO-COMPLIANCE.md`](test/conformance/ISO-COMPLIANCE.md).
+The separate [WG17 syntax ledger](test/conformance/WG17-SYNTAX-STATUS.md)
+records executable dispositions for all 366 active upstream syntax cases
+(100% traced) and runs as part of `npm test`.
 EyeProlog does not yet claim independent certification or closure of every
 normative Part 1 requirement.
 

package/conformance-report.md

@@ -6,7 +6,7 @@ This report summarizes the file-based conformance corpus under `test/conformance
 |---|---:|---:|---:|---:|---:|
 | aggregation | 17 | 0 | 0 | 0 | 17 |
 | arithmetic | 38 | 0 | 0 | 0 | 38 |
-| atoms | 22 | 8 | 0 | 0 | 30 |
+| atoms | 23 | 8 | 0 | 0 | 31 |
 | automatic-tabling | 6 | 0 | 0 | 0 | 6 |
 | builtins | 11 | 0 | 0 | 0 | 11 |
 | context | 11 | 0 | 0 | 0 | 11 |
@@ -22,5 +22,5 @@ This report summarizes the file-based conformance corpus under `test/conformance
 | syntax | 12 | 23 | 0 | 0 | 35 |
 | terms | 26 | 3 | 0 | 0 | 29 |
 | unification | 18 | 0 | 0 | 0 | 18 |
-| variables | 16 | 9 | 0 | 0 | 25 |
-| **Total** | **483** | **269** | **19** | **21** | **792** |
+| variables | 16 | 7 | 0 | 0 | 23 |
+| **Total** | **484** | **267** | **19** | **21** | **791** |

package/examples/output/fast-fourier-transform.pl

@@ -1 +1 @@
-fft([0, 1, 2, 3, 4, 5, 6, 7], [n(232, op('+', 216, 231)), n(231, op(*, 217, 230)), n(230, op('+', 222, 229)), n(229, op(*, 223, 228)), n(228, op('+', 224, 227)), n(227, op(*, 225, 226)), n(226, a(7)), n(225, w ^ 4), n(224, a(3)), n(223, w ^ 6), n(222, op('+', 218, 221)), n(221, op(*, 219, 220)), n(220, a(5)), n(219, w ^ 4), n(218, a(1)), n(217, w ^ 7), n(216, op('+', 208, 215)), n(215, op(*, 209, 214)), n(214, op('+', 210, 213)), n(213, op(*, 211, 212)), n(212, a(6)), n(211, w ^ 4), n(210, a(2)), n(209, w ^ 6), n(208, op('+', 204, 207)), n(207, op(*, 205, 206)), n(206, a(4)), n(205, w ^ 4), n(204, a(0)), n(203, op('+', 187, 202)), n(202, op(*, 188, 201)), n(201, op('+', 193, 200)), n(200, op(*, 194, 199)), n(199, op('+', 195, 198)), n(198, op(*, 196, 197)), n(197, a(7)), n(196, w ^ 0), n(195, a(3)), n(194, w ^ 4), n(193, op('+', 189, 192)), n(192, op(*, 190, 191)), n(191, a(5)), n(190, w ^ 0), n(189, a(1)), n(188, w ^ 6), n(187, op('+', 179, 186)), n(186, op(*, 180, 185)), n(185, op('+', 181, 184)), n(184, op(*, 182, 183)), n(183, a(6)), n(182, w ^ 0), n(181, a(2)), n(180, w ^ 4), n(179, op('+', 175, 178)), n(178, op(*, 176, 177)), n(177, a(4)), n(176, w ^ 0), n(175, a(0)), n(174, op('+', 158, 173)), n(173, op(*, 159, 172)), n(172, op('+', 164, 171)), n(171, op(*, 165, 170)), n(170, op('+', 166, 169)), n(169, op(*, 167, 168)), n(168, a(7)), n(167, w ^ 4), n(166, a(3)), n(165, w ^ 2), n(164, op('+', 160, 163)), n(163, op(*, 161, 162)), n(162, a(5)), n(161, w ^ 4), n(160, a(1)), n(159, w ^ 5), n(158, op('+', 150, 157)), n(157, op(*, 151, 156)), n(156, op('+', 152, 155)), n(155, op(*, 153, 154)), n(154, a(6)), n(153, w ^ 4), n(152, a(2)), n(151, w ^ 2), n(150, op('+', 146, 149)), n(149, op(*, 147, 148)), n(148, a(4)), n(147, w ^ 4), n(146, a(0)), n(145, op('+', 129, 144)), n(144, op(*, 130, 143)), n(143, op('+', 135, 142)), n(142, op(*, 136, 141)), n(141, op('+', 137, 140)), n(140, op(*, 138, 139)), n(139, a(7)), n(138, w ^ 0), n(137, a(3)), n(136, w ^ 0), n(135, op('+', 131, 134)), n(134, op(*, 132, 133)), n(133, a(5)), n(132, w ^ 0), n(131, a(1)), n(130, w ^ 4), n(129, op('+', 121, 128)), n(128, op(*, 122, 127)), n(127, op('+', 123, 126)), n(126, op(*, 124, 125)), n(125, a(6)), n(124, w ^ 0), n(123, a(2)), n(122, w ^ 0), n(121, op('+', 117, 120)), n(120, op(*, 118, 119)), n(119, a(4)), n(118, w ^ 0), n(117, a(0)), n(116, op('+', 100, 115)), n(115, op(*, 101, 114)), n(114, op('+', 106, 113)), n(113, op(*, 107, 112)), n(112, op('+', 108, 111)), n(111, op(*, 109, 110)), n(110, a(7)), n(109, w ^ 4), n(108, a(3)), n(107, w ^ 6), n(106, op('+', 102, 105)), n(105, op(*, 103, 104)), n(104, a(5)), n(103, w ^ 4), n(102, a(1)), n(101, w ^ 3), n(100, op('+', 92, 99)), n(99, op(*, 93, 98)), n(98, op('+', 94, 97)), n(97, op(*, 95, 96)), n(96, a(6)), n(95, w ^ 4), n(94, a(2)), n(93, w ^ 6), n(92, op('+', 88, 91)), n(91, op(*, 89, 90)), n(90, a(4)), n(89, w ^ 4), n(88, a(0)), n(87, op('+', 71, 86)), n(86, op(*, 72, 85)), n(85, op('+', 77, 84)), n(84, op(*, 78, 83)), n(83, op('+', 79, 82)), n(82, op(*, 80, 81)), n(81, a(7)), n(80, w ^ 0), n(79, a(3)), n(78, w ^ 4), n(77, op('+', 73, 76)), n(76, op(*, 74, 75)), n(75, a(5)), n(74, w ^ 0), n(73, a(1)), n(72, w ^ 2), n(71, op('+', 63, 70)), n(70, op(*, 64, 69)), n(69, op('+', 65, 68)), n(68, op(*, 66, 67)), n(67, a(6)), n(66, w ^ 0), n(65, a(2)), n(64, w ^ 4), n(63, op('+', 59, 62)), n(62, op(*, 60, 61)), n(61, a(4)), n(60, w ^ 0), n(59, a(0)), n(58, op('+', 42, 57)), n(57, op(*, 43, 56)), n(56, op('+', 48, 55)), n(55, op(*, 49, 54)), n(54, op('+', 50, 53)), n(53, op(*, 51, 52)), n(52, a(7)), n(51, w ^ 4), n(50, a(3)), n(49, w ^ 2), n(48, op('+', 44, 47)), n(47, op(*, 45, 46)), n(46, a(5)), n(45, w ^ 4), n(44, a(1)), n(43, w ^ 1), n(42, op('+', 34, 41)), n(41, op(*, 35, 40)), n(40, op('+', 36, 39)), n(39, op(*, 37, 38)), n(38, a(6)), n(37, w ^ 4), n(36, a(2)), n(35, w ^ 2), n(34, op('+', 30, 33)), n(33, op(*, 31, 32)), n(32, a(4)), n(31, w ^ 4), n(30, a(0)), n(29, op('+', 13, 28)), n(28, op(*, 14, 27)), n(27, op('+', 19, 26)), n(26, op(*, 20, 25)), n(25, op('+', 21, 24)), n(24, op(*, 22, 23)), n(23, a(7)), n(22, w ^ 0), n(21, a(3)), n(20, w ^ 0), n(19, op('+', 15, 18)), n(18, op(*, 16, 17)), n(17, a(5)), n(16, w ^ 0), n(15, a(1)), n(14, w ^ 0), n(13, op('+', 5, 12)), n(12, op(*, 6, 11)), n(11, op('+', 7, 10)), n(10, op(*, 8, 9)), n(9, a(6)), n(8, w ^ 0), n(7, a(2)), n(6, w ^ 0), n(5, op('+', 1, 4)), n(4, op(*, 2, 3)), n(3, a(4)), n(2, w ^ 0), n(1, a(0))]).
+fft([0, 1, 2, 3, 4, 5, 6, 7], [n(232, op(+, 216, 231)), n(231, op(*, 217, 230)), n(230, op(+, 222, 229)), n(229, op(*, 223, 228)), n(228, op(+, 224, 227)), n(227, op(*, 225, 226)), n(226, a(7)), n(225, w ^ 4), n(224, a(3)), n(223, w ^ 6), n(222, op(+, 218, 221)), n(221, op(*, 219, 220)), n(220, a(5)), n(219, w ^ 4), n(218, a(1)), n(217, w ^ 7), n(216, op(+, 208, 215)), n(215, op(*, 209, 214)), n(214, op(+, 210, 213)), n(213, op(*, 211, 212)), n(212, a(6)), n(211, w ^ 4), n(210, a(2)), n(209, w ^ 6), n(208, op(+, 204, 207)), n(207, op(*, 205, 206)), n(206, a(4)), n(205, w ^ 4), n(204, a(0)), n(203, op(+, 187, 202)), n(202, op(*, 188, 201)), n(201, op(+, 193, 200)), n(200, op(*, 194, 199)), n(199, op(+, 195, 198)), n(198, op(*, 196, 197)), n(197, a(7)), n(196, w ^ 0), n(195, a(3)), n(194, w ^ 4), n(193, op(+, 189, 192)), n(192, op(*, 190, 191)), n(191, a(5)), n(190, w ^ 0), n(189, a(1)), n(188, w ^ 6), n(187, op(+, 179, 186)), n(186, op(*, 180, 185)), n(185, op(+, 181, 184)), n(184, op(*, 182, 183)), n(183, a(6)), n(182, w ^ 0), n(181, a(2)), n(180, w ^ 4), n(179, op(+, 175, 178)), n(178, op(*, 176, 177)), n(177, a(4)), n(176, w ^ 0), n(175, a(0)), n(174, op(+, 158, 173)), n(173, op(*, 159, 172)), n(172, op(+, 164, 171)), n(171, op(*, 165, 170)), n(170, op(+, 166, 169)), n(169, op(*, 167, 168)), n(168, a(7)), n(167, w ^ 4), n(166, a(3)), n(165, w ^ 2), n(164, op(+, 160, 163)), n(163, op(*, 161, 162)), n(162, a(5)), n(161, w ^ 4), n(160, a(1)), n(159, w ^ 5), n(158, op(+, 150, 157)), n(157, op(*, 151, 156)), n(156, op(+, 152, 155)), n(155, op(*, 153, 154)), n(154, a(6)), n(153, w ^ 4), n(152, a(2)), n(151, w ^ 2), n(150, op(+, 146, 149)), n(149, op(*, 147, 148)), n(148, a(4)), n(147, w ^ 4), n(146, a(0)), n(145, op(+, 129, 144)), n(144, op(*, 130, 143)), n(143, op(+, 135, 142)), n(142, op(*, 136, 141)), n(141, op(+, 137, 140)), n(140, op(*, 138, 139)), n(139, a(7)), n(138, w ^ 0), n(137, a(3)), n(136, w ^ 0), n(135, op(+, 131, 134)), n(134, op(*, 132, 133)), n(133, a(5)), n(132, w ^ 0), n(131, a(1)), n(130, w ^ 4), n(129, op(+, 121, 128)), n(128, op(*, 122, 127)), n(127, op(+, 123, 126)), n(126, op(*, 124, 125)), n(125, a(6)), n(124, w ^ 0), n(123, a(2)), n(122, w ^ 0), n(121, op(+, 117, 120)), n(120, op(*, 118, 119)), n(119, a(4)), n(118, w ^ 0), n(117, a(0)), n(116, op(+, 100, 115)), n(115, op(*, 101, 114)), n(114, op(+, 106, 113)), n(113, op(*, 107, 112)), n(112, op(+, 108, 111)), n(111, op(*, 109, 110)), n(110, a(7)), n(109, w ^ 4), n(108, a(3)), n(107, w ^ 6), n(106, op(+, 102, 105)), n(105, op(*, 103, 104)), n(104, a(5)), n(103, w ^ 4), n(102, a(1)), n(101, w ^ 3), n(100, op(+, 92, 99)), n(99, op(*, 93, 98)), n(98, op(+, 94, 97)), n(97, op(*, 95, 96)), n(96, a(6)), n(95, w ^ 4), n(94, a(2)), n(93, w ^ 6), n(92, op(+, 88, 91)), n(91, op(*, 89, 90)), n(90, a(4)), n(89, w ^ 4), n(88, a(0)), n(87, op(+, 71, 86)), n(86, op(*, 72, 85)), n(85, op(+, 77, 84)), n(84, op(*, 78, 83)), n(83, op(+, 79, 82)), n(82, op(*, 80, 81)), n(81, a(7)), n(80, w ^ 0), n(79, a(3)), n(78, w ^ 4), n(77, op(+, 73, 76)), n(76, op(*, 74, 75)), n(75, a(5)), n(74, w ^ 0), n(73, a(1)), n(72, w ^ 2), n(71, op(+, 63, 70)), n(70, op(*, 64, 69)), n(69, op(+, 65, 68)), n(68, op(*, 66, 67)), n(67, a(6)), n(66, w ^ 0), n(65, a(2)), n(64, w ^ 4), n(63, op(+, 59, 62)), n(62, op(*, 60, 61)), n(61, a(4)), n(60, w ^ 0), n(59, a(0)), n(58, op(+, 42, 57)), n(57, op(*, 43, 56)), n(56, op(+, 48, 55)), n(55, op(*, 49, 54)), n(54, op(+, 50, 53)), n(53, op(*, 51, 52)), n(52, a(7)), n(51, w ^ 4), n(50, a(3)), n(49, w ^ 2), n(48, op(+, 44, 47)), n(47, op(*, 45, 46)), n(46, a(5)), n(45, w ^ 4), n(44, a(1)), n(43, w ^ 1), n(42, op(+, 34, 41)), n(41, op(*, 35, 40)), n(40, op(+, 36, 39)), n(39, op(*, 37, 38)), n(38, a(6)), n(37, w ^ 4), n(36, a(2)), n(35, w ^ 2), n(34, op(+, 30, 33)), n(33, op(*, 31, 32)), n(32, a(4)), n(31, w ^ 4), n(30, a(0)), n(29, op(+, 13, 28)), n(28, op(*, 14, 27)), n(27, op(+, 19, 26)), n(26, op(*, 20, 25)), n(25, op(+, 21, 24)), n(24, op(*, 22, 23)), n(23, a(7)), n(22, w ^ 0), n(21, a(3)), n(20, w ^ 0), n(19, op(+, 15, 18)), n(18, op(*, 16, 17)), n(17, a(5)), n(16, w ^ 0), n(15, a(1)), n(14, w ^ 0), n(13, op(+, 5, 12)), n(12, op(*, 6, 11)), n(11, op(+, 7, 10)), n(10, op(*, 8, 9)), n(9, a(6)), n(8, w ^ 0), n(7, a(2)), n(6, w ^ 0), n(5, op(+, 1, 4)), n(4, op(*, 2, 3)), n(3, a(4)), n(2, w ^ 0), n(1, a(0))]).

package/package.json

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

package/src/io.js

@@ -1,6 +1,57 @@
 // Synchronous ISO stream state shared by a solver and all of its inner solvers.
 import { BufferCtor, fs } from './platform.js';
 
+const INVALID_UTF8_SENTINEL = '\udc00';
+
+export class InvalidCharacterEncodingError extends Error {
+  constructor() {
+    super('invalid character encoding');
+    this.name = 'InvalidCharacterEncodingError';
+  }
+}
+
+function decodeUtf8ForTextStream(buffer) {
+  const bytes = buffer;
+  let text = '';
+  for (let i = 0; i < bytes.length;) {
+    const first = bytes[i];
+    if (first <= 0x7f) {
+      text += String.fromCodePoint(first);
+      i++;
+      continue;
+    }
+
+    let width = 0;
+    let code = 0;
+    let minimum = 0;
+    if (first >= 0xc2 && first <= 0xdf) { width = 2; code = first & 0x1f; minimum = 0x80; }
+    else if (first >= 0xe0 && first <= 0xef) { width = 3; code = first & 0x0f; minimum = 0x800; }
+    else if (first >= 0xf0 && first <= 0xf4) { width = 4; code = first & 0x07; minimum = 0x10000; }
+
+    let valid = width !== 0 && i + width <= bytes.length;
+    if (valid) {
+      for (let j = 1; j < width; j++) {
+        const continuation = bytes[i + j];
+        if ((continuation & 0xc0) !== 0x80) { valid = false; break; }
+        code = (code << 6) | (continuation & 0x3f);
+      }
+      if (code < minimum || code > 0x10ffff || (code >= 0xd800 && code <= 0xdfff)) valid = false;
+    }
+
+    if (!valid) {
+      // A lone low surrogate cannot be produced by valid UTF-8. Keep it as a
+      // positional marker so open/4 succeeds and character input predicates
+      // can report representation_error(character) when the bad byte is read.
+      text += INVALID_UTF8_SENTINEL;
+      i++;
+      continue;
+    }
+    text += String.fromCodePoint(code);
+    i += width;
+  }
+  return text;
+}
+
 export class StreamManager {
   constructor(options = {}) {
     this.nextId = 2;
@@ -32,11 +83,17 @@ export class StreamManager {
     if (!fs) throw new Error('file streams are unavailable in this runtime');
     const type = options.type ?? 'text';
     let content = type === 'binary' ? [] : '';
-    if (mode === 'read') content = fs.readFileSync(path, type === 'binary' ? null : 'utf8');
-    else if (mode === 'append' && fs.existsSync(path)) content = fs.readFileSync(path, type === 'binary' ? null : 'utf8');
+    let strictUtf8 = false;
+    if (mode === 'read') {
+      const raw = fs.readFileSync(path);
+      if (type === 'binary') content = raw;
+      else { content = decodeUtf8ForTextStream(raw); strictUtf8 = true; }
+    } else if (mode === 'append' && fs.existsSync(path)) {
+      content = fs.readFileSync(path, type === 'binary' ? null : 'utf8');
+    }
     if (BufferCtor?.isBuffer(content)) content = [...content];
     return this.add({
-      id: this.nextId++, alias: options.alias ?? null, mode, type, content,
+      id: this.nextId++, alias: options.alias ?? null, mode, type, content, strictUtf8,
       position: mode === 'append' ? content.length : 0, path,
       reposition: options.reposition ?? false,
       eofAction: options.eof_action ?? 'error', standard: false,
@@ -52,8 +109,19 @@ export class StreamManager {
   }
   readUnit(stream, peek = false) {
     if (stream.position >= stream.content.length) return null;
-    const value = stream.type === 'binary' ? stream.content[stream.position] : String(stream.content)[stream.position];
-    if (!peek) stream.position++;
+    if (stream.type === 'binary') {
+      const value = stream.content[stream.position];
+      if (!peek) stream.position++;
+      stream.pastEnd = false;
+      return value;
+    }
+    const source = String(stream.content);
+    if (stream.strictUtf8 && source[stream.position] === INVALID_UTF8_SENTINEL) {
+      throw new InvalidCharacterEncodingError();
+    }
+    const codePoint = source.codePointAt(stream.position);
+    const value = String.fromCodePoint(codePoint);
+    if (!peek) stream.position += value.length;
     stream.pastEnd = false;
     return value;
   }

package/src/iso.js

@@ -172,6 +172,7 @@ export const isoBuiltins = {
 export const eyePrologLibraryBuiltins = {
   register(registry) {
     registry.add('eyeprolog__call_nth', 2, callNthBuiltin, { eyePrologLibrary: true });
+    registry.add('eyeprolog__countall', 2, countAllBuiltin, { eyePrologLibrary: true });
     registry.add('eyeprolog__freeze', 2, freezeBuiltin, { eyePrologLibrary: true });
   },
 };
@@ -1023,7 +1024,15 @@ function inputUnitBuiltin(name) {
       stream.pastEnd = false;
     }
     const peek = name.startsWith('peek');
-    const unit = solver.io.readUnit(stream, peek);
+    let unit;
+    try {
+      unit = solver.io.readUnit(stream, peek);
+    } catch (error) {
+      if (error?.name === 'InvalidCharacterEncodingError') {
+        throw new PrologError('representation_error(character)');
+      }
+      throw error;
+    }
     if (unit == null && !peek) stream.pastEnd = true;
     const result = unit == null ? (binary ? numberTerm(-1) : name.endsWith('code') ? numberTerm(-1) : atom('end_of_file'))
       : binary ? numberTerm(unit) : name.endsWith('code') ? numberTerm(unit.codePointAt(0)) : atom(unit);
@@ -1072,7 +1081,7 @@ function isTerminatingFullStop(source, index) {
   return true;
 }
 
-const termGraphicCharacters = new Set('#$&*+-./<=>@^~\\:');
+const termGraphicCharacters = new Set('#$&*+-./<=>?@^~\\:');
 function continuesGraphicToken(source, index) {
   return index > 0 && termGraphicCharacters.has(source[index - 1]);
 }
@@ -1272,9 +1281,9 @@ function* readTermBuiltin({ solver, goal, env }) {
   yield next;
 }
 function defaultTermWriteOptions(mode) {
-  if (mode === 'writeq') return { quoted: true, ignoreOps: false, numbervars: true, variableNames: new Map(), compact: true, operatorAtomsAsArgs: true };
-  if (mode === 'canonical') return { quoted: true, ignoreOps: true, numbervars: false, variableNames: new Map(), compact: true, operatorAtomsAsArgs: true };
-  return { quoted: false, ignoreOps: false, numbervars: true, variableNames: new Map(), compact: true, operatorAtomsAsArgs: true };
+  if (mode === 'writeq') return { quoted: true, ignoreOps: false, numbervars: true, variableNames: new Map(), compact: true, operatorAtomsAsArgs: true, doubleQuotes: null };
+  if (mode === 'canonical') return { quoted: true, ignoreOps: true, numbervars: false, variableNames: new Map(), compact: true, operatorAtomsAsArgs: true, doubleQuotes: null };
+  return { quoted: false, ignoreOps: false, numbervars: true, variableNames: new Map(), compact: true, operatorAtomsAsArgs: true, doubleQuotes: null };
 }
 
 function writeOptionBoolean(value, env, option) {
@@ -1323,6 +1332,7 @@ function termWriteOptions(term, env, mode = 'write') {
     if (option.name === 'quoted') result.quoted = writeOptionBoolean(option.args[0], env, option);
     else if (option.name === 'ignore_ops') result.ignoreOps = writeOptionBoolean(option.args[0], env, option);
     else if (option.name === 'numbervars') result.numbervars = writeOptionBoolean(option.args[0], env, option);
+    else if (option.name === 'double_quotes') result.doubleQuotes = writeOptionBoolean(option.args[0], env, option);
     else if (option.name === 'variable_names') result.variableNames = writeVariableNames(option.args[0], env, option);
     else throw new PrologError('domain_error(write_option)', option);
   }
@@ -1345,6 +1355,11 @@ function* writeTermBuiltin({ solver, goal, env }) {
   const stream = goal.arity === 2 ? solver.io.resolve(solver.io.currentOutput) : requireStream(solver, goal.args[0], env, 'write');
   if (stream.type !== 'text') throw new PrologError('permission_error(output, binary_stream)', streamHandle(stream.id));
   const options = termWriteOptions(goal.args[goal.arity - 1], env);
+  if (options.doubleQuotes === true) {
+    options.doubleQuotes = solver.prologFlags.get('double_quotes')?.value?.name ?? 'chars';
+  } else {
+    options.doubleQuotes = null;
+  }
   solver.io.writeUnit(stream, formatTermForWrite(goal.args[goal.arity - 2], env, {
     ...options,
     operators: solver.program.operators.values(),
@@ -1667,6 +1682,8 @@ function numberListText(list, env, kind, valueIsBound) {
     : String.fromCodePoint(Number(item.name))).join('');
 }
 
+const numberSyntaxError = new PrologError('syntax_error(number)');
+
 function numberListBuiltin(kind) {
   return function* ({ goal, env }) {
     const value = deref(goal.args[0], env);
@@ -1678,7 +1695,7 @@ function numberListBuiltin(kind) {
     if (value.type === NUMBER) {
       if (text != null) {
         const parsed = parseIsoNumber(text);
-        if (parsed == null) throw new PrologError('syntax_error(number)');
+        if (parsed == null) throw numberSyntaxError;
         if (sameNumber(value, parsed)) yield next;
         return;
       }
@@ -1688,7 +1705,7 @@ function numberListBuiltin(kind) {
       return;
     }
     const parsed = parseIsoNumber(text);
-    if (parsed == null) throw new PrologError('syntax_error(number)');
+    if (parsed == null) throw numberSyntaxError;
     if (unify(goal.args[0], parsed, next)) yield next;
   };
 }
@@ -1835,6 +1852,32 @@ function* callClosureBuiltin({ solver, goal, env }) {
   }
 }
 
+function* countAllBuiltin({ solver, goal, env }) {
+  const requested = deref(goal.args[1], env);
+  // Validate Count before inspecting or executing Goal. This preserves the
+  // expected error priority for e.g. countall(throw(x), -1).
+  if (requested.type !== VAR) {
+    if (requested.type !== NUMBER || !isDecimalInteger(requested.name)) {
+      throw new PrologError('type_error(integer)', requested);
+    }
+    if (BigInt(requested.name) < 0n) {
+      throw new PrologError('domain_error(not_less_than_zero)', requested);
+    }
+  }
+
+  const invoked = callable(goal.args[0], env);
+  const child = solver.cloneForInnerGoal();
+  let count = 0n;
+  try {
+    for (const _ of child.solve([invoked], env.clone(), 0)) count++;
+  } finally {
+    solver.absorbStatsFrom(child);
+  }
+
+  const next = env.clone();
+  if (unify(goal.args[1], numberTerm(count), next)) yield next;
+}
+
 function* callNthBuiltin({ solver, goal, env }) {
   const requestedTerm = deref(goal.args[1], env);
   // Zero is the one Nth value that fails before Goal is inspected.

package/src/lib/clpz.pl

@@ -8,21 +8,21 @@
 */
 
 :- module(clpz, [
-    '#>'/2,
-    '#<'/2,
-    '#>='/2,
-    '#=<'/2,
-    '#='/2,
-    '#\\='/2,
+    ('#>')/2,
+    ('#<')/2,
+    ('#>=')/2,
+    ('#=<')/2,
+    ('#=')/2,
+    ('#\\=')/2,
     (#\\)/1,
-    '#<==>'/2,
-    '#==>'/2,
-    '#<=='/2,
-    '#\\/'/2,
+    ('#<==>')/2,
+    ('#==>')/2,
+    ('#<==')/2,
+    ('#\\/')/2,
     (#\\)/2,
-    '#/\\'/2,
-    in/2,
-    ins/2,
+    ('#/\\')/2,
+    ('in')/2,
+    ('ins')/2,
     all_different/1,
     all_distinct/1,
     nvalue/2,

package/src/lib/iso_ext.pl

@@ -17,9 +17,7 @@
 % Trealla. These definitions use only EyeProlog's ISO profile; extensions that
 % require runtime cleanup, choice-point, alarm, or timeout hooks are omitted.
 
-countall(Goal, Count) :-
-    findall(1, Goal, Ones),
-    iso_ext__length(Ones, 0, Count).
+countall(Goal, Count) :- eyeprolog__countall(Goal, Count).
 
 forall(Condition, Action) :-
     findall(Action, Condition, Actions),

package/src/lib/lists.pl

@@ -66,7 +66,7 @@ max_list([X|Xs], Max) :- lists__max_list(Xs, X, Max).
 
 list_to_set(List, Set) :- lists__list_to_set(List, [], Set).
 
-countall(Goal, Count) :- findall(1, Goal, Ones), lists__length_count(Ones, 0, Count).
+countall(Goal, Count) :- eyeprolog__countall(Goal, Count).
 
 set_nth0(0, [_|Xs], X, [X|Xs]).
 set_nth0(N, [Y|Ys], X, [Y|Zs]) :-

package/src/lib/prologue.pl

@@ -178,9 +178,7 @@ foldl(Closure, [A|As], [B|Bs], [C|Cs], Acc0, Acc) :-
     call(Closure, A, B, C, Acc0, Acc1),
     foldl(Closure, As, Bs, Cs, Acc1, Acc).
 
-countall(Goal, Count) :-
-    findall(1, Goal, Ones),
-    length(Ones, Count).
+countall(Goal, Count) :- eyeprolog__countall(Goal, Count).
 
 prologue__integer_or_variable(X) :- var(X), !.
 prologue__integer_or_variable(X) :- prologue__integer(X).

package/src/parser.js

@@ -33,7 +33,7 @@ function isPlainAtomStartCode(code) {
   return code >= 97 && code <= 122;
 }
 
-const graphicAtomChars = '#$&*+-./<=>@^~\\:';
+const graphicAtomChars = '#$&*+-./<=>?@^~\\:';
 
 // ISO operator syntax is lowered to the same ordinary compound terms used by
 // canonical notation. Commas remain separators except inside parentheses.
@@ -650,7 +650,7 @@ class Parser {
         const postfix = postfixName == null ? null : this.postfixOperators.get(postfixName);
         if (!postfix || postfix.precedence < minPrecedence ||
             (strictPostfixPrecedence === postfix.precedence)) break;
-        if (this.strictIso && leftIsBareOperatorAtom) {
+        if (leftIsBareOperatorAtom) {
           throw new Error(`parse line ${this.token.line}: operator atom ${left.name} requires parentheses as an operand`);
         }
         const name = postfixName;
@@ -659,7 +659,7 @@ class Parser {
         strictPostfixPrecedence = postfix.strict ? postfix.precedence : null;
         continue;
       }
-      if (this.strictIso && leftIsBareOperatorAtom) {
+      if (leftIsBareOperatorAtom) {
         throw new Error(`parse line ${this.token.line}: operator atom ${left.name} requires parentheses as an operand`);
       }
       strictPostfixPrecedence = null;
@@ -682,7 +682,7 @@ class Parser {
         }
       }
     }
-    if (this.strictIso && leftIsBareOperatorAtom && left.type === ATOM && !allowOperatorAtom) {
+    if (leftIsBareOperatorAtom && left.type === ATOM && !allowOperatorAtom) {
       throw new Error(`parse line ${this.token.line}: operator atom ${left.name} requires parentheses as an operand`);
     }
     return left;
@@ -693,7 +693,7 @@ class Parser {
     // permits an operator atom directly as an `arg`; a leading `:-` cannot be
     // prefix operator notation at argument priority, so it denotes the atom.
     if (this.token.type === TOK.IF) {
-      if (this.strictIso && !allowOperatorAtom) {
+      if (!allowOperatorAtom) {
         throw new Error(`parse line ${this.token.line}: operator atom :- requires argument context or parentheses`);
       }
       this.advance();
@@ -732,7 +732,7 @@ class Parser {
       // the operator as an atom instead of reporting a misleading bad-term
       // error.
       if ([TOK.COMMA, TOK.RPAREN, TOK.RBRACKET, TOK.BAR, TOK.DOT].includes(this.token.type)) {
-        if (this.strictIso && !allowOperatorAtom && this.token.type !== TOK.DOT) {
+        if (!allowOperatorAtom && this.token.type !== TOK.DOT) {
           throw new Error(`parse line ${this.token.line}: operator atom ${op} requires argument context or parentheses`);
         }
         return atom(op);
@@ -788,11 +788,12 @@ class Parser {
     }
     if (this.token.type === TOK.ATOM) {
       const name = this.token.text;
+      const quoted = this.token.quoted === true;
       this.advance();
       if (this.token.type === TOK.LPAREN && this.token.precededByLayout !== true) {
         return this.parseFunctionalNotation(name);
       }
-      if (this.strictIso && !allowOperatorAtom &&
+      if (!quoted && !allowOperatorAtom &&
           (this.infixOperators.has(name) || this.prefixOperators.has(name) || this.postfixOperators.has(name))) {
         throw new Error(`parse line ${this.token.line}: operator atom ${name} requires argument context or parentheses`);
       }
@@ -1385,6 +1386,8 @@ export function parseProgramText(source, options = {}) {
   return parseClauses(source, options);
 }
 
+const invalidNumberTokenError = new Error('not exactly one number token');
+
 export function parseNumberTokenText(text) {
   const source = String(text ?? '');
   let position = 0;
@@ -1401,20 +1404,20 @@ export function parseNumberTokenText(text) {
     position += 2;
     let value = source[position] ?? '';
     if (!value || (value !== ' ' && isWhitespaceCode(value.charCodeAt(0)))) {
-      throw new Error('not exactly one number token');
+      throw invalidNumberTokenError;
     }
     position++;
     const firstCode = value.charCodeAt(0);
     if (firstCode >= 0xd800 && firstCode <= 0xdbff) {
       const secondCode = source.charCodeAt(position);
-      if (secondCode < 0xdc00 || secondCode > 0xdfff) throw new Error('not exactly one number token');
+      if (secondCode < 0xdc00 || secondCode > 0xdfff) throw invalidNumberTokenError;
       value += source[position++];
     } else if (firstCode >= 0xdc00 && firstCode <= 0xdfff) {
-      throw new Error('not exactly one number token');
+      throw invalidNumberTokenError;
     }
 
     if (value === "'") {
-      if (source[position] !== "'") throw new Error('not exactly one number token');
+      if (source[position] !== "'") throw invalidNumberTokenError;
       position++;
     } else if (value === '\\') {
       const escaped = source[position++] ?? '';
@@ -1424,25 +1427,25 @@ export function parseNumberTokenText(text) {
       } else if (escaped === 'x') {
         let digits = '';
         while (/^[0-9A-Fa-f]$/.test(source[position] ?? '')) digits += source[position++];
-        if (!digits || source[position++] !== '\\') throw new Error('not exactly one number token');
+        if (!digits || source[position++] !== '\\') throw invalidNumberTokenError;
         const code = Number.parseInt(digits, 16);
-        if (code > 0x10ffff || (code >= 0xd800 && code <= 0xdfff)) throw new Error('not exactly one number token');
+        if (code > 0x10ffff || (code >= 0xd800 && code <= 0xdfff)) throw invalidNumberTokenError;
         value = String.fromCodePoint(code);
       } else if (/^[0-7]$/.test(escaped)) {
         let digits = escaped;
         while (/^[0-7]$/.test(source[position] ?? '')) digits += source[position++];
-        if (source[position++] !== '\\') throw new Error('not exactly one number token');
+        if (source[position++] !== '\\') throw invalidNumberTokenError;
         const code = Number.parseInt(digits, 8);
-        if (code > 0x10ffff || (code >= 0xd800 && code <= 0xdfff)) throw new Error('not exactly one number token');
+        if (code > 0x10ffff || (code >= 0xd800 && code <= 0xdfff)) throw invalidNumberTokenError;
         value = String.fromCodePoint(code);
       } else if (escaped === '\\' || escaped === "'" || escaped === '"' || escaped === '`') {
         value = escaped;
       } else {
-        throw new Error('not exactly one number token');
+        throw invalidNumberTokenError;
       }
     }
 
-    if (position !== source.length) throw new Error('not exactly one number token');
+    if (position !== source.length) throw invalidNumberTokenError;
     const code = value.codePointAt(0);
     return numberTerm(String(negative ? -code : code));
   }
@@ -1454,7 +1457,7 @@ export function parseNumberTokenText(text) {
     position += 2;
     let digits = '';
     while (digitPattern.test(source[position] ?? '')) digits += source[position++];
-    if (!digits || position !== source.length) throw new Error('not exactly one number token');
+    if (!digits || position !== source.length) throw invalidNumberTokenError;
     let integer = 0n;
     for (const digit of digits) integer = integer * BigInt(radix) + BigInt(Number.parseInt(digit, radix));
     if (negative) integer = -integer;
@@ -1463,7 +1466,7 @@ export function parseNumberTokenText(text) {
 
   const digitsStart = position;
   while (isDigitCode(source.charCodeAt(position))) position++;
-  if (position === digitsStart) throw new Error('not exactly one number token');
+  if (position === digitsStart) throw invalidNumberTokenError;
   let hasFraction = false;
   if (source[position] === '.' && isDigitCode(source.charCodeAt(position + 1))) {
     hasFraction = true;
@@ -1475,9 +1478,9 @@ export function parseNumberTokenText(text) {
     if (source[position] === '+' || source[position] === '-') position++;
     const exponentStart = position;
     while (isDigitCode(source.charCodeAt(position))) position++;
-    if (position === exponentStart) throw new Error('not exactly one number token');
+    if (position === exponentStart) throw invalidNumberTokenError;
   }
-  if (position !== source.length) throw new Error('not exactly one number token');
+  if (position !== source.length) throw invalidNumberTokenError;
   if (/^-?\d+$/.test(source)) return numberTerm(BigInt(source).toString());
   if (Object.is(Number(source), -0)) return numberTerm('0.0');
   return numberTerm(source);

package/src/repl.js

@@ -614,6 +614,7 @@ function formatAnswer(engine, state, variables, env) {
       // current operator atoms in argument and list-element positions without
       // quotes, just as writeq/1 already prints them.
       operatorAtomsAsArgs: true,
+      doubleQuotes: state.solver.prologFlags.get('double_quotes')?.value?.name ?? 'chars',
     })}`);
   }
   return bindings.length === 0 ? 'true' : bindings.join(', ');

package/src/solver.js

@@ -291,8 +291,8 @@ export class Solver {
         const rest = selectedIndex === 0 ? goals.slice(1) : [...goals.slice(0, selectedIndex), ...goals.slice(selectedIndex + 1)];
         if (goal.type === 'atom' && goal.name === '!' && goal.arity === 0) {
           const marker = active[active.length - 1] ?? null;
-          this.cutEpoch++;
           if (marker) marker.cutEpoch = (marker.cutEpoch ?? 0) + 1;
+          else this.cutEpoch++;
           for (const solveStack of this.solveStacks) {
             for (let i = solveStack.length - 1; i >= 0; i--) {
               if (marker == null || solveStack[i].active?.includes(marker)) solveStack.splice(i, 1);
@@ -446,6 +446,14 @@ export class Solver {
     }
   }
 
+  checkMemoryReservation(bytes) {
+    if (!Number.isFinite(this.maxMemoryBytes) || !Number.isFinite(bytes) || bytes <= 0) return;
+    const used = usedHeapSize();
+    if (used != null && bytes > Math.max(0, this.maxMemoryBytes - used)) {
+      throw new PrologError('resource_error(memory)');
+    }
+  }
+
   *solveUserGoal(goal, rest, env, depth) {
     this.stats.solve_one_goal_calls++;
     if (depth > this.maxDepth) {
@@ -764,6 +772,14 @@ function* fixedLengthSolutions(solver, list, length, env) {
     return;
   }
 
+  // A materialized list cell with its fresh variable occupies roughly 216
+  // bytes on current V8 builds. Reserve conservatively before constructing a
+  // huge list so a resource_error does not leave the heap at the soft limit
+  // and poison the next query.
+  const estimatedListCellBytes = 256n;
+  if (remaining > BigInt(Number.MAX_SAFE_INTEGER)) throw new PrologError('resource_error(memory)');
+  solver.checkMemoryReservation(Number(remaining * estimatedListCellBytes));
+
   const id = nextFreshId();
   let suffix = emptyList();
   for (let index = 0n; index < remaining; index++) {

package/src/standard-library.js

@@ -45,7 +45,7 @@ function libraryUrl(filename) {
 }
 
 export const eyePrologNativeLibraryIndicators = Object.freeze([
-  'call_nth/2', 'freeze/2',
+  'call_nth/2', 'freeze/2', 'countall/2',
   '#>/2', '#</2', '#>=/2', '#=</2', '#=/2', '#\\=/2', '#\\/1',
   '#<==>/2', '#==>/2', '#<==/2', '#\\//2', '#\\/2', '#/\\/2',
   'in/2', 'ins/2', 'all_different/1', 'all_distinct/1', 'nvalue/2', 'sum/3',
@@ -65,7 +65,7 @@ export const eyePrologPortableLibraryIndicators = Object.freeze([
   'matches/2', 'join/3', 'substring/4', 'member/2', 'select/3', 'last/2',
   'nth0/3', 'nth0/4', 'nth1/3', 'nth1/4', 'set_nth0/4', 'take/3', 'drop/3', 'slice/4', 'reverse/2',
   'length/2', 'sum_list/2', 'min_list/2', 'max_list/2', 'list_to_set/2',
-  'countall/2', 'succ/2', 'foldl/4', 'foldl/5', 'foldl/6',
+  'succ/2', 'foldl/4', 'foldl/5', 'foldl/6',
   'forall/2', 'cfor/3', 'findall/4', 'variant/2', 'uuid/3',
 ]);
 export const eyePrologLibraryIndicators = Object.freeze([

package/src/write.js

@@ -4,7 +4,7 @@ import {
   Env, deref, isCons, isEmptyList,
 } from './term.js';
 
-const graphicAtomCharacters = new Set('!#$&*+-/<=>@^~\\'.split(''));
+const graphicAtomCharacters = new Set('!#$&*+-/<=>?@^~\\'.split(''));
 const compactInfixOperators = new Set([':', '..']);
 
 function quotedControlEscape(ch) {
@@ -29,7 +29,6 @@ function atomNeedsQuotes(name) {
   if (name === '[]' || name === '{}') return false;
   if (name === '...') return false;
   if (name.startsWith('/*')) return true;
-  if (name === '\\+' || name === '+' || name === '-' || name === '\\') return true;
   if (/^[a-z][A-Za-z0-9_]*$/.test(name)) return false;
   for (const ch of name) if (!graphicAtomCharacters.has(ch)) return true;
   return false;
@@ -107,7 +106,7 @@ function writeNumberedVariable(index) {
 function operatorName(name) {
   if (name === '.' || name.startsWith('/*')) return quoteAtom(name);
   if (/^[a-z][A-Za-z0-9_]*$/.test(name)) return name;
-  if (/^[!#$&*+\-./<=>@^~\\;:]+$/.test(name)) return name;
+  if (/^[!#$&*+\-./<=>?@^~\\;:]+$/.test(name)) return name;
   return quoteAtom(name);
 }
 
@@ -178,6 +177,10 @@ function format(term, env, options, table, maxPriority = 1200, context = 'term')
     // without quoting. Keep lexical exceptions such as `|` quoted.
     if (options.operatorAtomsAsArgs && context === 'argument' && table.has(resolved.name)) return operatorName(resolved.name);
     if (!options.ignoreOps && context !== 'argument' && table.has(resolved.name)) {
+      // The predefined ?- atom is safe at the end of a written term and is a
+      // graphic atom in ISO syntax. Do not add the legacy parentheses that
+      // issue #35 reports for writeq(?-).
+      if (resolved.name === '?-') return operatorName(resolved.name);
       const definitions = table.get(resolved.name);
       const requiresParentheses = definitions.some(({ specifier }) =>
         ['fx', 'fy', 'xfx', 'xfy', 'yfx'].includes(specifier));

package/test/conformance/ISO-COMPLIANCE.md

@@ -35,7 +35,7 @@ error-ordering alternative to an individual executable assertion.
 | 7.4 — Prolog text and directives | audit | All Part 1 directive indicators are parsed; include/ensure-loaded/operator/flag/character-conversion behavior has executable coverage. Cross-text `multifile/1` and ordering constraints require explicit shall-by-shall audit. |
 | 7.5-7.6 — database and term/clause conversion | audit | Dynamic database and logical-update-view suites. Strict mode restores Part 1 private-static/public-dynamic `clause/2` access. Public/private and multi-text requirements still need complete mapping. |
 | 7.7 — execution and backtracking | audit | Control/search suites. Strict mode disables EyeProlog automatic tabling, cycle guards, and recursive numeric shortcuts so core execution uses ordinary clause selection/backtracking. |
-| 7.8 — control constructs and exceptions | audit | call, cut, conjunction, disjunction, if-then, catch/throw, renamed-copy tests. |
+| 7.8 — control constructs and exceptions | audit | call, cut, conjunction, disjunction (including failed branches after callee-local cuts), if-then, catch/throw, renamed-copy tests. |
 | 7.9 — expression evaluation | audit | Arithmetic/evaluation/error suites, including Corrigenda. Exceptional-value/error-precedence matrix remains to be exhaustively enumerated. |
 | 7.10 — input/output concepts | audit | Stream, character/byte I/O, read/write options, operator-sensitive write-back, Corrigendum 3 writer cases. Full option cross-product remains open. |
 | 7.11 — flags | audit | Required Part 1 flags implemented. Normal and strict modes use the ISO `unknown=error` default; strict mode excludes the EyeProlog `occurs_check` extension. |

package/test/conformance/README.md

@@ -9,7 +9,8 @@ The suite is intentionally file-based. Exact standard output, errors, warnings,
 and proof output test the behavior of the JavaScript implementation.
 [ISO-MATRIX.md](ISO-MATRIX.md) maps Part 1 normative clause families, all three
 corrigenda, Part 2 modules, and Part 3 definite clause grammars to representative
-executable cases.
+executable cases. [WG17-SYNTAX-STATUS.md](WG17-SYNTAX-STATUS.md) records the
+complete one-to-one trace for all 366 active upstream syntax cases.
 
 “Conformance” here means conformance to EyeProlog's documented ISO compatibility
 profile and implementation extensions. The default registry covers the exact
@@ -68,6 +69,12 @@ Run the Part 1 + Corrigenda strict-core processor gate:
 npm run test:iso-strict
 ```
 
+Run the complete WG17 syntax matrix independently:
+
+```sh
+npm run test:wg17-syntax
+```
+
 Summarize conformance coverage by category:
 
 ```sh
@@ -102,10 +109,11 @@ Selected cases are adapted from the ISO and standard-core suites of Logtalk,
 Scryer Prolog, Trealla Prolog, and SWI-Prolog. Their upstream identifiers and licenses
 are recorded in [THIRD_PARTY.md](THIRD_PARTY.md).
 
-The corpus has 386 cases in `iso/` and 792 file-based conformance cases in
-total. The generated `conformance-report.md` is the authoritative source for
-current category totals. Together with regression, documentation-sync, API,
-example, and book-example checks, `npm test` is the release gate.
+The corpus has 386 cases in `iso/` and 791 file-based conformance cases in
+total. The separate strict-reader WG17 matrix has 366 executable dispositions.
+The generated `conformance-report.md` is the authoritative source for current
+category totals. Together with regression, documentation-sync, API, example,
+and book-example checks, `npm test` is the release gate.
 
 ## Updating expected output
 

package/test/conformance/cases/atoms/question_mark_graphic_atom.pl

@@ -0,0 +1,3 @@
+% ISO 6.5.1: ? is a graphic character and may occur in graphic atoms.
+%% goal: question_mark_graphics(A, B)
+question_mark_graphics(A, B) :- A = ?, B = ?? .

package/test/conformance/cases/iso/cut_control.pl

@@ -33,6 +33,16 @@ if_then_cut(Value) :-
     (true -> (!, choice(Value)); fail).
 if_then_cut(fallback).
 
+callee_cut_then_fail :-
+    !,
+    fail.
+
+callee_cut_disjunction :-
+    (callee_cut_then_fail; true).
+
+between_disjunction :-
+    (between(1, 1, _), false; true).
+
 %% goal: committed_answer(X0)
 
 committed_answer(Value) :-
@@ -67,3 +77,13 @@ call_local_answer(Kind, Value) :-
 
 if_then_answer(Value) :-
     if_then_cut(Value).
+
+%% goal: callee_cut_disjunction_answer
+
+callee_cut_disjunction_answer :-
+    callee_cut_disjunction.
+
+%% goal: between_disjunction_answer
+
+between_disjunction_answer :-
+    between_disjunction.

package/test/conformance/expected/atoms/question_mark_graphic_atom.pl

@@ -0,0 +1 @@
+question_mark_graphics(?, ??).

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

@@ -7,3 +7,5 @@ disjunction_answer(a).
 call_local_answer(fallback, ok).
 if_then_answer(a).
 if_then_answer(b).
+callee_cut_disjunction_answer.
+between_disjunction_answer.

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

@@ -1,3 +1,3 @@
-operator_atoms(1200, xfx, [':-', '-']).
-operator_atoms(1200, fx, [':-', '-']).
+operator_atoms(1200, xfx, [':-', -]).
+operator_atoms(1200, fx, [':-', -]).
 query_prefix_operator(ok).

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

@@ -1 +1 @@
-parse line 1: bad character "?"
+parse line 1: expected ), got x

package/test/conformance/expected-errors/variables/bare_underscore_name_in_compound_rejected.txt

@@ -1 +1 @@
-parse line 1: bad character "?"
+parse line 1: expected ), got value

package/test/conformance/expected-errors/variables/extra_uppercase_in_list.txt

@@ -1 +1 @@
-parse line 1: bad character "?"
+parse line 1: expected ], got x

package/test/conformance/expected-errors/variables/question_digit_rejected.txt

@@ -1 +1 @@
-parse line 1: bad character "?"
+parse line 1: expected ), got 1

package/test/conformance/expected-errors/variables/underscore_named_rejected.txt

@@ -1 +1 @@
-parse line 1: bad character "?"
+parse line 1: expected ), got _name

package/test/conformance/expected-errors/variables/uppercase_in_body_rejected.txt

@@ -1 +1 @@
-parse line 1: bad character "?"
+parse line 1: expected ), got x

package/test/conformance/expected-errors/variables/uppercase_variable_rejected.txt

@@ -1 +1 @@
-parse line 1: bad character "?"
+parse line 1: expected ), got x

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

@@ -1272,7 +1272,7 @@
             "variables": "[]"
           },
           {
-            "output": "'-'(1)",
+            "output": "-(1)",
             "variables": "[]"
           }
         ]
@@ -4069,7 +4069,7 @@
             "variables": "[]"
           },
           {
-            "output": "$('+'(a,b))",
+            "output": "$(+(a,b))",
             "variables": "[]"
           }
         ]
@@ -4128,7 +4128,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "'+'(__anon0,__anon1)",
+            "output": "+(__anon0,__anon1)",
             "variables": "[]"
           }
         ]
@@ -4144,7 +4144,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "'+'(B,B)",
+            "output": "+(B,B)",
             "variables": "['B' = B]"
           }
         ]
@@ -4246,7 +4246,7 @@
         "type": "success",
         "stages": [
           {
-            "output": "'-'(a,'-'('-'(b)))",
+            "output": "-(a,-(-(b)))",
             "variables": "[]"
           }
         ]

package/test/fixtures/prologue_extended_quad.pl

@@ -82,6 +82,6 @@
 ?- countall(false, non_integer).
    type_error(integer, non_integer).
 ?- countall(G, -1).
-   instantiation_error.
+   domain_error(not_less_than_zero, -1).
 ?- countall(1, -1).
-   type_error(callable, 1).
+   domain_error(not_less_than_zero, -1).

package/test/run-regression.mjs

@@ -659,7 +659,7 @@ c4 ?- call((!;1)).
           input: 'X = -0.0, number_chars(X,C), number_chars(Y,C), X == Y, number_chars(Y,D).\nhalt.\n',
         });
         assertEqual(result.status, 0, 'exit status');
-        assertIncludes(result.stdout, "X = 0.0, C = ['0', '.', '0'], Y = 0.0, D = ['0', '.', '0'].", 'answer');
+        assertIncludes(result.stdout, 'X = 0.0, C = "0.0", Y = 0.0, D = "0.0".', 'answer');
         assertEqual(result.stderr, '', 'stderr');
       },
     },
@@ -672,6 +672,28 @@ c4 ?- call((!;1)).
         });
         assertEqual(streamResult.stdout, 'read(46 = 46).\n', 'read/1 character-code full stop');
 
+        // A complete term must be recognized from its full stop alone. Do not
+        // consult the interactive refill hook (which would amount to waiting
+        // for EOF or another line) once the terminator has been seen.
+        const program = Program.parse('');
+        const solver = new Solver(program, {
+          registry: getEyePrologRegistry(),
+          ioOptions: { input: "X = 0'. .\n" },
+        });
+        const inputStream = solver.io.resolve('user_input');
+        let refillRequests = 0;
+        inputStream.interactiveReadTerm = () => {
+          refillRequests++;
+          throw new Error('reader requested input after a complete term');
+        };
+        const readGoal = parseGoalText('read(T)', { operatorDefinitions: [...program.operators.values()] });
+        const readAnswers = [...solver.solve([readGoal], new Env(), 0)];
+        assertEqual(readAnswers.length, 1, 'read/1 answer without EOF');
+        assertEqual(refillRequests, 0, 'read/1 terminates without EOF assistance');
+        const readTerm = copyResolved(readGoal.args[0], readAnswers[0]);
+        assertEqual(readTerm.name, '=', 'read/1 parsed assignment');
+        assertEqual(readTerm.args[1].name, '46', 'read/1 parsed character code');
+
         const cliResult = runCli([], { input: "X = 0'. .\nhalt.\n" });
         assertEqual(cliResult.status, 0, 'top-level character-code full stop status');
         assertIncludes(cliResult.stdout, 'X = 46', 'top-level character-code answer');
@@ -682,6 +704,30 @@ c4 ?- call((!;1)).
         assertIncludes(upstreamResult.stdout, '46 true.', 'WG17 #367 output');
       },
     },
+    {
+      name: 'question mark is a graphic character and writeq keeps graphic atoms unquoted',
+      run: () => {
+        const result = runCli([], { input: 'writeq(?).\nwriteq(??).\nwriteq(?-).\nhalt.\n' });
+        assertEqual(result.status, 0, 'exit status');
+        assertIncludes(result.stdout, '? true.', 'writeq(?)');
+        assertIncludes(result.stdout, '?? true.', 'writeq(??)');
+        assertIncludes(result.stdout, '?- true.', 'writeq(?-)');
+        assertNotIncludes(result.stdout, "'?-'", 'writeq(?-) has no quotes');
+      },
+    },
+    {
+      name: 'normal parser rejects non-conforming bare operator operands',
+      run: () => {
+        let caught = null;
+        try {
+          parseGoalText('write_canonical((- = - 1))');
+        } catch (error) {
+          caught = error;
+        }
+        if (!caught) throw new Error('non-conforming operator operand unexpectedly parsed');
+        assertIncludes(caught.message, 'operator atom', 'syntax rejection');
+      },
+    },
     {
       name: 'layout distinguishes prefix notation from functional notation',
       run: () => {
@@ -1820,17 +1866,17 @@ c4 ?- call((!;1)).
       run: () => {
         assertEqual(
           run('', { goal: 'current_op(Priority, Specifier, ?-)' }).stdout,
-          "current_op(1200, fx, '?-').\ncurrent_op(1200, xfx, '?-').\n",
+          "current_op(1200, fx, ?-).\ncurrent_op(1200, xfx, ?-).\n",
           'query operator definitions',
         );
         assertEqual(
           run('', { goal: 'current_op(1200, fx, ?-)' }).stdout,
-          "current_op(1200, fx, '?-').\n",
+          "current_op(1200, fx, ?-).\n",
           'ISO query prefix operator',
         );
         assertEqual(
           run('', { goal: 'current_op(1200, xfx, ?-)' }).stdout,
-          "current_op(1200, xfx, '?-').\n",
+          "current_op(1200, xfx, ?-).\n",
           'quad query infix operator',
         );
         const prefix = parseGoalText('(?- true)');
@@ -2035,6 +2081,23 @@ c4 ?- call((!;1)).
         assertEqual(run(source, { goal: 'read_codes(ok)' }).stdout, 'read_codes(ok).\n', 'double_quotes read flag');
       },
     },
+    {
+      name: 'get_char and peek_char report invalid UTF-8 as representation_error(character)',
+      run: () => {
+        const invalidPath = path.join(tmp, `invalid-utf8-${++tmpCounter}.bin`);
+        fs.writeFileSync(invalidPath, Buffer.from([0xff]));
+        const quotedPath = sourceAtom(invalidPath);
+        for (const predicate of ['peek_char', 'get_char']) {
+          let caught = null;
+          try {
+            run('', { goal: `open(${quotedPath}, read, S, []), ${predicate}(S, C)` });
+          } catch (error) {
+            caught = error;
+          }
+          assertEqual(caught?.formal, 'representation_error(character)', `${predicate}/2 invalid UTF-8`);
+        }
+      },
+    },
     {
       name: 'write predicates and write_term options select distinct formats',
       run: () => {
@@ -2050,16 +2113,26 @@ c4 ?- call((!;1)).
           "  write_term(a+b, [ignore_ops(false)]), put_char('|'),",
           "  write_term('$VAR'(0), [numbervars(true)]), put_char('|'),",
           "  write_term('$VAR'(0), [numbervars(false)]), put_char('|'),",
-          "  write_term(pair(X, Y), [variable_names(['Left'=X, 'Right'=Y])]).",
+          "  write_term(pair(X, Y), [variable_names(['Left'=X, 'Right'=Y])]), put_char('|'),",
+          `  write_term("ab", [double_quotes(true)]), put_char('|'),`,
+          '  write_term("ab", [double_quotes(false)]).',
           '',
         ].join('\n');
         assertEqual(
           run(source, { goal: 'emit' }).stdout,
-          "hello world|'hello world'|a + b * c|'+'(a,*(b,c))|hello world|'hello world'|+(a,b)|a + b|A|$VAR(0)|pair(Left,Right)emit.\n",
+          "hello world|'hello world'|a + b * c|+(a,*(b,c))|hello world|'hello world'|+(a,b)|a + b|A|$VAR(0)|pair(Left,Right)|\"ab\"|[a,b]emit.\n",
           'stdout',
         );
       },
     },
+    {
+      name: 'REPL renders character lists with double quotes',
+      run: () => {
+        const result = runCli([], { input: 'L="UN-READABLE, ...".\nhalt.\n' });
+        assertEqual(result.status, 0, 'exit status');
+        assertIncludes(result.stdout, 'L = "UN-READABLE, ...".', 'top-level character-list rendering');
+      },
+    },
     {
       name: 'CLI false/0 fails as an ordinary goal',
       run: () => {
@@ -2593,11 +2666,11 @@ open(X) :- candidate(X), \\+ closed(X).
         const programText = `
           :- use_module(library(lists)).
           alphabet(['0','1','2','3','4','5','6','7','8','9','.']).
-          trial([A,B,C,D,E]) :-
+          trial([A,B,C,D,E,F]) :-
             alphabet(Chars),
             member(A, Chars), member(B, Chars), member(C, Chars),
-            member(D, Chars), member(E, Chars),
-            catch(number_chars(_, [A,B,C,D,E]), error(syntax_error(number), _), true).
+            member(D, Chars), member(E, Chars), member(F, Chars),
+            catch(number_chars(_, [A,B,C,D,E,F]), error(syntax_error(number), _), true).
         `;
         const script = `
           import { Program, Solver, Env, parseGoalText, getEyePrologRegistry } from ${JSON.stringify(engineUrl)};
@@ -2606,9 +2679,9 @@ open(X) :- candidate(X), \\+ closed(X).
           const goal = parseGoalText('trial(Chars)');
           let count = 0;
           for (const _ of solver.solve([goal], new Env(), 0)) {
-            if (++count === 150000) break;
+            if (++count === 500000) break;
           }
-          if (count !== 150000) throw new Error('unexpected answer count: ' + count);
+          if (count !== 500000) throw new Error('unexpected answer count: ' + count);
           process.stdout.write(String(count));
         `;
         const result = spawnSync(process.execPath, [
@@ -2616,10 +2689,10 @@ open(X) :- candidate(X), \\+ closed(X).
           '--input-type=module',
           '--eval',
           script,
-        ], { cwd: packageRoot, encoding: 'utf8', timeout: 30000 });
+        ], { cwd: packageRoot, encoding: 'utf8', timeout: 45000 });
         if (result.error) throw result.error;
         assertEqual(result.status, 0, `bounded-heap child status; stderr=${result.stderr}`);
-        assertEqual(result.stdout, '150000', 'distinct number syntax attempts');
+        assertEqual(result.stdout, '500000', 'distinct number syntax attempts');
       },
     },
     {
@@ -2647,22 +2720,23 @@ open(X) :- candidate(X), \\+ closed(X).
       },
     },
     {
-      name: 'named list allocation heap pressure becomes resource_error(memory)',
+      name: 'resource_error(memory) leaves enough heap for subsequent list work',
       run: () => {
         const engineUrl = new URL('../src/index.js', import.meta.url).href;
-        const programText = ':- use_module(library(prologue)).\n';
-        const goalText = '\\+ \\+ length(List, 1000000)';
         const script = `
           import { Program, Solver, Env, parseGoalText, getEyePrologRegistry } from ${JSON.stringify(engineUrl)};
-          const program = Program.parse(${JSON.stringify(programText)}, { sourceMetadata: false });
+          const program = Program.parse(${JSON.stringify(':- use_module(library(prologue)).\n')}, { sourceMetadata: false });
           const solver = new Solver(program, { registry: getEyePrologRegistry() });
-          const goal = parseGoalText(${JSON.stringify(goalText)}, {
-            operatorDefinitions: [...program.operators.values()],
-          });
+          const execute = (text) => {
+            const goal = parseGoalText(text, { operatorDefinitions: [...program.operators.values()] });
+            return [...solver.solve([goal], new Env(), 0)];
+          };
+          execute('length(L,1000),fail');
           let caught = null;
-          try { [...solver.solve([goal], new Env(), 0)]; } catch (error) { caught = error; }
+          try { execute('length(L,1000000),fail'); } catch (error) { caught = error; }
           if (caught?.formal !== 'resource_error(memory)') throw caught ?? new Error('no resource error');
-          process.stdout.write(caught.formal);
+          execute('length(L,1000),fail');
+          process.stdout.write('recovered');
         `;
         const result = spawnSync(process.execPath, [
           '--max-old-space-size=64',
@@ -2672,7 +2746,7 @@ open(X) :- candidate(X), \\+ closed(X).
         ], { cwd: packageRoot, encoding: 'utf8', timeout: 30000 });
         if (result.error) throw result.error;
         assertEqual(result.status, 0, `bounded-heap child status; stderr=${result.stderr}`);
-        assertEqual(result.stdout, 'resource_error(memory)', 'heap pressure resource error');
+        assertEqual(result.stdout, 'recovered', 'solver remains usable after resource error');
       },
     },
     {
@@ -2739,12 +2813,12 @@ open(X) :- candidate(X), \\+ closed(X).
         assertEqual(Boolean(registry.get('is', 2)), true, 'ISO is/2 exists');
         assertEqual(Boolean(registry.get('append', 3)), false, 'append/3 is not ISO core');
         assertEqual(library.eyePrologLibrary, true, 'complete registry marker');
-        assertEqual(library.defs.size, 152, 'EyeProlog registry contains ISO definitions and private library adapters');
+        assertEqual(library.defs.size, 153, 'EyeProlog registry contains ISO definitions and private library adapters');
         assertEqual(Boolean(registry.get('phrase', 2)), true, 'Part 3 phrase/2 exists');
         assertEqual(Boolean(registry.get('phrase', 3)), true, 'Part 3 phrase/3 exists');
-        assertEqual(registeredNativeEyePrologLibraryNames().length, 39, 'public native EyeProlog builtin count');
-        assertEqual(eyePrologPortableLibraryIndicators.length, 60, 'portable Prolog library count');
-        assertEqual(eyePrologNativeLibraryIndicators.length, 39, 'native host library count');
+        assertEqual(registeredNativeEyePrologLibraryNames().length, 40, 'public native EyeProlog builtin count');
+        assertEqual(eyePrologPortableLibraryIndicators.length, 59, 'portable Prolog library count');
+        assertEqual(eyePrologNativeLibraryIndicators.length, 40, 'native host library count');
         assertEqual(eyePrologNativeLibraryIndicators.slice(0, 2).join(','), 'call_nth/2,freeze/2', 'control predicates requiring host support');
         assertEqual(eyePrologLibraryIndicators.length, 99, 'complete EyeProlog library surface');
         assertEqual(registry.get('eyeprolog__call_nth', 2), null, 'private call_nth adapter is absent from ISO registry');
@@ -2752,6 +2826,8 @@ open(X) :- candidate(X), \\+ closed(X).
         assertEqual(library.get('eyeprolog__call_nth', 2)?.eyePrologLibrary, true, 'private adapter is marked as library support');
         assertEqual(registry.get('eyeprolog__freeze', 2), null, 'private freeze adapter is absent from ISO registry');
         assertEqual(Boolean(library.get('eyeprolog__freeze', 2)), true, 'private freeze adapter is registered for EyeProlog');
+        assertEqual(registry.get('eyeprolog__countall', 2), null, 'private countall adapter is absent from ISO registry');
+        assertEqual(Boolean(library.get('eyeprolog__countall', 2)), true, 'private countall adapter is registered for EyeProlog');
         assertEqual(Boolean(library.get('eyeprolog__clpz_labeling', 2)), true, 'private CLP(Z) labeling adapter is registered');
         assertEqual(Boolean(library.get('eyeprolog__clpz_global_cardinality', 3)), true, 'private CLP(Z) cardinality adapter is registered');
         assertEqual(library.get('between', 3), null, 'between/3 remains portable Prolog');
@@ -2807,6 +2883,25 @@ portable_check(A, B, C) :- lowercase('HELLO', A), replace('banana', 'na', 'NA',
         assertEqual(program.findGroup('local_time', 1), null, 'local_time/1 is absent from the library');
       },
     },
+    {
+      name: 'countall validates Count before executing Goal and counts without a bag',
+      run: () => {
+        const source = `:- use_module(library(prologue)).
+item(a).
+item(b).
+item(c).
+candidate :- item(_).
+`;
+        let caught = null;
+        try {
+          run(source, { goal: 'countall(throw(x), -1)' });
+        } catch (error) {
+          caught = error;
+        }
+        assertEqual(caught?.formal, 'domain_error(not_less_than_zero)', 'negative Count error priority');
+        assertEqual(run(source, { goal: 'countall(candidate, N)' }).stdout, 'countall(candidate, 3).\n', 'solution count');
+      },
+    },
     {
       name: 'ISO extension module provides portable control and collection relations',
       run: () => {

package/the-art-of-eyeprolog.md

@@ -1831,8 +1831,11 @@ sorted-list operation. No process-global variable registry or creation ordinal
 is retained or exposed through later comparisons.
 
 EyeProlog periodically checks detectable JavaScript heap use and keeps a quarter
-of the host heap ceiling in reserve so the solver can unwind and report
-`resource_error(memory)` before a fatal host out-of-memory abort. Embedders may
+of the applicable host heap ceiling in reserve so the solver can unwind and report
+`resource_error(memory)` before a fatal host out-of-memory abort. When Node is
+started with `--max-old-space-size`, the guard compares that old-generation
+ceiling with V8's non-young heap spaces; short-lived new-generation allocations
+therefore do not cause a false resource error. Embedders may
 replace that automatically derived soft ceiling with `maxMemoryBytes`; setting
 it to `Infinity` disables the proactive check. Environments that do not expose
 heap use cannot provide the proactive check. Host capacity failures that V8
@@ -5000,7 +5003,10 @@ travel_status(From, To, Status) :-
 discards alternatives created since entry into the current predicate call.
 The two can produce the same first answer without expressing the same control
 boundary. Keep cut close to the choice it documents and test the complete
-answer set before and after introducing it.
+answer set before and after introducing it. A cut executed inside a predicate
+called by one disjunction branch remains local to that predicate: if the branch
+later fails, `Left ; Right` must still try `Right`. This remains true for
+cut-bearing validation helpers used by generators such as `between/3`.
 
 Exceptions separate an exceptional call from ordinary logical failure:
 
@@ -5252,7 +5258,11 @@ error rather than guessing an encoding.
 `read/1-2` reads the next term. `read_term/2-3` can also return all variables,
 source variable names, and singletons. The metadata contains variables, so a
 program normally validates or transforms it before placing it in a ground
-query answer. `stream_property/2` exposes mode, type, alias, position, and
+query answer. Every read operation creates a fresh variable set: a source name
+such as `X` in two separately read terms does not alias either the caller's `X`
+or the variable named `X` by the other read. Within one read term, repeated
+occurrences and the variables returned through its metadata still share as
+written. `stream_property/2` exposes mode, type, alias, position, and
 end state. `current_input/1`, `current_output/1`, `set_input/1`, and
 `set_output/1` manage defaults shared by nested goals.
 
@@ -5612,7 +5622,7 @@ collision because other Prolog systems commonly reject it while loading.
 | `\+(+Goal)` | Negation as finite failure. It succeeds once when `Goal` has no solution and never exports bindings made while testing `Goal`. Bind variables needed by the test first. |
 | `once(+Goal)` | Returns only the first solution of `Goal`, or fails when there is none. |
 | `repeat` | Produces an unbounded sequence of successes; normally paired with a test, cut, exception, or `halt/0`. |
-| `Left ; Right` | Enumerates `Left`, then `Right`, restoring the incoming environment between branches. |
+| `Left ; Right` | Enumerates `Left`, then `Right`, restoring the incoming environment between branches. A cut inside a called predicate cannot discard the other branch. |
 | `If -> Then` | Commits to the first solution of `If` and runs `Then`; it does not provide an else branch by itself. |
 | `(If -> Then ; Else)` | Runs `Then` from the first solution of `If`, otherwise runs `Else`. Alternatives of `If` are discarded. |
 | `catch(+Goal,?Catcher,+Recovery)` | Runs `Goal`; on a matching thrown ball or `PrologError`, unifies it with `Catcher` and calls `Recovery`. Runtime errors are exposed as *error(Formal,eyeprolog)*. |
@@ -7005,7 +7015,7 @@ hand.
 
 #### Running and extending the corpus
 
-Run all 189 normal answer goldens and the 60 selected proof goldens with:
+Run all 211 normal answer goldens and the 61 selected proof goldens with:
 
 ```sh
 npm run test:examples
@@ -7050,6 +7060,7 @@ syntax. Separate corpora cover expected errors, warnings, and proofs:
 ```sh
 npm run test:conformance
 npm run test:iso-strict
+npm run test:wg17-syntax
 node test/run-conformance-report.mjs
 ```
 
@@ -7058,14 +7069,16 @@ Part 1 conformance audit. It distinguishes implemented/tested families from
 requirements whose normative `shall` clauses, option combinations, or error
 precedence still need one-by-one closure. `test/conformance/ISO-MATRIX.md`
 maps language families to representative executable cases.
+`test/conformance/WG17-SYNTAX-STATUS.md` separately traces all 366 active
+upstream syntax cases to exact strict-reader outcomes, with no untraced case.
 
 The complete suite must pass before release. The file-based conformance corpus
-contains 792 cases, including 386 focused ISO
+contains 791 cases, including 386 focused ISO
 cases derived from the success, failure, mode, and error behavior in
 ISO/IEC 13211-1 clauses 7 and 8, Part 2 modules, and Part 3 grammar rules.
-Separate exact-output suites check 189 normal
-examples and 60 proof examples; all extracted book programs are parsed and
-their declared goals are executed. The seven-case
+Separate exact-output suites check 211 normal
+examples and 61 proof examples; all extracted book programs are parsed and
+their declared goals are executed. The eight-case
 playground contract suite imports the production worker, sends real reasoning
 requests through its message protocol, and crawls the served module graph for
 missing assets, bad MIME types, and static Node-only imports. The generated

package/why-eyeprolog.md

@@ -20,7 +20,8 @@ syntax.
 EyeProlog implements the Part 1 core together with Technical Corrigenda 1, 2,
 and 3, Part 2 modules, and the Part 3 definite clause grammar specification.
 Its executable conformance matrix and tests document the supported
-behavior. This is extensive implementation evidence, not certification by an
+behavior, including a complete executable trace of the 366 active WG17 syntax
+cases. This is extensive implementation evidence, not certification by an
 independent standards body.
 
 ## Why a small implementation?

package/test/conformance/errors/variables/bare_underscore_in_list_rejected.pl

@@ -1 +0,0 @@
-answer([?]).

package/test/conformance/errors/variables/bare_underscore_rejected.pl

@@ -1 +0,0 @@
-p(?).

package/test/conformance/expected-errors/variables/bare_underscore_in_list_rejected.txt

@@ -1 +0,0 @@
-parse line 1: bad character "?"

package/test/conformance/expected-errors/variables/bare_underscore_rejected.txt

@@ -1 +0,0 @@
-parse line 1: bad character "?"