eyeprolog 1.3.16 → 1.3.17

package/package.json

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

package/src/repl.js

@@ -366,7 +366,6 @@ function terminalFullStop(source, solver = null) {
   let quote = null;
   let lineComment = false;
   let blockComment = false;
-  let depth = 0;
 
   for (let i = 0; i < source.length; i++) {
     const ch = source[i];
@@ -415,10 +414,12 @@ function terminalFullStop(source, solver = null) {
       quote = ch;
       continue;
     }
-    if ('([{'.includes(ch)) depth++;
-    else if (')]}'.includes(ch)) depth = Math.max(0, depth - 1);
-    else if (depth === 0 && isTerminatingFullStop(source, i, convert) &&
-             onlyLayoutAndComments(source.slice(i + 1))) return i;
+    // ISO 8.14.1.1 locates the end token lexically before read-term parsing.
+    // An unmatched opening bracket therefore must not make the top level wait
+    // for more input after a terminating full stop; parsing the collected text
+    // is what reports the syntax error (for example `[l.` or `{.`).
+    if (isTerminatingFullStop(source, i, convert) &&
+        onlyLayoutAndComments(source.slice(i + 1))) return i;
   }
   return -1;
 }

package/test/run-regression.mjs

@@ -1410,6 +1410,27 @@ c4 ?- call((!;1)).
         assertEqual(result.stdout, 'ok', 'DCG hand-off benchmark result');
       },
     },
+    {
+      name: 'DCG state hand-off reaches the next non-terminal at 8192 cells (issue #49 comment 5347991607)',
+      run: () => {
+        const filename = path.join(tmp, `issue49-small-handoff-${tmpCounter++}.pl`);
+        fs.writeFileSync(filename,
+          ':- set_prolog_flag(occurs_check, true).\na --> ..., epsilon.\nepsilon --> [].\n');
+        const result = runCli([], {
+          input:
+            `[${sourceAtom(filename)}].\n` +
+            'use_module(library(lists)).\n' +
+            '\\+ \\+ (length(L,8192), phrase(a,L)).\n' +
+            'halt.\n',
+          timeout: 3000,
+        });
+        if (result.error) throw result.error;
+        assertEqual(result.status, 0, `small DCG hand-off status; stderr=${result.stderr}`);
+        assertNotIncludes(result.stdout, 'resource_error', 'small DCG hand-off resource error');
+        assertNotIncludes(result.stdout, 'depth_limit_exceeded', 'small DCG hand-off depth error');
+        assertEqual(result.stderr, '', 'small DCG hand-off stderr');
+      },
+    },
     {
       name: 'Trealla-style DCG hand-off reaches 65536 cells without the solver depth ceiling',
       run: () => {
@@ -1910,6 +1931,19 @@ c4 ?- call((!;1)).
         assertIncludes(result.stdout, '?- repeat, fail.', 'terminal query echo');
       },
     },
+    {
+      name: 'REPL stops at the end token before parsing unmatched brackets (issue #51)',
+      run: () => {
+        const result = runCli([], { input: '[l.\ntrue.\n{.\ntrue.\nhalt.\n' });
+        assertEqual(result.status, 0, 'exit status');
+        assertNotIncludes(result.stdout, '|    ', 'no continuation prompt after malformed end token');
+        assertEqual((result.stdout.match(/\?-    true\./g) ?? []).length, 2,
+          'following lines remain separate top-level queries');
+        assertEqual((result.stdout.match(/parse line 1:/g) ?? []).length, 2,
+          'both malformed bracketed queries report syntax errors');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
     {
       name: 'REPL accepts multiline period-terminated queries',
       run: () => {