eyeprolog 1.2.2 → 1.2.3

package/package.json

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

package/src/repl.js

@@ -48,6 +48,7 @@ export async function runRepl(engine, options = {}) {
           continue;
         }
 
+        await prepareInteractiveTermInput(state, goal, reader);
         const result = await solveQuery(engine, state, goal, reader, output);
         if (result?.halted) {
           exitCode = result.code;
@@ -166,6 +167,57 @@ async function readQuery(reader) {
   }
 }
 
+async function prepareInteractiveTermInput(state, goal, reader) {
+  const stream = interactiveTermInputStream(state, goal);
+  if (stream == null || terminalFullStop(String(stream.content).slice(stream.position)) >= 0) return;
+
+  const text = await readInteractiveTerm(reader);
+  if (text == null) return;
+  stream.content += text;
+  stream.pastEnd = false;
+}
+
+function interactiveTermInputStream(state, goal) {
+  if (goal.type !== 'compound') return null;
+  let reference = null;
+  if (goal.name === 'read' && goal.arity === 1) {
+    reference = state.solver.io.currentInput;
+  } else if (goal.name === 'read' && goal.arity === 2) {
+    reference = explicitInputReference(goal.args[0]);
+  } else if (goal.name === 'read_term' && goal.arity === 2) {
+    reference = state.solver.io.currentInput;
+  } else if (goal.name === 'read_term' && goal.arity === 3) {
+    reference = explicitInputReference(goal.args[0]);
+  } else {
+    return null;
+  }
+
+  const stream = reference == null ? null : state.solver.io.resolve(reference);
+  return stream?.standard && stream.alias === 'user_input' && stream.mode === 'read' ? stream : null;
+}
+
+function explicitInputReference(term) {
+  if (term.type === 'atom') return term.name;
+  if (term.type === 'compound' && term.name === '$stream' && term.arity === 1 &&
+      term.args[0].type === 'number' && /^\d+$/.test(term.args[0].name)) {
+    return Number(term.args[0].name);
+  }
+  return null;
+}
+
+async function readInteractiveTerm(reader) {
+  let source = '';
+  let prompt = '|: ';
+  while (true) {
+    const line = await reader.read(prompt);
+    if (line == null) return source.trim() ? source : null;
+    source += `${line}\n`;
+    const end = terminalFullStop(source);
+    if (end >= 0) return source.slice(0, end + 1) + '\n';
+    prompt = '|    ';
+  }
+}
+
 function quotedEscapeEnd(source, index) {
   const escaped = source[index + 1] ?? '';
   if (!escaped) return index;

package/test/run-regression.mjs

@@ -671,6 +671,29 @@ c4 ?- call((!;1)).
         assertEqual(result.stderr, '', 'stderr');
       },
     },
+    {
+      name: 'REPL read predicates consume following interactive term input',
+      run: () => {
+        const result = runCli([], {
+          input:
+            'read(X).\n' +
+            'foo.\n' +
+            'read_term(Y, []).\n' +
+            "'\\7\\'.\n" +
+            'read(user_input, Z).\n' +
+            'bar.\n' +
+            'halt.\n',
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertEqual(result.stdout,
+          '?- |:    X = foo.\n' +
+          "?- |:    Y = '\\a'.\n" +
+          '?- |:    Z = bar.\n' +
+          '?- ',
+          'stdout');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
     {
       name: 'REPL accepts multiline period-terminated queries',
       run: () => {

package/the-art-of-eyeprolog.md

@@ -6216,8 +6216,21 @@ not be a valid right operand of the displayed `=/2`, EyeProlog adds parentheses,
 for example `T = (a = b).` rather than the invalid `T = a = b.`. Use `[file].`
 or `['file.pl'].` to
 consult local source, and `halt.` or `halt(Status).` to leave the top level.
-Up and Down recall queries from the current session. Explicit `eyeprolog -h`
-displays command-line help.
+A direct top-level `read/1-2` or `read_term/2-3` from `user_input` requests the
+next full-stop-terminated Prolog term with a `|: ` input prompt instead of
+treating the interactive input stream as already exhausted. For example:
+
+```text
+?- read(X).
+|: hello.
+   X = hello.
+```
+
+The top-level prompt itself is a host-interface convention rather than part of
+ISO/IEC 13211-1; the term that follows it is parsed by the same ISO term-input
+machinery as `read/1-2` and `read_term/2-3` on other text streams. Up and Down
+recall queries from the current session. Explicit `eyeprolog -h` displays
+command-line help.
 
 ### Selecting goals