eyeprolog 1.2.4 → 1.2.6

package/conformance-report.md

@@ -11,7 +11,7 @@ This report summarizes the file-based conformance corpus under `test/conformance
 | builtins | 11 | 0 | 0 | 0 | 11 |
 | context | 11 | 0 | 0 | 0 | 11 |
 | control | 15 | 0 | 0 | 0 | 15 |
-| iso | 167 | 209 | 0 | 0 | 376 |
+| iso | 167 | 210 | 0 | 0 | 377 |
 | lists | 52 | 3 | 0 | 0 | 55 |
 | modules | 2 | 0 | 0 | 0 | 2 |
 | negation | 8 | 0 | 19 | 0 | 27 |
@@ -23,4 +23,4 @@ This report summarizes the file-based conformance corpus under `test/conformance
 | terms | 26 | 3 | 0 | 0 | 29 |
 | unification | 18 | 0 | 0 | 0 | 18 |
 | variables | 16 | 9 | 0 | 0 | 25 |
-| **Total** | **482** | **260** | **19** | **21** | **782** |
+| **Total** | **482** | **261** | **19** | **21** | **783** |

package/package.json

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

package/src/iso.js

@@ -1075,9 +1075,12 @@ function quotedEscapeEnd(source, index) {
     while (/^[0-9A-Fa-f]$/.test(source[cursor] ?? '')) cursor++;
     return source[cursor] === '\\' ? cursor : Math.max(index + 1, cursor - 1);
   }
