eyeprolog 1.2.20 → 1.2.22

package/package.json

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

package/src/parser.js

@@ -436,7 +436,16 @@ class Parser {
         if (!value || (value !== ' ' && isWhitespaceCode(value.charCodeAt(0)))) {
           throw new Error(`parse line ${line}: bad character code constant`);
         }
-        if (value === '\\') value = this.readEscape(line, { allowContinuation: false });
+        if (value === "'") {
+          // In the single-quoted-character notation used after 0', an
+          // apostrophe is doubled just as it is inside a quoted atom. Thus
+          // 0''' is one numeric token denoting character code 39, while the
+          // undoubled 0'' is not a complete single quoted character.
+          if (this.peek() !== "'") throw new Error(`parse line ${line}: bad character code constant`);
+          this.take();
+        } else if (value === '\\') {
+          value = this.readEscape(line, { allowContinuation: false });
+        }
         const code = value.codePointAt(0);
         return { type: TOK.NUMBER, text: String(negative ? -code : code), line };
       }

package/src/repl.js

@@ -31,13 +31,23 @@ export async function runRepl(engine, options = {}) {
       if (text == null) break;
       if (!text.trim()) continue;
 
+      let resultIndent = '   ';
       try {
         const goal = parseGoal(engine, state, text);
+        // A complete, successfully parsed query has left the top-level reader
+        // and is about to execute. Show two spaces immediately so a terminal
+        // user can distinguish that state from a reader waiting for more text;
+        // the final result adds the third indentation space below. A direct
+        // halt has no result and exits immediately, so it needs no marker.
+        if (!isHaltGoal(goal)) {
+          output.write('  ');
+          resultIndent = ' ';
+        }
         if (!options.isoStrict && isUseModuleGoal(goal)) {
           sources.push({ text: `:- ${text}.\n`, filename: '<repl>' });
           state = makeState(engine, sources, output, options, state, reader);
           runWithTerminalSignals(reader, () => state.solver.runInitializations());
-          output.write('   true.\n');
+          output.write(' true.\n');
           continue;
         }
         const consultFiles = options.isoStrict ? null : consultDesignations(engine, goal);
@@ -45,7 +55,7 @@ export async function runRepl(engine, options = {}) {
           for (const filename of consultFiles) sources.push(await readSource(filename));
           state = makeState(engine, sources, output, options, state, reader);
           runWithTerminalSignals(reader, () => state.solver.runInitializations());
-          output.write('   true.\n');
+          output.write(' true.\n');
           continue;
         }
 
@@ -65,7 +75,7 @@ export async function runRepl(engine, options = {}) {
           exitCode = error.code;
           break;
         }
-        output.write(`   ${formatError(engine, state, error)}\n`);
+        output.write(`${resultIndent}${formatError(engine, state, error)}\n`);
       }
     }
   } catch (error) {
@@ -442,6 +452,11 @@ function isUseModuleGoal(goal) {
   return goal.type === 'compound' && goal.name === 'use_module' && [1, 2].includes(goal.arity);
 }
 
+function isHaltGoal(goal) {
+  return (goal.type === 'atom' && goal.name === 'halt') ||
+    (goal.type === 'compound' && goal.name === 'halt' && goal.arity === 1);
+}
+
 function consultDesignations(engine, goal) {
   if (goal.type === 'atom' && goal.name === '[]') return [];
   if (goal.type !== 'compound' || goal.name !== '.' || goal.arity !== 2) return null;
@@ -481,7 +496,7 @@ async function solveQuery(engine, state, goal, reader, output) {
   }
 
   if (current.result.done) {
-    output.write('   false.\n');
+    output.write(' false.\n');
     return null;
   }
 
@@ -498,7 +513,7 @@ async function solveQuery(engine, state, goal, reader, output) {
     if (formattingAfterAdvance) output.write(' ');
     formattingAfterAdvance = false;
     output.write(current.output);
-    output.write(`${firstAnswer ? '   ' : ''}${formatAnswer(engine, state, variables, current.result.value)}`);
+    output.write(`${firstAnswer ? ' ' : ''}${formatAnswer(engine, state, variables, current.result.value)}`);
     answersShown++;
     firstAnswer = false;
     if (!next.error && next.result.done) {

package/test/run-regression.mjs

@@ -538,6 +538,35 @@ c4 ?- call((!;1)).
         }
       },
     },
+    {
+      name: 'apostrophe character-code constants parse in source and number conversion',
+      run: () => {
+        const source = String.raw`
+?- N = 0'''.
+   N = 39.
+?- number_chars(N,"0'''").
+   N = 39.
+?- number_chars(N,"0'\\'").
+   N = 39.
+?- number_codes(N,[48,39,39,39]).
+   N = 39.
+`;
+        const result = publicApi.runQuads(source);
+        assertEqual(result.total, 4, 'quad total');
+        assertEqual(result.passed, 4, 'quad passed');
+        assertEqual(result.stdout, 'quads: 4 run, 4 passed, 0 failed.\n', 'quad report');
+
+        for (const goal of ["N = 0''", 'number_chars(N,"0\'\'")']) {
+          let caught = null;
+          try {
+            publicApi.run('', { goal });
+          } catch (error) {
+            caught = error;
+          }
+          if (caught == null) throw new Error(`${goal} should reject an undoubled apostrophe`);
+        }
+      },
+    },
     {
       name: 'number conversion rejects parenthesized numeric terms',
       run: () => {
@@ -791,7 +820,7 @@ c4 ?- call((!;1)).
       },
     },
     {
-      name: 'REPL answer prompt distinguishes waiting from computation',
+      name: 'REPL query and answer prompts distinguish waiting from computation',
       run: () => {
         const helper = `
           import { spawn } from 'node:child_process';
@@ -804,9 +833,11 @@ c4 ?- call((!;1)).
           child.stderr.setEncoding('utf8');
           let stdout = '';
           let stderr = '';
+          let sawQueryComputingPrompt = false;
           let sawComputingPrompt = false;
           child.stdout.on('data', (text) => {
             stdout += text;
+            if (stdout.endsWith('?-   ')) sawQueryComputingPrompt = true;
             if (stdout.endsWith('\\n; ')) sawComputingPrompt = true;
           });
           child.stderr.on('data', (text) => { stderr += text; });
@@ -823,6 +854,10 @@ c4 ?- call((!;1)).
 
           child.stdin.write('use_module(library(prologue)).\\n');
           await waitFor(() => stdout.includes('   true.\\n?- '), 'module import');
+          sawQueryComputingPrompt = false;
+          child.stdin.write('between(0,0xff,I),I<0.\\n');
+          await waitFor(() => sawQueryComputingPrompt, 'query computing prompt');
+          await waitFor(() => stdout.endsWith('   false.\\n?- '), 'query result');
           child.stdin.write('(N = 0; N = 1; (call_nth(repeat, 100000), N = 2)).\\n');
           await waitFor(() => stdout.endsWith('   N = 0\\n;'), 'waiting prompt');
           child.stdin.write(';\\n');
@@ -833,7 +868,7 @@ c4 ?- call((!;1)).
           child.stdin.write('halt.\\n');
           const status = await new Promise((resolve) => child.once('exit', resolve));
           if (status !== 0) throw new Error('child status ' + status + '; stderr=' + stderr);
-          process.stdout.write('waiting;computing;formatting');
+          process.stdout.write('query-computing;waiting;computing;formatting');
         `;
         const result = spawnSync(process.execPath, [
           '--input-type=module',
@@ -842,7 +877,7 @@ c4 ?- call((!;1)).
         ], { cwd: packageRoot, encoding: 'utf8', timeout: 10000 });
         if (result.error) throw result.error;
         assertEqual(result.status, 0, `prompt helper status; stderr=${result.stderr}`);
-        assertEqual(result.stdout, 'waiting;computing;formatting', 'prompt state sequence');
+        assertEqual(result.stdout, 'query-computing;waiting;computing;formatting', 'prompt state sequence');
       },
     },
     {
@@ -912,9 +947,9 @@ c4 ?- call((!;1)).
         });
         assertEqual(result.status, 0, 'exit status');
         assertEqual(result.stdout,
-          "?- '\\a'   true.\n" +
-          "?- '\\a'   true.\n" +
-          "?- '\\a'   true.\n" +
+          "?-   '\\a' true.\n" +
+          "?-   '\\a' true.\n" +
+          "?-   '\\a' true.\n" +
           '?- ',
           'stdout');
         assertEqual(result.stderr, '', 'stderr');
