eyeprolog 1.1.28 → 1.1.29

package/package.json

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

package/src/repl.js

@@ -164,11 +164,33 @@ async function readQuery(reader) {
   }
 }
 
+function quotedEscapeEnd(source, index) {
+  const escaped = source[index + 1] ?? '';
+  if (!escaped) return index;
+
+  // ISO 6.4.2.1 octal and hexadecimal escapes are terminated by a
+  // backslash.  Consume that terminator as part of the escape so the REPL
+  // scanner does not mistake it for an escape of the following quote.
+  if (escaped === 'x') {
+    let cursor = index + 2;
+    while (/^[0-9A-Fa-f]$/.test(source[cursor] ?? '')) cursor++;
+    return source[cursor] === '\\' ? cursor : Math.max(index + 1, cursor - 1);
+  }
+  if (/^[0-7]$/.test(escaped)) {
+    let cursor = index + 1;
+    while (/^[0-7]$/.test(source[cursor] ?? '')) cursor++;
+    return source[cursor] === '\\' ? cursor : Math.max(index + 1, cursor - 1);
+  }
+
+  // Meta escapes, symbolic control escapes, and continuation escapes consume
+  // one character after the backslash.  The parser performs validity checks.
+  return index + 1;
+}
+
 function terminalFullStop(source) {
   let quote = null;
   let lineComment = false;
   let blockComment = false;
-  let escaped = false;
   let depth = 0;
 
   for (let i = 0; i < source.length; i++) {
@@ -186,10 +208,8 @@ function terminalFullStop(source) {
       continue;
     }
     if (quote != null) {
-      if (escaped) {
-        escaped = false;
-      } else if (ch === '\\') {
-        escaped = true;
+      if (ch === '\\') {
+        i = quotedEscapeEnd(source, i);
       } else if (ch === quote) {
         if (next === quote) i++;
         else quote = null;

package/src/write.js

@@ -22,8 +22,13 @@ function quoteAtom(name) {
   for (const ch of name) {
     if (ch === "'") out += "''";
     else if (ch === '\\') out += '\\\\';
-    else if (ch === '\n') out += '\\n';
+    else if (ch === '\x07') out += '\\a';
+    else if (ch === '\b') out += '\\b';
+    else if (ch === '\r') out += '\\r';
+    else if (ch === '\f') out += '\\f';
     else if (ch === '\t') out += '\\t';
+    else if (ch === '\n') out += '\\n';
+    else if (ch === '\v') out += '\\v';
     else out += ch;
   }
   return out + "'";

package/test/run-regression.mjs

@@ -617,6 +617,22 @@ c4 ?- call((!;1)).
         assertEqual(result.stderr, '', 'stderr');
       },
     },
+    {
+      name: 'REPL recognizes ISO octal and hexadecimal escapes in quoted atoms',
+      run: () => {
+        const result = runCli([], {
+          input: "writeq('\\7\\').\nwriteq('\\x7\\').\nwriteq('\\a').\nhalt.\n",
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertEqual(result.stdout,
+          "?- '\\a'   true.\n" +
+          "?- '\\a'   true.\n" +
+          "?- '\\a'   true.\n" +
+          '?- ',
+          'stdout');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
     {
       name: 'REPL accepts multiline period-terminated queries',
       run: () => {

package/the-art-of-eyeprolog.md

@@ -5268,8 +5268,11 @@ city('München').
 message("café").
 ```
 
-Inside a quoted atom, a single quote is doubled: `'don''t'`. Double-quoted lists support
-the common escapes `\n`, `\t`, `\"`, and `\\`. Whitespace is insignificant
+Inside a quoted atom, a single quote is doubled: `'don''t'`. Quoted characters
+support the ISO symbolic control escapes such as `\a`, `\n`, and `\t`, and numeric
+octal or hexadecimal escapes are terminated by a backslash; for example, `'\7\'`
+and `'\x7\'` both denote the alert character. Double-quoted lists use the same
+quoted-character escapes. Whitespace is insignificant
 between tokens, and a `%` comment continues to the end of its line. Doubling
 the active delimiter is also accepted inside either quoted form, so `""`
 inside double-quoted notation denotes one literal double quote character.