eyeprolog 1.2.23 → 1.2.24

package/package.json

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

package/src/program.js

@@ -159,6 +159,9 @@ export class Program {
       scalarFactsOnly: true,
       dynamic: this.dynamicPredicates.has(modulePredicateKey(module, name, arity)),
       negationStratum: null,
+      hasCut: false,
+      cutReachable: null,
+      bundledLibrary: false,
     };
     return group;
   }
@@ -186,6 +189,7 @@ export class Program {
       group.rejectedDemandIndexes.clear();
     }
     group.clauses.push(clause);
+    if (clauseHasCut(clause)) group.hasCut = true;
     const clausePosition = group.clauses.length - 1;
     for (let i = 0; i < head.arity; i++) indexOne(group.argIndexes[i], head.args[i], clause, group.clauses, clausePosition);
   }
@@ -292,6 +296,7 @@ export class Program {
     const groups = [...this.groups.values()];
     const indexByGroup = new Map(groups.map((group, i) => [group, i]));
     const deps = groups.map(() => new Set());
+    const cutDeps = groups.map(() => new Set());
     const negativeEdges = [];
     for (const group of groups) {
       const groupIndex = indexByGroup.get(group);
@@ -299,11 +304,18 @@ export class Program {
         if (isCompactBinaryClause(clause)) {
           if (clause.bodyName != null) {
             const dep = this.findGroup(clause.bodyName, 2, group.module);
-            if (dep) deps[groupIndex].add(indexByGroup.get(dep));
+            if (dep) {
+              deps[groupIndex].add(indexByGroup.get(dep));
+              cutDeps[groupIndex].add(indexByGroup.get(dep));
+            }
           }
           continue;
         }
         for (const goal of clause.body) {
+          for (const dependency of collectGoalDependencies(goal, false, true)) {
+            const dep = this.findGroup(dependency.name, dependency.arity, dependency.module ?? group.module);
+            if (dep) cutDeps[groupIndex].add(indexByGroup.get(dep));
+          }
           const directKey = directGoalDependencyKey(goal);
           if (directKey) {
             const dep = this.findGroup(goal.name, goal.arity, goal.module ?? group.module);
@@ -325,6 +337,8 @@ export class Program {
       const start = indexByGroup.get(group);
       const standardLibraryModule = group.module !== 'user' &&
         this.modules.get(group.module)?.filename?.startsWith('src/lib/');
+      group.bundledLibrary = standardLibraryModule === true;
+      group.cutReachable = [...reachableIndexes(start, cutDeps)].some((index) => groups[index].hasCut);
       const seen = new Set();
       const stack = [start];
       let recursive = false;
@@ -533,6 +547,7 @@ class ProgramBuilder {
         group.clauses.push(clause);
         clause.groundHead = termHasNoVariables(head);
         clause.scalarHead = head.type === COMPOUND && head.args.every(isScalar);
+        if (clauseHasCut(clause)) group.hasCut = true;
         if (clause.body.length !== 0 || !clause.scalarHead) group.scalarFactsOnly = false;
         for (let i = 0; i < head.arity; i++) {
           indexOne(group.argIndexes[i], head.args[i], clause, group.clauses, clausePosition);
@@ -1114,33 +1129,41 @@ function directGoalDependencyKey(goal) {
   return `${goal.name}/${goal.arity}`;
 }
 
-function collectGoalDependencies(goal, negated) {
+function collectGoalDependencies(goal, negated, traverseConditionals = false) {
   if (goal.type === ATOM) return [{ key: `${goal.name}/0`, name: goal.name, arity: 0, module: goal.module, negative: negated }];
   if (goal.type !== COMPOUND) return [];
   if (goal.name === ',' && goal.arity === 2) {
     return [
-      ...collectGoalDependencies(goal.args[0], negated),
-      ...collectGoalDependencies(goal.args[1], negated),
+      ...collectGoalDependencies(goal.args[0], negated, traverseConditionals),
+      ...collectGoalDependencies(goal.args[1], negated, traverseConditionals),
+    ];
+  }
+  if (traverseConditionals && (goal.name === ';' || goal.name === '->') && goal.arity === 2) {
+    return [
+      ...collectGoalDependencies(goal.args[0], negated, true),
+      ...collectGoalDependencies(goal.args[1], negated, true),
     ];
   }
   if ((goal.name === '\\+' || goal.name === 'not') && goal.arity === 1) {
-    return collectGoalDependencies(goal.args[0], !negated);
+    return collectGoalDependencies(goal.args[0], !negated, traverseConditionals);
   }
   if (goal.name === 'once' && goal.arity === 1) {
-    return collectGoalDependencies(goal.args[0], negated);
+    return collectGoalDependencies(goal.args[0], negated, traverseConditionals);
   }
   if (goal.name === 'forall' && goal.arity === 2) {
     return [
-      ...collectGoalDependencies(goal.args[0], negated),
-      ...collectGoalDependencies(goal.args[1], negated),
+      ...collectGoalDependencies(goal.args[0], negated, traverseConditionals),
+      ...collectGoalDependencies(goal.args[1], negated, traverseConditionals),
     ];
   }
   if ((goal.name === 'findall' || goal.name === 'sumall') && goal.arity === 3) {
-    return collectGoalDependencies(goal.args[1], negated);
+    return collectGoalDependencies(goal.args[1], negated, traverseConditionals);
+  }
+  if (goal.name === 'countall' && goal.arity === 2) {
+    return collectGoalDependencies(goal.args[0], negated, traverseConditionals);
   }
-  if (goal.name === 'countall' && goal.arity === 2) return collectGoalDependencies(goal.args[0], negated);
   if ((goal.name === 'aggregate_min' || goal.name === 'aggregate_max') && goal.arity === 5) {
-    return collectGoalDependencies(goal.args[2], negated);
+    return collectGoalDependencies(goal.args[2], negated, traverseConditionals);
   }
   return [{ key: `${goal.name}/${goal.arity}`, name: goal.name, arity: goal.arity, module: goal.module, negative: negated }];
 }
@@ -1308,6 +1331,7 @@ function rebuildGroupIndexes(group) {
   group.demandIndexes.clear();
   group.rejectedDemandIndexes.clear();
   group.scalarFactsOnly = true;
+  group.hasCut = false;
   for (let clausePosition = 0; clausePosition < group.clauses.length; clausePosition++) {
     const clause = group.clauses[clausePosition];
     if (isCompactBinaryClause(clause)) {
@@ -1320,6 +1344,7 @@ function rebuildGroupIndexes(group) {
     }
     clause.groundHead = termHasNoVariables(clause.head);
     clause.scalarHead = clause.head.type === COMPOUND && clause.head.args.every(isScalar);
+    if (clauseHasCut(clause)) group.hasCut = true;
     if (clause.body.length !== 0 || !clause.scalarHead) group.scalarFactsOnly = false;
     for (let i = 0; i < group.arity; i++) indexOne(group.argIndexes[i], clause.head.args[i], clause, group.clauses, clausePosition);
   }

package/src/solver.js

@@ -1,8 +1,9 @@
 // Depth-first EyeProlog solver with builtin dispatch, memoization, and guarded recursion handling.
 // Most semantic decisions still flow through unification; optimizations only select candidates earlier.
 import {
-  COMPOUND, Env, compound, copyResolved, deref, emptyList, flattenConjunction, freshTerm,
-  numberTerm, numberTextFromDouble, termIsGround, termToString, unify, variantTerms,
+  COMPOUND, NUMBER, VAR, Env, compound, cons, copyResolved, deref, emptyList,
+  flattenConjunction, freshTerm, isCons, isDecimalInteger, isEmptyList,
+  numberTerm, numberTextFromDouble, termIsGround, termToString, unify, variable, variantTerms,
 } from './term.js';
 import { sameNumberValue } from './number-value.js';
 import { PrologError, getStrictIsoRegistry } from './iso.js';
@@ -367,6 +368,23 @@ export class Solver {
         }
         qualifyMetaArguments(goal, group);
 
+        const lengthIterator = prologueLengthIterator(this, group, goal, env);
+        if (lengthIterator != null) {
+          const firstResult = lengthIterator.next();
+          if (firstResult.done) break;
+          stack.push({
+            kind: 'resumeBuiltin',
+            iterator: lengthIterator,
+            goals: rest,
+            depth: depth + 1,
+            active,
+          });
+          goals = rest;
+          env = firstResult.value;
+          depth++;
+          continue;
+        }
+
         if (group.tabled) {
           const key = memoKey(goal, env, group);
           if (key.hasBound) {
@@ -418,8 +436,8 @@ export class Solver {
     return activeVariantIn(goal, env, this.active);
   }
 
-  checkMemoryLimit() {
-    if (this.inferences < this.nextMemoryCheck) return;
+  checkMemoryLimit(force = false) {
+    if (!force && this.inferences < this.nextMemoryCheck) return;
     this.nextMemoryCheck = this.inferences + 256;
     if (!Number.isFinite(this.maxMemoryBytes)) return;
     const used = usedHeapSize();
@@ -477,6 +495,12 @@ export class Solver {
         if (!unify(goal, freshHead, next)) continue;
         if (freshBody.length === 0) {
           yield* this.solve(rest, next, depth + 1);
+        } else if (!groupNeedsActiveFrame(group)) {
+          for (const bodyEnv of this.solve(freshBody, next, depth + 1)) {
+            if (this.solutionsSeen > 0) this.solutionsSeen--;
+            yield* this.solve(rest, bodyEnv, depth + 1);
+            if (this.solutionsSeen >= this.solutionLimit) break;
+          }
         } else {
           yield* this.solveRuleBodyThenRest(goal, env, freshBody, rest, next, depth);
         }
@@ -613,7 +637,11 @@ function pushUserGoalUncachedFrames(stack, solver, group, goal, rest, env, depth
   const candidates = selectClauseCandidates(group, goal, env);
   const frames = [];
   const invocation = { goal, env };
-  const guarded = !group.linearNumeric;
+  // Active frames serve two purposes: they delimit cut and detect variants in
+  // recursive user predicates. Cut-free, non-recursive library helpers need
+  // neither. Copying their full active stack at every recursive step made
+  // otherwise linear relations such as length/2 retain O(depth^2) references.
+  const guarded = groupNeedsActiveFrame(group);
   const release = guarded ? [{ kind: 'releaseActive' }] : [];
   const nextActive = guarded ? [...active, invocation] : active;
   for (const pass of [candidates.primary, candidates.fallback]) {
@@ -663,6 +691,141 @@ function pushUserGoalUncachedFrames(stack, solver, group, goal, rest, env, depth
   for (let i = frames.length - 1; i >= 0; i--) stack.push(frames[i]);
 }
 
+function groupNeedsActiveFrame(group) {
+  // User code may observe the surrounding control context through later cuts,
+  // so only apply this planning shortcut to the fixed bundled-library graph.
+  if (group.bundledLibrary !== true) return true;
+  // A frame is also required above a cut-bearing callee. The disjunction
+  // builtin uses the caller marker to distinguish a callee-local cut from a
+  // cut in its own branch. null means dependency analysis was intentionally
+  // disabled (strict mode or a newly mutated group), so remain conservative.
+  return group.cutReachable !== false || (group.recursive && !group.linearNumeric);
+}
+
+function prologueLengthIterator(solver, group, goal, env) {
+  if (solver.registry.eyePrologLibrary !== true ||
+      group.module !== 'prologue' || group.name !== 'length' || group.arity !== 2 ||
+      group.bundledLibrary !== true || group.clauses.length !== 2) {
+    return null;
+  }
+
+  // Delayed and constrained variables need the ordinary solver's wake-up
+  // points. The fast path is deliberately limited to plain finite-tree terms.
+  if (env._clpz != null) return null;
+  const length = deref(goal.args[1], env);
+  if (length.type === VAR && env._delays?.has(length.name)) return null;
+
+  let cursor = deref(goal.args[0], env);
+  while (isCons(cursor)) {
+    cursor = deref(cursor.args[1], env);
+  }
+  if (cursor.type === VAR) {
+    if (env._delays?.has(cursor.name)) return null;
+    if (length.type === VAR && cursor.name === length.name) return null;
+  }
+  return prologueLengthSolutions(solver, goal, env);
+}
+
+function* prologueLengthSolutions(solver, goal, env) {
+  const requestedLength = deref(goal.args[1], env);
+  if (requestedLength.type !== VAR) {
+    if (requestedLength.type !== NUMBER || !isDecimalInteger(requestedLength.name)) {
+      throw new PrologError('type_error(integer)', requestedLength);
+    }
+    const length = BigInt(requestedLength.name);
+    if (length < 0n) throw new PrologError('domain_error(not_less_than_zero)', requestedLength);
+    yield* fixedLengthSolutions(solver, goal.args[0], length, env);
+    return;
+  }
+
+  yield* generatedLengthSolutions(solver, goal.args[0], goal.args[1], env);
+}
+
+function* fixedLengthSolutions(solver, list, length, env) {
+  let cursor = deref(list, env);
+  let remaining = length;
+  let steps = 0n;
+  while (isCons(cursor)) {
+    if (remaining === 0n) return;
+    remaining--;
+    cursor = deref(cursor.args[1], env);
+    lengthAllocationCheckpoint(solver, ++steps);
+  }
+  if (isEmptyList(cursor)) {
+    if (remaining === 0n) yield env;
+    return;
+  }
+  if (cursor.type !== VAR) return;
+
+  // A source-level anonymous variable occurs nowhere else, so materializing
+  // its list cannot affect any subsequent goal or answer substitution.
+  if (isAnonymousVariable(cursor)) {
+    yield env;
+    return;
+  }
+
+  const id = nextFreshId();
+  let suffix = emptyList();
+  for (let index = 0n; index < remaining; index++) {
+    suffix = cons(variable(`__length${id}_${index}`), suffix);
+    lengthAllocationCheckpoint(solver, ++steps);
+  }
+  const next = env.clone();
+  solver.stats.unify_calls++;
+  if (unify(cursor, suffix, next)) yield next;
+}
+
+function* generatedLengthSolutions(solver, list, length, env) {
+  let cursor = deref(list, env);
+  let count = 0n;
+  let steps = 0n;
+  while (isCons(cursor)) {
+    count++;
+    cursor = deref(cursor.args[1], env);
+    lengthAllocationCheckpoint(solver, ++steps);
+  }
+  if (isEmptyList(cursor)) {
+    const next = bindGeneratedLength(solver, length, count, env);
+    if (next != null) yield next;
+    return;
+  }
+  if (cursor.type !== VAR) return;
+
+  if (isAnonymousVariable(cursor)) {
+    for (let value = count; ; value++) {
+      const next = bindGeneratedLength(solver, length, value, env);
+      if (next != null) yield next;
+    }
+  }
+
+  const id = nextFreshId();
+  let suffix = emptyList();
+  for (let extra = 0n; ; extra++) {
+    const next = env.clone();
+    solver.stats.unify_calls++;
+    if (unify(cursor, suffix, next)) {
+      const answer = bindGeneratedLength(solver, length, count + extra, next);
+      if (answer != null) yield answer;
+    }
+    suffix = cons(variable(`__length${id}_${extra}`), suffix);
+    lengthAllocationCheckpoint(solver, ++steps);
+  }
+}
+
+function bindGeneratedLength(solver, length, value, env) {
+  const next = env.clone();
+  solver.stats.unify_calls++;
+  return unify(length, numberTerm(value), next) ? next : null;
+}
+
+function isAnonymousVariable(term) {
+  return term.type === VAR && term.name.startsWith('__anon');
+}
+
+function lengthAllocationCheckpoint(solver, steps) {
+  if ((steps & 255n) === 0n) solver.checkMemoryLimit(true);
+}
+
 function pushFastPiFrames(stack, goal, rest, env, depth, active) {
   const values = goal.args.map((arg) => deref(arg, env));
   if ([0, 1, 2, 4].some((index) => values[index].type !== 'number')) return false;

package/test/run-regression.mjs

@@ -681,6 +681,21 @@ c4 ?- call((!;1)).
         assertEqual(result.stderr, '', 'quad stderr');
       },
     },
+    {
+      name: 'REPL advances anonymous Prologue length checks through I = 28',
+      run: () => {
+        const result = runCli([], {
+          input:
+            'use_module(library(prologue)).\n' +
+            'length(_,I),I>9,N is 2^I,\\+ \\+ length(_,N).\n' +
+            'f\nf\nf\n;\n;\n;\n;\n\nhalt.\n',
+        });
+        assertEqual(result.status, 0, 'exit status');
+        assertIncludes(result.stdout, ';  I = 28, N = 268435456\n;  ... .\n?- ', 'large anonymous length answer');
+        assertNotIncludes(result.stdout, 'resource_error(memory)', 'stdout');
+        assertEqual(result.stderr, '', 'stderr');
+      },
+    },
     {
       name: 'Prologue freeze wakes delayed goals with their bindings',
       run: () => {
@@ -2472,14 +2487,14 @@ open(X) :- candidate(X), \\+ closed(X).
       },
     },
     {
-      name: 'list allocation heap pressure becomes resource_error(memory)',
+      name: 'named list allocation heap pressure becomes resource_error(memory)',
       run: () => {
         const engineUrl = new URL('../src/index.js', import.meta.url).href;
         const programText = ':- use_module(library(prologue)).\n';
-        const goalText = 'length(_, I), I > 9, N is 2^I, \\+ \\+ length(_, N)';
+        const goalText = '\\+ \\+ length(List, 1000000)';
         const script = `
           import { Program, Solver, Env, parseGoalText, getEyePrologRegistry } from ${JSON.stringify(engineUrl)};
-          const program = Program.parse(${JSON.stringify(programText)});
+          const program = Program.parse(${JSON.stringify(programText)}, { sourceMetadata: false });
           const solver = new Solver(program, { registry: getEyePrologRegistry() });
           const goal = parseGoalText(${JSON.stringify(goalText)}, {
             operatorDefinitions: [...program.operators.values()],
@@ -2500,6 +2515,37 @@ open(X) :- candidate(X), \\+ closed(X).
         assertEqual(result.stdout, 'resource_error(memory)', 'heap pressure resource error');
       },
     },
+    {
+      name: 'anonymous Prologue length checks avoid materializing discarded lists',
+      run: () => {
+        const engineUrl = new URL('../src/index.js', import.meta.url).href;
+        const programText = ':- use_module(library(prologue)).\n';
+        const goalText = 'length(_, I), I > 9, N is 2^I, \\+ \\+ length(_, N)';
+        const script = `
+          import { Program, Solver, Env, parseGoalText, getEyePrologRegistry } from ${JSON.stringify(engineUrl)};
+          const program = Program.parse(${JSON.stringify(programText)}, { sourceMetadata: false });
+          const solver = new Solver(program, {
+            registry: getEyePrologRegistry(),
+            solutionLimit: 19,
+          });
+          const goal = parseGoalText(${JSON.stringify(goalText)}, {
+            operatorDefinitions: [...program.operators.values()],
+          });
+          let answers = 0;
+          for (const _ of solver.solve([goal], new Env(), 0)) answers++;
+          process.stdout.write(String(answers));
+        `;
+        const result = spawnSync(process.execPath, [
+          '--max-old-space-size=64',
+          '--input-type=module',
+          '--eval',
+          script,
+        ], { cwd: packageRoot, encoding: 'utf8', timeout: 30000 });
+        if (result.error) throw result.error;
+        assertEqual(result.status, 0, `bounded-heap child status; stderr=${result.stderr}`);
+        assertEqual(result.stdout, '19', 'answers through I = 28');
+      },
+    },
     {
       name: 'solver honors solution limits',
       run: () => {

package/the-art-of-eyeprolog.md

@@ -1843,6 +1843,17 @@ ISO 13211-1 leaves the resource atom implementation dependent. EyeProlog uses
 `finite_memory` spelling for the distinct convention where no finite amount of
 memory could complete the computation.
 
+The iterative solver keeps active-call frames only where they are semantically
+needed for cut scope or recursive variant guards. Bundled-library helpers whose
+callable dependency region is cut-free and which need no recursive variant
+guard therefore do not copy a growing active-call sequence at every step.
+Under the normal EyeProlog registry, the bundled Prologue `length/2` also has a
+scoped iterative execution path: named lists are counted or constructed without
+recursive interpreter frames, and an anonymous list is not materialized because
+its binding cannot be observed. The ordinary clauses remain the authoritative
+module definition and are used unchanged by the ISO-only registry and whenever
+delays or finite-domain constraints require their normal wake-up points.
+
 ### Implementation boundary
 
 The source layout mirrors the language boundary. `src/iso.js` contains the
@@ -5918,8 +5929,8 @@ so side effects occur in Prolog execution order.
 ### The EyeProlog library
 
 EyeProlog exposes **99 library predicate indicators** in addition to the 129
-indicators in its isolated ISO profile. **60 are implemented entirely as
-ordinary Prolog clauses** in focused modules under `src/lib/`. The remaining 39
+indicators in its isolated ISO profile. **60 are defined as ordinary Prolog
+clauses** in focused modules under `src/lib/`. The remaining 39
 are public wrappers around backtrackable host support: Prologue `call_nth/2` and
 `freeze/2`, plus the 37-predicate finite-domain `library(clpz)` kernel. The
 resulting normal EyeProlog language surface is therefore **228 public predicate