eyeprolog 1.3.24 → 1.3.25

package/package.json

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

package/src/iso.js

@@ -1025,10 +1025,21 @@ function inputUnitBuiltin(name) {
       throw new PrologError('permission_error(input, past_end_of_stream)', streamHandle(stream.id));
     }
     if (stream.pastEnd && stream.eofAction === 'reset') {
-      stream.position = 0;
+      // A terminal EOF (Ctrl-D) is local to one input operation. The next
+      // operation should wait for fresh terminal input rather than rewinding
+      // and replaying the already-consumed interactive buffer.
+      if (typeof stream.interactiveReadUnit !== 'function') stream.position = 0;
       stream.pastEnd = false;
     }
     const peek = name.startsWith('peek');
+    if (stream.position >= stream.content.length &&
+        typeof stream.interactiveReadUnit === 'function') {
+      const text = stream.interactiveReadUnit();
+      if (text != null) {
+        stream.content += String(text);
+        stream.pastEnd = false;
+      }
+    }
     let unit;
     try {
       unit = solver.io.readUnit(stream, peek);

package/src/repl.js

@@ -182,6 +182,18 @@ class LineReader {
     }
   }
 
+  readInteractiveUnitSync() {
+    if (!this.canReadTermSynchronously()) return null;
+    this.output.write('|: ');
+    const line = this.readTerminalLineSync();
+    if (line == null) return null;
+    // The interactive line editor uses Enter to submit character input.  Do
+    // not leave that submission newline buffered for the next get_/peek_
+    // call (matching SWI/Scryer top-level behaviour).  An empty submitted
+    // line still represents an actual newline character.
+    return line.length === 0 ? '\n' : line;
+  }
+
   readTerminalLineSync() {
     const byte = Buffer.allocUnsafe(1);
     const bytes = [];
@@ -257,11 +269,13 @@ function makeState(engine, sources, output, options = {}, previousState = null,
   });
   const userInput = solver.io.resolve('user_input');
   if (userInput && reader?.canReadTermSynchronously()) {
-    // The solver is synchronous.  While pullSolution() has readline suspended,
-    // let ISO term input request a complete terminal term exactly when read/1-2
-    // or read_term/2-3 actually executes.  This also works inside conjunctions
-    // and user predicates instead of only when read/* is the whole REPL goal.
+    // The solver is synchronous. While pullSolution() has readline suspended,
+    // let ISO input request terminal data exactly when read/1-2, read_term/2-3,
+    // or a character/code input predicate actually executes. This also works
+    // inside conjunctions and user predicates instead of only when an input
+    // predicate is the whole REPL goal.
     userInput.interactiveReadTerm = () => reader.readInteractiveTermSync(solver);
+    userInput.interactiveReadUnit = () => reader.readInteractiveUnitSync();
   }
   const flagOverrides = new Map(previousState?.flagOverrides ?? []);
   for (const [name, value] of flagOverrides) {

package/test/run-regression.mjs

@@ -1961,6 +1961,34 @@ c4 ?- call((!;1)).
         assertIncludes(result.stdout, '   true.', 'post-EOF query executes');
       },
     },
+    {
+      name: 'REPL character input is on demand and Ctrl-D stays local (issue #55)',
+      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 'peek_char(P), get_char(C), get_code(K).\n'; sleep 0.3; ` +
+          `printf 'ab\n'; sleep 0.3; printf 'get_char(N).\n'; sleep 0.3; ` +
+          `printf 'z\n'; sleep 0.3; printf 'get_char(E).\n'; sleep 0.3; ` +
+          `printf '\\004'; sleep 0.3; printf 'get_char(D).\n'; sleep 0.3; ` +
+          `printf 'q\n'; sleep 0.3; printf 'halt.\n'; } | ` +
+          `script -qefc ${shellQuote(command)} /dev/null`;
+        const result = spawnSync('sh', ['-c', scriptCommand], {
+          cwd: packageRoot,
+          encoding: 'utf8',
+          timeout: 5000,
+        });
+        assertEqual(result.error?.code, undefined, 'interactive character input timeout');
+        assertEqual(result.status, 0, 'exit status');
+        assertIncludes(result.stdout, 'P = a, C = a, K = 98.', 'peek/get char and code input');
+        assertIncludes(result.stdout, 'N = z.', 'Enter submits but is not buffered as the next character');
+        assertIncludes(result.stdout, 'E = end_of_file.', 'Ctrl-D character result');
+        assertIncludes(result.stdout, 'D = q.', 'character input resumes after Ctrl-D');
+      },
+    },
     {
       name: 'interactive user_input hook serves reads reached through user predicates',
       run: () => {