eyeprolog 1.3.23 → 1.3.25

package/package.json

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

package/src/iso.js

@@ -6,7 +6,7 @@ import {
   properListItems, termIsGround, termToString, unify, variable, variantTerms,
 } from './term.js';
 import { sameNumberValue } from './number-value.js';
-import { createParserOperatorState, parseGoalText, parseNumberTokenText, parseTermText } from './parser.js';
+import { NumberRepresentationError, createParserOperatorState, parseGoalText, parseNumberTokenText, parseTermText } from './parser.js';
 import { formatTermForWrite } from './write.js';
 import { emptyTerminalSequence, expandDcgBody, isListOrPartialList, validateDcgEmbeddedGoals } from './dcg.js';
 import {
@@ -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);
@@ -1235,7 +1246,8 @@ function readTermFromStream(stream, solver) {
         const term = parseReadTermText(candidate.text, solver);
         stream.position = candidate.end;
         return scopeReadTerm(term);
-      } catch (_) {
+      } catch (error) {
+        if (error instanceof NumberRepresentationError) throw new PrologError(error.formal);
         // A dot inside a graphic operator, such as =.., is only a possible
         // terminator. Keep scanning until a complete term parses.
       }
@@ -1661,7 +1673,8 @@ function parseIsoNumber(text) {
     const finite = Number(value.name);
     if (!Number.isFinite(finite)) return null;
     return numberTerm(numberTextFromDouble(finite));
-  } catch (_) {
+  } catch (error) {
+    if (error instanceof NumberRepresentationError) throw new PrologError(error.formal);
     return null;
   }
 }
@@ -2299,9 +2312,10 @@ function evaluate(term, env) {
   term = deref(term, env);
   if (term.type === VAR) throw new PrologError('instantiation_error');
   if (term.type === NUMBER) {
-    return isDecimalInteger(term.name)
-      ? { integer: true, value: BigInt(term.name) }
-      : { integer: false, value: Number(term.name) };
+    if (isDecimalInteger(term.name)) return { integer: true, value: BigInt(term.name) };
+    const value = Number(term.name);
+    if (!Number.isFinite(value)) throw new PrologError('evaluation_error(float_overflow)');
+    return { integer: false, value };
   }
   if (term.type === ATOM) {
     if (term.name === 'pi') return { integer: false, value: Math.PI };

package/src/parser.js

@@ -3,6 +3,23 @@
 import { ATOM, COMPOUND, atom, compound, cons, emptyList, numberTerm, variable } from './term.js';
 import { continuesGraphicToken, isTerminatingFullStop } from './syntax-scan.js';
 
+
+export class NumberRepresentationError extends Error {
+  constructor(formal) {
+    super(`error(${formal})`);
+    this.name = 'NumberRepresentationError';
+    this.formal = formal;
+  }
+}
+
+function finiteFloatTokenText(text) {
+  const value = Number(text);
+  if (!Number.isFinite(value)) {
+    throw new NumberRepresentationError('representation_error(max_float)');
+  }
+  return value === 0 ? '0.0' : text;
+}
+
 const TOK = {
   EOF: 'eof', ATOM: 'atom', VAR: 'var', STRING: 'string', NUMBER: 'number',
   LPAREN: '(', RPAREN: ')', LBRACKET: '[', RBRACKET: ']', LBRACE: '{', RBRACE: '}',
@@ -536,7 +553,7 @@ class Parser {
       }
       let text = this.source.slice(start, this.pos);
       if (!hasFraction) text = BigInt(text).toString();
-      else if (Object.is(Number(text), -0)) text = '0.0';
+      else text = finiteFloatTokenText(text);
       return { type: TOK.NUMBER, text, line };
     }
 
@@ -1510,8 +1527,7 @@ export function parseNumberTokenText(text) {
   }
   if (position !== source.length) throw invalidNumberTokenError;
   if (/^-?\d+$/.test(source)) return numberTerm(BigInt(source).toString());
-  if (Object.is(Number(source), -0)) return numberTerm('0.0');
-  return numberTerm(source);
+  return numberTerm(finiteFloatTokenText(source));
 }
 
 export function parseTermText(text, options = {}) {

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

@@ -738,6 +738,77 @@ c4 ?- call((!;1)).
         assertEqual(result.stderr, '', 'stderr');
       },
     },
+    {
+      name: 'float literals reject overflow and normalize underflow (issue #54)',
+      run: () => {
+        const result = runCli([], {
+          input: [
+            'T = 1.0e-99999, F is T.',
+            'T = 1.0e99999, float(T).',
+            'T = 1.0e99999, float(T), F is T.',
+            'T = 1.0e99999, U = 2.0e99999, T > U.',
+            'T = 1.0e99999, U = 2.0e99999, T < U.',
+            'T = 1.0e99999, U = 2.0e99999, T = U.',
+            'T = 1.0e99999, U = 2.0e99999, T =:= U.',
+            'halt.',
+            '',
+          ].join('\n'),
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertIncludes(result.stdout, 'T = 0.0, F = 0.0.', 'underflow rounds on input');
+        assertEqual(
+          (result.stdout.match(/error\(representation_error\(max_float\)\)\./g) ?? []).length,
+          6,
+          'all overflowing literals fail while being read',
+        );
+        assertEqual(result.stderr, '', 'stderr');
+
+        let overflow = null;
+        try {
+          parseNumberTokenText('1.0e99999');
+        } catch (error) {
+          overflow = error;
+        }
+        assertEqual(overflow?.formal, 'representation_error(max_float)', 'number token overflow');
+        assertEqual(parseNumberTokenText('1.0e-99999').name, '0.0', 'number token underflow');
+
+        const chars = Array.from('1.0e99999', atom);
+        const numberChars = createDefaultRegistry().get('number_chars', 2).handler;
+        let numberCharsError = null;
+        try {
+          numberChars({
+            goal: compound('number_chars', [variable('N'), listFromItems(chars)]),
+            env: new Env(),
+          }).next();
+        } catch (error) {
+          numberCharsError = error;
+        }
+        assertEqual(numberCharsError?.formal, 'representation_error(max_float)', 'number_chars overflow');
+
+        let readError = null;
+        try {
+          runEyeProlog('', {
+            goal: 'read(X)',
+            ioOptions: { input: '1.0e99999.\n' },
+          });
+        } catch (error) {
+          readError = error;
+        }
+        assertEqual(readError?.formal, 'representation_error(max_float)', 'read/1 overflow');
+
+        const isHandler = createDefaultRegistry().get('is', 2).handler;
+        let hostTermError = null;
+        try {
+          isHandler({
+            goal: compound('is', [variable('F'), numberTerm('1.0e99999')]),
+            env: new Env(),
+          }).next();
+        } catch (error) {
+          hostTermError = error;
+        }
+        assertEqual(hostTermError?.formal, 'evaluation_error(float_overflow)', 'host-created non-finite term');
+      },
+    },
     {
       name: 'readers keep a full stop inside a character-code constant (WG17 #367)',
       run: () => {
@@ -1890,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: () => {