@@ -927,7 +962,7 @@ c4 ?- call((!;1)).
           input: "writeq('\\0\\').\nhalt.\n",
         });
         assertEqual(result.status, 0, 'exit status');
-        assertEqual(result.stdout, "?- '\\0\\'   true.\n?- ", 'stdout');
+        assertEqual(result.stdout, "?-   '\\0\\' true.\n?- ", 'stdout');
         assertEqual(result.stderr, '', 'stderr');
       },
     },
@@ -1062,7 +1097,7 @@ c4 ?- call((!;1)).
           input: "writeq('\\033\\').\nhalt.\n",
         });
         assertEqual(result.status, 0, 'exit status');
-        assertEqual(result.stdout, "?- '\\33\\'   true.\n?- ", 'stdout');
+        assertEqual(result.stdout, "?-   '\\33\\' true.\n?- ", 'stdout');
         assertEqual(result.stderr, '', 'stderr');
       },
     },
@@ -1081,9 +1116,9 @@ c4 ?- call((!;1)).
         });
         assertEqual(result.status, 0, 'exit status');
         assertEqual(result.stdout,
-          '?- |:    X = foo.\n' +
-          "?- |:    Y = '\\a'.\n" +
-          '?- |:    Z = bar.\n' +
+          '?-   |:  X = foo.\n' +
+          "?-   |:  Y = '\\a'.\n" +
+          '?-   |:  Z = bar.\n' +
           '?- ',
           'stdout');
         assertEqual(result.stderr, '', 'stderr');

