eyeprolog 1.5.70 → 1.5.71

package/package.json

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

package/src/iso.js

@@ -1345,9 +1345,9 @@ function* currentInputBuiltin({ solver, goal, env }) {
   const value = deref(goal.args[0], env);
   if (value.type !== VAR) {
     const id = streamTermReference(goal.args[0], env);
-    const stream = solver.io.resolve(id);
-    if (!stream) throw new PrologError('domain_error(stream)', value);
-    if (stream.id === solver.io.currentInput) yield env;
+    // A closed handle is still a stream-term, but cannot be current (#107).
+    // Validate its shape, then test identity rather than requiring an open stream.
+    if (id === solver.io.currentInput) yield env;
     return;
   }
   const next = env.clone();
@@ -1357,9 +1357,7 @@ function* currentOutputBuiltin({ solver, goal, env }) {
   const value = deref(goal.args[0], env);
   if (value.type !== VAR) {
     const id = streamTermReference(goal.args[0], env);
-    const stream = solver.io.resolve(id);
-    if (!stream) throw new PrologError('domain_error(stream)', value);
-    if (stream.id === solver.io.currentOutput) yield env;
+    if (id === solver.io.currentOutput) yield env;
     return;
   }
   const next = env.clone();

package/test/regression/cases-regression.mjs

@@ -28,6 +28,19 @@ import {
 
 export function regressionCases() {
   return [
+    {
+      name: 'REPL current_input/1 and current_output/1 fail on closed stream handles (issue #107)',
+      run: () => {
+        const file = sourceAtom(path.join(temp.dir, 'closed-stream-107.txt'));
+        const result = runCli([], { input:
+          `open(${file},write,S),close(S),current_input(S).\n` +
+          `open(${file},write,S),close(S),current_output(S).\nhalt.\n`,
+        });
+        assertEqual(result.status, 0, result.stderr);
+        assertEqual((result.stdout.match(/false\./g) ?? []).length, 2, 'both closed-handle queries fail');
+        assertNotIncludes(result.stdout + result.stderr, 'error(', 'no stream domain error');
+      },
+    },
     {
       name: 'must_be/2 and can_be/2 reject invalid type descriptors before checking values (issue #106)',
       run: () => {

package/test/run-iso-strict.mjs

@@ -23,6 +23,35 @@ import { TestReporter, isMainModule, runStandalone } from './test-style.mjs';
 export function runIsoStrict(reporter = new TestReporter()) {
   reporter.section('Strict ISO core');
 
+  reporter.test('current stream queries fail for closed handles while stream operations report existence errors (issue #107)', () => {
+    const directory = mkdtempSync(join(tmpdir(), 'eyeprolog-stream-107-'));
+    const file = `'${join(directory, 'stream.txt').replaceAll("'", "''")}'`;
+    try {
+      writeFileSync(join(directory, 'stream.txt'), '');
+      for (const isoStrict of [false, true]) {
+        for (const predicate of ['current_input', 'current_output']) {
+          equal(run('', { isoStrict, goal: `open(${file},write,S),close(S),${predicate}(S)` }).stdout,
+            '', `${predicate}/1 fails on the reported closed handle`);
+          const mode = predicate === 'current_input' ? 'read' : 'write';
+          const setter = mode === 'read' ? 'set_input' : 'set_output';
+          const source = `answer(ok) :- ${predicate}(Original),open(${file},${mode},S),` +
+            `\\+ ${predicate}(S),${setter}(S),${predicate}(S),close(S),` +
+            `\\+ ${predicate}(S),${predicate}(Original),` +
+            `catch((${setter}(S),fail),error(existence_error(stream,_),_),true),` +
+            'catch((close(S),fail),error(existence_error(stream,_),_),true).';
+          equal(run(source, { isoStrict, goal: 'answer(X)' }).stdout, 'answer(ok).\n',
+            `${predicate}/1 recognizes live handles and restores the standard stream after close`);
+          for (const term of ['foo', '42', "'$stream'(foo)"]) {
+            equal(capture(() => run('', { isoStrict, goal: `${predicate}(${term})` })).formal,
+              'domain_error(stream)', `${predicate}/1 rejects malformed stream term ${term}`);
+          }
+        }
+      }
+    } finally {
+      rmSync(directory, { recursive: true, force: true });
+    }
+  });
+
   reporter.test('executes ordinary Part 1 clauses', () => {
     const result = run('p(X) :- X = 1.\n', { isoStrict: true, goal: 'p(1)' });
     equal(result.stdout, 'p(1).\n', 'stdout');