-  if (/^[0-7]$/.test(escaped)) {
+  if (/^[0-9]$/.test(escaped)) {
     let cursor = index + 1;
-    while (/^[0-7]$/.test(source[cursor] ?? '')) cursor++;
+    // Scan all decimal digits here, including 8 and 9.  This scanner only
+    // locates the end of a candidate quoted escape; the parser remains
+    // authoritative and rejects non-octal digits.
+    while (/^[0-9]$/.test(source[cursor] ?? '')) cursor++;
     return source[cursor] === '\\' ? cursor : Math.max(index + 1, cursor - 1);
   }
 

package/src/parser.js

@@ -303,6 +303,10 @@ class Parser {
       if (this.take() !== '\\') throw new Error(`parse line ${line}: bad octal escape`);
       return String.fromCodePoint(Number.parseInt(digits, 8));
     }
+    // A backslash followed by a decimal digit is numeric-escape syntax, but
+    // ISO octal digits are limited to 0..7.  Do not reinterpret \8 or \9 as
+    // implementation-specific one-character escapes.
+    if (/^[0-9]$/.test(escaped)) throw new Error(`parse line ${line}: bad octal escape`);
     return escaped;
   }
   nextToken() {

package/src/repl.js

@@ -24,7 +24,7 @@ export async function runRepl(engine, options = {}) {
   let exitCode = 0;
 
   try {
-    state.solver.runInitializations();
+    runWithTerminalSignals(reader, () => state.solver.runInitializations());
     while (true) {
       const text = await readQuery(reader);
       if (text == null) break;
@@ -35,7 +35,7 @@ export async function runRepl(engine, options = {}) {
         if (!options.isoStrict && isUseModuleGoal(goal)) {
           sources.push({ text: `:- ${text}.\n`, filename: '<repl>' });
           state = makeState(engine, sources, output, options, state);
-          state.solver.runInitializations();
+          runWithTerminalSignals(reader, () => state.solver.runInitializations());
           output.write('   true.\n');
           continue;
         }
@@ -43,7 +43,7 @@ export async function runRepl(engine, options = {}) {
         if (consultFiles != null) {
           for (const filename of consultFiles) sources.push(await readSource(filename));
           state = makeState(engine, sources, output, options, state);
-          state.solver.runInitializations();
+          runWithTerminalSignals(reader, () => state.solver.runInitializations());
           output.write('   true.\n');
           continue;
         }
@@ -142,12 +142,39 @@ class LineReader {
     return control;
   }
 
+  suspendForComputation() {
+    if (!this.terminal || !this.readline) return false;
+    // Node readline installs terminal signal handling while the interface is
+    // open. During a synchronous Prolog search that prevents the terminal's
+    // normal SIGINT/SIGTSTP actions from taking effect until JavaScript yields.
+    // Close readline while the solver is running so Ctrl-C can terminate and
+    // Ctrl-Z can suspend an otherwise non-terminating computation immediately.
+    this.history = [...this.readline.history];
+    this.readline.close();
+    this.readline = null;
+    this.lines = null;
+    return true;
+  }
+
+  resumeAfterComputation(suspended) {
+    if (suspended && !this.readline) this.open();
+  }
+
   close() {
     if (this.input.isRaw) this.input.setRawMode(false);
     this.readline?.close();
   }
 }
 
+function runWithTerminalSignals(reader, operation) {
+  const suspended = reader.suspendForComputation();
+  try {
+    return operation();
+  } finally {
+    reader.resumeAfterComputation(suspended);
+  }
+}
+
 function makeState(engine, sources, output, options = {}, previousState = null) {
   const strictIso = options.isoStrict === true;
   const program = engine.Program.parseSources(sources, { strictIso, sourceMetadata: strictIso });
@@ -253,9 +280,12 @@ function quotedEscapeEnd(source, index) {
     while (/^[0-9A-Fa-f]$/.test(source[cursor] ?? '')) cursor++;
     return source[cursor] === '\\' ? cursor : Math.max(index + 1, cursor - 1);
   }
-  if (/^[0-7]$/.test(escaped)) {
+  if (/^[0-9]$/.test(escaped)) {
     let cursor = index + 1;
-    while (/^[0-7]$/.test(source[cursor] ?? '')) cursor++;
+    // Scan all decimal digits here, including 8 and 9.  This scanner only
+    // locates the end of a candidate quoted escape; the parser remains
+    // authoritative and rejects non-octal digits.
+    while (/^[0-9]$/.test(source[cursor] ?? '')) cursor++;
     return source[cursor] === '\\' ? cursor : Math.max(index + 1, cursor - 1);
   }
 
@@ -366,7 +396,7 @@ async function solveQuery(engine, state, goal, reader, output) {
   const solver = state.solver;
   solver.solutionsSeen = 0;
   const solutions = solver.solve([goal], new engine.Env(), 0);
-  let current = pullSolution(solver, solutions);
+  let current = pullSolution(solver, solutions, reader);
   if (current.error) {
     if (current.error?.name === 'HaltSignal') return { halted: true, code: current.error.code };
     throw current.error;
@@ -380,7 +410,7 @@ async function solveQuery(engine, state, goal, reader, output) {
   let automatic = 0;
   let firstAnswer = true;
   while (!current.result.done) {
-    const next = pullSolution(solver, solutions);
+    const next = pullSolution(solver, solutions, reader);
     output.write(current.output);
     output.write(`${firstAnswer ? '   ' : ''}${formatAnswer(engine, state, variables, current.result.value)}`);
     firstAnswer = false;
@@ -433,16 +463,18 @@ async function solveQuery(engine, state, goal, reader, output) {
   return null;
 }
 
-function pullSolution(solver, solutions) {
+function pullSolution(solver, solutions, reader) {
   const stream = solver.io.resolve('user_output');
   const originalWrite = stream?.write;
   let captured = '';
   if (stream) stream.write = (text) => { captured += String(text); };
+  const suspended = reader.suspendForComputation();
   try {
     return { result: solutions.next(), output: captured };
   } catch (error) {
     return { error, output: captured };
   } finally {
+    reader.resumeAfterComputation(suspended);
     if (stream) stream.write = originalWrite;
   }
 }

package/src/write.js

@@ -22,6 +22,7 @@ function quoteAtom(name) {
   for (const ch of name) {
     if (ch === "'") out += "''";
     else if (ch === '\\') out += '\\\\';
+    else if (ch === '\x00') out += '\\0\\';
     else if (ch === '\x07') out += '\\a';
     else if (ch === '\b') out += '\\b';
     else if (ch === '\r') out += '\\r';
@@ -59,6 +60,7 @@ function writeString(value) {
   let out = '"';
   for (const ch of value) {
     if (ch === '"' || ch === '\\') out += `\\${ch}`;
+    else if (ch === '\x00') out += '\\0\\';
     else if (ch === '\x07') out += '\\a';
     else if (ch === '\b') out += '\\b';
     else if (ch === '\r') out += '\\r';

package/test/conformance/ISO-MATRIX.md

@@ -8,7 +8,7 @@ compliance audit and the remaining work before a full conformance claim.
 
 | Standard area | Implementation | Representative executable coverage |
 | --- | --- | --- |
-| Clause 6 lexical and term syntax | tokenizer, operator parser, lists, curly terms, quotes, numeric syntax, comments | `scryer_lexical_terms`, `lexical_and_curly_terms`, `double_quoted_lists`, `corrigendum1_double_quote_operator`, `wg17_syntax_high_risk`, syntax error cases |
+| Clause 6 lexical and term syntax | tokenizer, operator parser, lists, curly terms, quotes, numeric syntax, comments | `scryer_lexical_terms`, `lexical_and_curly_terms`, `double_quoted_lists`, `corrigendum1_double_quote_operator`, `wg17_syntax_high_risk`, `wg17_invalid_octal_escape`, syntax error cases |
 | Clause 7 term order and unification | finite-tree unification, identity, standard order, errors | `unification_control_information`, `swipl_occurs_check`, `term_modes_and_ordering`, `logtalk_compare_standard_order` |
 | Clause 7 control and exceptions | call, cut, conjunction, disjunction, if-then-else, catch and throw | `cut_control`, `control_and_terms`, `exceptions_and_flags`, `corrigenda_catch_callability`, `throw_copies_ball` |
 | 8.2-8.5 term predicates | unification, Corrigendum 2 tests, comparison, sorting, creation and decomposition | `corrigenda_term_predicates`, `corrigenda_sort_keysort`, `logtalk_arg_unification`, `logtalk_univ`, associated error cases |

package/test/conformance/README.md

@@ -102,7 +102,7 @@ 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 376 cases in `iso/` and 782 file-based conformance cases in
+The corpus has 377 cases in `iso/` and 783 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.

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

@@ -1,6 +1,6 @@
 % High-risk ISO syntax/write regressions, independently derived from
 % ISO/IEC 13211-1 clauses 6.3, 6.4 and 7.10 and cross-checked against the
-% public WG17 conformity-testing syntax cases (#1, #14-15, #28-31, #33-34).
+% public WG17 conformity-testing syntax cases (#1, #14-15, #28-31, #33-34, #301).
 
 %% goal: wg17_numeric_escape
 wg17_numeric_escape :-
@@ -24,3 +24,7 @@ wg17_operator_precedence :-
 %% goal: wg17_canonical_list
 wg17_canonical_list :-
     write_canonical([a]), nl.
+
+%% goal: wg17_zero_character_escape
+wg17_zero_character_escape :-
+    writeq('\0\'), nl.

package/test/conformance/errors/iso/wg17_invalid_octal_escape.pl

@@ -0,0 +1 @@
+'\8\'.

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

@@ -11,3 +11,5 @@ a :- b, c
 wg17_operator_precedence.
 '.'(a,[])
 wg17_canonical_list.
+'\0\'
+wg17_zero_character_escape.

package/test/conformance/expected-errors/iso/wg17_invalid_octal_escape.txt

@@ -0,0 +1 @@
+parse line 1: bad octal escape

package/test/run-regression.mjs

@@ -671,6 +671,31 @@ c4 ?- call((!;1)).
         assertEqual(result.stderr, '', 'stderr');
       },
     },
+    {
+      name: 'writeq preserves the NUL character with an ISO octal escape',
+      run: () => {
+        const result = runCli([], {
+          input: "writeq('\\0\\').\nhalt.\n",
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertEqual(result.stdout, "?- '\\0\\'   true.\n?- ", 'stdout');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
+    {
+      name: 'REPL rejects non-octal numeric escapes without waiting for continuation',
+      run: () => {
+        const result = runCli([], {
+          input: "'\\8\\'.\nhalt.\n",
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertEqual(result.stdout,
+          '?-    parse line 1: bad octal escape.\n' +
+          '?- ',
+          'stdout');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
     {
       name: 'REPL read predicates consume following interactive term input',
       run: () => {
@@ -694,6 +719,27 @@ c4 ?- call((!;1)).
         assertEqual(result.stderr, '', 'stderr');
       },
     },
+    {
+      name: 'REPL releases terminal signals while a query computes',
+      run: () => {
+        if (process.platform === 'win32') return;
+        const available = spawnSync('sh', ['-c',
+          'command -v script >/dev/null 2>&1 && script --version 2>/dev/null | grep -qi util-linux']);
+        if (available.status !== 0) return;
+        const command = `${shellQuote(process.execPath)} ${shellQuote(bin)}`;
+        const scriptCommand =
+          `{ printf 'repeat, fail.\n'; sleep 0.2; printf '\\003'; } | ` +
+          `script -qefc ${shellQuote(command)} /dev/null`;
+        const result = spawnSync('sh', ['-c', scriptCommand], {
+          cwd: packageRoot,
+          encoding: 'utf8',
+          timeout: 3000,
+        });
+        assertEqual(result.error?.code, undefined, 'terminal interrupt timeout');
+        assertEqual(result.status, 130, 'SIGINT exit status');
+        assertIncludes(result.stdout, '?- repeat, fail.', 'terminal query echo');
+      },
+    },
     {
       name: 'REPL accepts multiline period-terminated queries',
       run: () => {
@@ -1312,6 +1358,16 @@ c4 ?- call((!;1)).
           "answer('\\a').\n",
           'read/1 user_input numeric escape',
         );
+
+        const invalidOctal = String.fromCharCode(39, 92, 56, 92, 39, 46);
+        assertEqual(
+          run('answer(T) :- catch(read(T), E, T=E).\n', {
+            goal: 'answer(T)',
+            ioOptions: { input: invalidOctal },
+          }).stdout,
+          'answer(error(syntax_error(read_term), eyeprolog)).\n',
+          'read/1 rejects non-octal numeric escape',
+        );
       },
     },
     {
@@ -3074,6 +3130,10 @@ function between(text, startMarker, endMarker) {
   return text.slice(contentStart, end);
 }
 
+function shellQuote(value) {
+  return `'${String(value).replaceAll("'", "'\"'\"'")}'`;
+}
+
 function runCli(args, options = {}) {
   return spawnSync(process.execPath, [bin, ...args], {
     cwd: packageRoot,

package/the-art-of-eyeprolog.md

@@ -5279,7 +5279,10 @@ message("café").
 Inside a quoted atom, a single quote is doubled: `'don''t'`. Quoted characters
 support the ISO symbolic control escapes such as `\a`, `\n`, and `\t`, and numeric
 octal or hexadecimal escapes are terminated by a backslash; for example, `'\7\'`
-and `'\x7\'` both denote the alert character. Double-quoted lists use the same
+and `'\x7\'` both denote the alert character. The NUL character, when present in
+the processor character set, is written readably as `'\0\'`; digits `8` and `9`
+are not octal digits, so forms such as `'\8\'` are syntax errors rather than
+continuation input. Double-quoted lists use the same
 quoted-character escapes. Whitespace is insignificant
 between tokens, and a `%` comment continues to the end of its line. Doubling
 the active delimiter is also accepted inside either quoted form, so `""`
@@ -6213,7 +6216,11 @@ may span lines and end with a full stop, as in Scryer Prolog:
 When another answer exists in an interactive terminal, press `;`, Space, or
 `n` to ask for it immediately; no Return is needed. Return or `.` stops
 enumeration, `a` enumerates all remaining answers, `f` enumerates the next
-five, and `h` displays the answer-control help. A
+five, and `h` displays the answer-control help. While a query is actively
+computing, EyeProlog releases readline's terminal signal handling: `Ctrl-C`
+therefore terminates the current EyeProlog process immediately, and on POSIX
+terminals `Ctrl-Z` suspends it in the usual shell-managed way. This remains a
+host top-level convention rather than an ISO/IEC 13211-1 language feature. A
 period-terminated query with no solutions prints `false.`; a solution without
 visible variable bindings prints `true.`. Answer substitutions are rendered as
 valid Prolog syntax under the current operator table: when a bound value would
@@ -6946,7 +6953,7 @@ precedence still need one-by-one closure. `test/conformance/ISO-MATRIX.md`
 maps language families to representative executable cases.
 
 The complete suite must pass before release. The file-based conformance corpus
-contains 782 cases, including 376 focused ISO
+contains 783 cases, including 377 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