eyeprolog 1.2.36 → 1.2.37

package/package.json

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

package/src/repl.js

@@ -617,6 +617,7 @@ function formatAnswer(engine, state, variables, env) {
       // current operator atoms in argument and list-element positions without
       // quotes, just as writeq/1 already prints them.
       operatorAtomsAsArgs: true,
+      dottedGraphicAtoms: true,
       doubleQuotes: state.solver.prologFlags.get('double_quotes')?.value?.name ?? 'chars',
     })}`);
   }

package/src/write.js

@@ -5,6 +5,7 @@ import {
 } from './term.js';
 
 const graphicAtomCharacters = new Set('!#$&*+-/<=>?@^~\\'.split(''));
+const dottedGraphicAtomCharacters = new Set([...graphicAtomCharacters, '.']);
 const compactInfixOperators = new Set([':', '..']);
 
 function quotedControlEscape(ch) {
@@ -48,6 +49,11 @@ function writeAtom(name) {
   return atomNeedsQuotes(name) ? quoteAtom(name) : name;
 }
 
+function isDottedGraphicAtom(name) {
+  return name.includes('.') && [...name].some((ch) => ch !== '.') && !name.startsWith('/*') &&
+    [...name].every((ch) => dottedGraphicAtomCharacters.has(ch));
+}
+
 function legacyVariableToIso(name) {
   if (name === '?') return '_';
   const tail = name.slice(1);
@@ -172,6 +178,10 @@ function format(term, env, options, table, maxPriority = 1200, context = 'term')
   if (resolved.type === STRING) return writeString(resolved.name);
   if (resolved.type === ATOM) {
     if (!options.quoted) return resolved.name;
+    // Top-level bindings are already delimited by their answer punctuation.
+    // Keep valid dotted graphic tokens readable there without weakening the
+    // ISO writeq/1 policy tested by WG17 #308.
+    if (options.dottedGraphicAtoms && isDottedGraphicAtom(resolved.name)) return resolved.name;
     // ISO 6.3.3.1 gives functional arguments and list elements a special
     // `arg` production: an atom that is a current operator is valid there
     // without quoting. Keep lexical exceptions such as `|` quoted.
@@ -269,6 +279,7 @@ export function formatTermForWrite(term, env = new Env(), options = {}) {
     variableNames: printableReadVariableNames(term, env, explicitVariableNames),
     compact: options.compact === true,
     operatorAtomsAsArgs: options.operatorAtomsAsArgs === true,
+    dottedGraphicAtoms: options.dottedGraphicAtoms === true,
   };
   const maxPriority = Number.isInteger(options.maxPriority)
     ? Math.max(0, Math.min(1200, options.maxPriority))

package/test/run-regression.mjs

@@ -764,7 +764,8 @@ c4 ?- call((!;1)).
           input: 'read(T).\n./*. .\nread(T).\nok.\nread(T).\n!.!.\nhalt.\n',
         });
         assertEqual(repl.status, 0, 'REPL exit status');
-        assertIncludes(repl.stdout, "T = './*.'.", 'REPL dotted graphic atom answer');
+        assertIncludes(repl.stdout, 'T = ./*..', 'REPL dotted graphic atom answer');
+        assertNotIncludes(repl.stdout, "T = './*.'", 'REPL dotted graphic atom has no spurious quotes');
         assertIncludes(repl.stdout, 'T = ok.', 'REPL following read answer');
         assertIncludes(repl.stdout, 'error(syntax_error(read_term), eyeprolog)', 'REPL syntax error');
         assertEqual(repl.stderr, '', 'REPL stderr');