eyeprolog 1.3.2 → 1.3.3

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.3.2",
+  "version": "1.3.3",
   "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, parseClauses, parseGoalText, parseNumberTokenText } from './parser.js';
+import { createParserOperatorState, parseGoalText, parseNumberTokenText, parseTermText } from './parser.js';
 import { formatTermForWrite } from './write.js';
 import { emptyTerminalSequence, expandDcgBody, isListOrPartialList, validateDcgEmbeddedGoals } from './dcg.js';
 import {
@@ -1199,8 +1199,7 @@ function scopeReadTerm(term) {
 function parseReadTermText(text, solver) {
   const converted = convertedTermText(text, solver);
   const operatorState = createParserOperatorState(solver.program.operators.values(), false);
-  const clauses = parseClauses(converted, {
-    sourceMetadata: false,
+  return parseTermText(converted, {
     operatorState,
     isoStrict: solver.isoStrict,
     doubleQuotes: solver.prologFlags.get('double_quotes')?.value?.name ?? 'chars',
@@ -1208,8 +1207,6 @@ function parseReadTermText(text, solver) {
     // Earlier ambiguous dots must remain available to maximal graphic tokens.
     readTermEnd: converted.length - 1,
   });
-  if (clauses.length !== 1 || clauses[0].body.length) throw new Error('bad term');
-  return clauses[0].head;
 }
 
 export function isCompleteReadTermText(text, solver) {

package/src/parser.js

@@ -819,6 +819,16 @@ class Parser {
     }
     throw new Error(`parse line ${this.token.line}: bad term`);
   }
+  parseStandaloneTerm() {
+    // read/1 and read_term/* consume one ordinary Prolog term, not a program
+    // clause. In particular, commas and operators such as :- and ?- belong to
+    // the term itself and must not be reinterpreted by parseProgram().
+    const term = this.parseTerm(0, true, true, true);
+    this.expect(TOK.DOT, '.');
+    this.advance();
+    this.expect(TOK.EOF, 'end of input');
+    return term;
+  }
   sourceLineIsIndented(line) {
     let start = 0;
     for (let current = 1; current < line; current++) {
@@ -1504,6 +1514,10 @@ export function parseNumberTokenText(text) {
   return numberTerm(source);
 }
 
+export function parseTermText(text, options = {}) {
+  return new Parser(text, options).parseStandaloneTerm();
+}
+
 export function parseGoalText(text, options = {}) {
   const clauses = parseClauses(`zz_goal((${text})).`, options);
   const head = clauses[0]?.head;

package/test/run-regression.mjs

@@ -819,6 +819,27 @@ c4 ?- call((!;1)).
         });
         assertEqual(consecutive.stdout, "answer(./*., ok).\n", 'following read starts after the complete term');
 
+        // Issue #41 follow-up: read/1 consumes an ordinary term, not a program
+        // clause head. A comma chain therefore has no program-level two-comma
+        // limit, and source operators such as :- and ?- remain term data.
+        const commaChain = runEyeProlog('', {
+          goal: 'read(T)',
+          ioOptions: { input: '!,!,! .\n' },
+        });
+        assertEqual(commaChain.stdout, 'read((!, !, !)).\n', 'three-element comma term');
+
+        const ruleAsData = runEyeProlog('', {
+          goal: 'read(T)',
+          ioOptions: { input: 'a :- b.\n' },
+        });
+        assertEqual(ruleAsData.stdout, 'read((a :- b)).\n', 'rule operator remains term data');
+
+        const queryAsData = runEyeProlog('', {
+          goal: 'read(T)',
+          ioOptions: { input: '?- foo.\n' },
+        });
+        assertEqual(queryAsData.stdout, 'read((?- foo)).\n', 'query operator remains term data');
+
         // A possible full stop can fail to complete the term while still
         // extending a current graphic operator into an ordinary atom.  The
         // later standalone full stop then completes the read term.  Exercise