package/the-art-of-eyeprolog.md

@@ -5776,8 +5776,9 @@ minus token and the following numeric token. A single-line `%...` comment may
 therefore follow `-` directly because `%` cannot continue a graphic token; an
 adjacent bracketed comment in `-/**/1` remains a syntax error under the eager
 token-consumer rule. Decimal fractions and decimal exponents are supported;
-trailing material and non-finite values are rejected. The regression gate
-vendors all 74 numbered cases from Ulrich Neumerkel's contemporary
+the apostrophe character code is written with a doubled apostrophe as `0'''`
+and has value 39. Trailing material and non-finite values are rejected. The
+regression gate vendors all 74 numbered cases from Ulrich Neumerkel's contemporary
 `number_chars/2` comparison, including the Cor.2 error-precedence cases;
 `number_codes/2` shares the same numeric parser and has mirrored coverage for
 the recent numeric-syntax regressions.
@@ -6284,10 +6285,13 @@ When another answer exists in an interactive terminal, press `;`, Space, or
 enumeration, `a` enumerates all remaining answers, and `f` advances to the
 next five-answer boundary (5, 10, 15, ... displayed leaf answers), regardless
 of how many answers were stepped through individually beforehand. `h` displays
-the answer-control help. The answer prompt is `;` with no trailing space while
-it waits for input; after an advance command, one space marks active search and
-a second marks an answer ready for formatting. While a query is actively
-computing, EyeProlog releases readline's terminal signal handling: `Ctrl-C`
+the answer-control help. Once the top-level reader has accepted a complete
+query, the following line begins with two spaces to mark active execution; a
+third space appears when its result is ready for formatting. The answer prompt
+is `;` with no trailing space while it waits for input; after an advance
+command, one space marks active search and a second marks an answer ready for
+formatting. 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