eyelang 1.5.4 → 1.5.6

package/conformance/README.md

@@ -7,7 +7,7 @@ The suite is intentionally file-based so another implementation can run the same
 - `conformance/cases/<profile>/<name>.pl` — input program;
 - `conformance/expected/<profile>/<name>.out` — exact expected standard output.
 
-The current runner compares standard output, including answer facts and their `why/2` explanation facts. Standard error, performance, and resource limits are outside this suite.
+The current runner compares standard output from normal execution. Proof explanations are opt-in in the CLI and are not part of these conformance goldens. Standard error, performance, and resource limits are outside this suite.
 
 ## Running the suite
 
@@ -34,9 +34,9 @@ The runner executes materialized programs in-process through the public JavaScri
 
 ## Profiles
 
-`core` covers the portable core language profile from `../SPEC.md`: lexical syntax, facts, definite clauses, first-order terms, lists, conjunction, unification through user predicates, left-to-right goal-directed proof search, and answer printing.
+`core` covers the portable core language profile from `../SPEC.md`: lexical syntax, facts, definite clauses, first-order terms, lists, conjunction, structured unification through user predicates, left-to-right goal-directed proof search, materialized output, and read-back printing.
 
-`extension` covers the standard built-in and host behavior exercised by the current reference implementation: arithmetic, comparison, strings, list relations, aggregation, formula-term helpers, `memoize/2`, `materialize/2`, and default derived output.
+`extension` covers the standard built-in and host behavior exercised by the current reference implementation: arithmetic, comparison, strings, list relations, aggregation, formula-term helpers, number-theory helpers, finite-search helpers, matrix helpers, `memoize/2`, `materialize/2`, and default derived output.
 
 The profile name `extension` is a test-suite grouping name. It does not mean that these cases are outside the eyelang specification; most of them correspond to the standard built-in profile and standard host profile in `../SPEC.md`.
 

package/conformance/cases/core/021_repeated_variable_head.pl

@@ -0,0 +1,7 @@
+% SPEC 5.1, 7.1: repeated variables in a rule body require the same term.
+pair(a, a).
+pair(a, b).
+pair(c, c).
+diagonal(X) :- pair(X, X).
+answer(diagonal, X) :- diagonal(X).
+materialize(answer, 2).

package/conformance/cases/core/022_rule_head_structure.pl

@@ -0,0 +1,5 @@
+% SPEC 5.3, 6, 7.1: structured rule heads destructure matching goals.
+unpack(pair(X, Y), X, Y).
+answer(first, A) :- unpack(pair(alpha, beta), A, _).
+answer(second, B) :- unpack(pair(alpha, beta), _, B).
+materialize(answer, 2).

package/conformance/cases/core/023_quoted_escapes_readback.pl

@@ -0,0 +1,5 @@
+% SPEC 3.5, 11: quoted strings and atoms preserve escape sequences at read-back.
+raw(string, "line\nnext\t\\slash").
+raw(atom, 'line\nnext\t\\slash').
+answer(K, V) :- raw(K, V).
+materialize(answer, 2).

package/conformance/cases/core/024_numeric_literal_readback.pl

@@ -0,0 +1,6 @@
+% SPEC 3.3, 11: signed, decimal, and exponent numeric literals retain lexical form.
+raw(negative_decimal, -3.5).
+raw(positive_exp, 6.02e23).
+raw(negative_exp, -1.0e-3).
+answer(K, V) :- raw(K, V).
+materialize(answer, 2).

package/conformance/cases/core/025_body_parentheses_with_formula_data.pl

@@ -0,0 +1,5 @@
+% SPEC 5.5, 7: formula data can be passed through parenthesized conjunctions.
+record((left(a), right(b))).
+accept((left(a), right(b))).
+answer(ok, F) :- (record(F), accept(F)).
+materialize(answer, 2).

package/conformance/cases/core/026_underscore_named_variable_reuse.pl

@@ -0,0 +1,5 @@
+% SPEC 3.4, 5.1: variables beginning with underscore are named variables unless exactly _.
+pair(a, a).
+pair(a, b).
+answer(shared, _Value) :- pair(_Value, _Value).
+materialize(answer, 2).

package/conformance/cases/extension/035_date_difference.pl

@@ -0,0 +1,4 @@
+% SPEC 9.1: difference/3 computes ISO date durations.
+answer(duration, D) :- difference("2024-03-01", "2020-02-29", D).
+answer(month_borrow, D) :- difference("2024-03-01", "2024-01-31", D).
+materialize(answer, 2).

package/conformance/cases/extension/036_extended_gcd.pl

@@ -0,0 +1,3 @@
+% SPEC 9.2: extended_gcd/5 returns gcd and Bezout coefficients.
+answer(gcd, result(G, S, T)) :- extended_gcd(240, 46, G, S, T).
+materialize(answer, 2).

package/conformance/cases/extension/037_collatz_trajectory.pl

@@ -0,0 +1,3 @@
+% SPEC 9.2: collatz_trajectory/2 returns the full path to 1.
+answer(path, T) :- collatz_trajectory(6, T).
+materialize(answer, 2).

package/conformance/cases/extension/038_kaprekar_steps.pl

@@ -0,0 +1,3 @@
+% SPEC 9.2: kaprekar_steps/2 counts iterations to 6174.
+answer(steps, N) :- kaprekar_steps(3524, N).
+materialize(answer, 2).

package/conformance/cases/extension/039_goldbach_pair.pl

@@ -0,0 +1,3 @@
+% SPEC 9.2: goldbach_pair/3 enumerates prime decompositions in ascending first prime order.
+answer(pair, pair(P, Q)) :- goldbach_pair(28, P, Q).
+materialize(answer, 2).

package/conformance/cases/extension/040_matrix_operations.pl

@@ -0,0 +1,5 @@
+% SPEC 9.2: matrix helpers handle small ground numeric matrices.
+answer(sum, M) :- matrix_sum([[[1, 2], [3, 4]], [[5, 6], [7, 8]]], M).
+answer(product, M) :- matrix_multiply([[[1, 2], [3, 4]], [[2, 0], [1, 2]]], M).
+answer(determinant, D) :- determinant([[4, 2], [2, 3]], D).
+materialize(answer, 2).

package/conformance/cases/extension/041_atom_range_generators.pl

@@ -0,0 +1,5 @@
+% SPEC 9.5: atom range helpers generate prefixed atoms deterministically.
+answer(single, X) :- atom_range(n, 2, 4, X).
+answer(multiple, X) :- atom_ranges([a, b], 1, 2, X).
+answer(bound_check, yes) :- atom_range(n, 2, 4, n3).
+materialize(answer, 2).

package/conformance/cases/extension/042_n_queens_small.pl

@@ -0,0 +1,3 @@
+% SPEC 9.5: n_queens/2 enumerates finite board solutions.
+answer(solution, Qs) :- n_queens(4, Qs).
+materialize(answer, 2).

package/conformance/cases/extension/043_cnf_model.pl

@@ -0,0 +1,3 @@
+% SPEC 9.5: cnf_model/3 enumerates satisfying truth assignments for a CNF.
+answer(model, M) :- cnf_model([a, b], [[pos(a), pos(b)], [neg(a)]], M).
+materialize(answer, 2).

package/conformance/cases/extension/044_cover9_filter.pl

@@ -0,0 +1,6 @@
+% SPEC 9.5: cover9/1 accepts exactly the digits 1 through 9 once.
+answer(ok, yes) :- cover9([1, 2, 3, 4, 5, 6, 7, 8, 9]).
+answer(candidate, X) :- row(X), cover9(X).
+row([1, 2, 3, 4, 5, 6, 7, 8, 9]).
+row([1, 1, 2, 3, 4, 5, 6, 7, 8]).
+materialize(answer, 2).

package/conformance/cases/extension/045_alphametic_sum_small.pl

@@ -0,0 +1,3 @@
+% SPEC 9.5: alphametic_sum/5 enumerates unique digit assignments for column addition.
+answer(solution, result(Digits, Values)) :- alphametic_sum([a, b], [[a], [a]], [b], Digits, Values).
+materialize(answer, 2).

package/conformance/cases/extension/046_bounded_subset.pl

@@ -0,0 +1,4 @@
+% SPEC 9.5: bounded_subset/7 enumerates subsets within budget and risk caps.
+projects([p(a, 5, 3, 1), p(b, 4, 2, 2), p(c, 7, 5, 3)]).
+answer(selection, result(Names, Value, Cost, Risk)) :- projects(Ps), bounded_subset(Ps, 5, 3, Names, Value, Cost, Risk).
+materialize(answer, 2).

package/conformance/expected/core/021_repeated_variable_head.out

@@ -0,0 +1,2 @@
+answer(diagonal, a).
+answer(diagonal, c).

package/conformance/expected/core/022_rule_head_structure.out

@@ -0,0 +1,2 @@
+answer(first, alpha).
+answer(second, beta).

package/conformance/expected/core/023_quoted_escapes_readback.out

@@ -0,0 +1,2 @@
+answer(string, "line\nnext	\\slash").
+answer(atom, 'line\nnext\t\\slash').

package/conformance/expected/core/024_numeric_literal_readback.out

@@ -0,0 +1,3 @@
+answer(negative_decimal, -3.5).
+answer(positive_exp, 6.02e23).
+answer(negative_exp, -1.0e-3).

package/conformance/expected/core/025_body_parentheses_with_formula_data.out

@@ -0,0 +1 @@
+answer(ok, (left(a), right(b))).

package/conformance/expected/core/026_underscore_named_variable_reuse.out

@@ -0,0 +1 @@
+answer(shared, a).

package/conformance/expected/extension/035_date_difference.out

@@ -0,0 +1,2 @@
+answer(duration, "P4Y1D").
+answer(month_borrow, "P1M-1D").

package/conformance/expected/extension/036_extended_gcd.out

@@ -0,0 +1 @@
+answer(gcd, result(2, -9, 47)).

package/conformance/expected/extension/037_collatz_trajectory.out

@@ -0,0 +1 @@
+answer(path, [6, 3, 10, 5, 16, 8, 4, 2, 1]).

package/conformance/expected/extension/038_kaprekar_steps.out

@@ -0,0 +1 @@
+answer(steps, 3).

package/conformance/expected/extension/039_goldbach_pair.out

@@ -0,0 +1,2 @@
+answer(pair, pair(5, 23)).
+answer(pair, pair(11, 17)).

package/conformance/expected/extension/040_matrix_operations.out

@@ -0,0 +1,3 @@
+answer(sum, [[6, 8], [10, 12]]).
+answer(product, [[4, 4], [10, 8]]).
+answer(determinant, 8.0000000000000018).

package/conformance/expected/extension/041_atom_range_generators.out

@@ -0,0 +1,8 @@
+answer(single, n2).
+answer(single, n3).
+answer(single, n4).
+answer(multiple, a1).
+answer(multiple, a2).
+answer(multiple, b1).
+answer(multiple, b2).
+answer(bound_check, yes).

package/conformance/expected/extension/042_n_queens_small.out

@@ -0,0 +1,2 @@
+answer(solution, [2, 4, 1, 3]).
+answer(solution, [3, 1, 4, 2]).

package/conformance/expected/extension/043_cnf_model.out

@@ -0,0 +1 @@
+answer(model, [value(a, false), value(b, true)]).

package/conformance/expected/extension/044_cover9_filter.out

@@ -0,0 +1,2 @@
+answer(ok, yes).
+answer(candidate, [1, 2, 3, 4, 5, 6, 7, 8, 9]).

package/conformance/expected/extension/045_alphametic_sum_small.out

@@ -0,0 +1,4 @@
+answer(solution, result([1, 2], [1, 1, 2])).
+answer(solution, result([2, 4], [2, 2, 4])).
+answer(solution, result([3, 6], [3, 3, 6])).
+answer(solution, result([4, 8], [4, 4, 8])).

package/conformance/expected/extension/046_bounded_subset.out

@@ -0,0 +1,5 @@
+answer(selection, result([a, b], 9, 5, 3)).
+answer(selection, result([a], 5, 3, 1)).
+answer(selection, result([b], 4, 2, 2)).
+answer(selection, result([c], 7, 5, 3)).
+answer(selection, result([], 0, 0, 0)).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eyelang",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "type": "module",
   "description": "A small rule engine for Prolog-style Horn clauses",
   "keywords": [

package/src/index.js

@@ -24,8 +24,8 @@ export function run(source, options = {}) {
   const facts = program.sourceFactLines(materializedKeys);
   const seen = new Set();
   for (const goal of goals) {
-    const localSolver = new Solver(program, runOptions);
-    for (const env of localSolver.solve([goal], new Env(), 0)) {
+    solver.solutionsSeen = 0;
+    for (const env of solver.solve([goal], new Env(), 0)) {
       const resolved = copyResolved(goal, env);
       if (!termIsGround(resolved)) continue;
       const line = `${termToString(resolved, new Env(), true)}.\n`;

package/src/parser.js

@@ -287,12 +287,14 @@ function isSimpleName(text) {
 
 const SIMPLE_NUMBER = /^-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?$/;
 const SIMPLE_ARG_FORBIDDEN = /[\s()[\]|"']/;
+const FAST_BINARY_FACT = /^([a-z][A-Za-z0-9_]*)\(\s*([^,\s()[\]|"']+)\s*,\s*([^,\s()[\]|"']+)\s*\)\.$/;
+const FAST_BINARY_RULE = /^([a-z][A-Za-z0-9_]*)\(\s*([^,\s()[\]|"']+)\s*,\s*([^,\s()[\]|"']+)\s*\)\s*:-\s*([a-z][A-Za-z0-9_]*)\(\s*([^,\s()[\]|"']+)\s*,\s*([^,\s()[\]|"']+)\s*\)\.$/;
 
 function parseClausesFastNoSource(source) {
   source = String(source ?? '');
-  const atomCache = new Map();
   const numberCache = new Map();
   const stringCache = new Map();
+  const variableCache = new Map();
   const clauses = [];
   let anonymous = 0;
   let chunk = '';
@@ -304,22 +306,23 @@ function parseClausesFastNoSource(source) {
     cache.set(key, value);
     return value;
   };
-  const scalarOrVariable = (text, variables) => {
-    text = text.trim();
+  const scalarOrVariableFast = (text) => {
     if (!text) throw new Error('empty simple term');
+    const first = text.charCodeAt(0);
     if (text === '_') return variable(`__anon${anonymous++}`);
-    if (isVariableStart(text)) {
-      const existing = variables.get(text);
+    if (first === 95 || (first >= 65 && first <= 90)) {
+      const existing = variableCache.get(text);
       if (existing) return existing;
       const value = variable(text);
-      variables.set(text, value);
+      variableCache.set(text, value);
       return value;
     }
-    if (SIMPLE_NUMBER.test(text)) return cached(numberCache, text, numberTerm);
-    if (text[0] === '"' && text.endsWith('"')) return cached(stringCache, text.slice(1, -1), stringTerm);
-    return cached(atomCache, text, atom);
+    if ((first === 45 || isDigitCode(first)) && SIMPLE_NUMBER.test(text)) return cached(numberCache, text, numberTerm);
+    if (first === 34 && text.endsWith('"')) return cached(stringCache, text.slice(1, -1), stringTerm);
+    return atom(text);
   };
-  const parseBinaryCompound = (text, variables) => {
+  const scalarOrVariable = (text) => scalarOrVariableFast(text.trim());
+  const parseBinaryCompound = (text) => {
     text = text.trim();
     const open = text.indexOf('(');
     if (open <= 0 || text[text.length - 1] !== ')') return null;
@@ -332,19 +335,37 @@ function parseClausesFastNoSource(source) {
     const left = inner.slice(0, comma).trim();
     const right = inner.slice(comma + 1).trim();
     if (!left || !right || SIMPLE_ARG_FORBIDDEN.test(left) || SIMPLE_ARG_FORBIDDEN.test(right)) return null;
-    return compound(name, [scalarOrVariable(left, variables), scalarOrVariable(right, variables)]);
+    return compound(name, [scalarOrVariable(left), scalarOrVariable(right)]);
+  };
+  const parseFastBinaryMatch = (match) => {
+    return compound(match[1], [scalarOrVariableFast(match[2]), scalarOrVariableFast(match[3])]);
+  };
+  const parseFastBinaryRuleMatch = (match) => {
+    return {
+      head: compound(match[1], [scalarOrVariableFast(match[2]), scalarOrVariableFast(match[3])]),
+      body: [compound(match[4], [scalarOrVariableFast(match[5]), scalarOrVariableFast(match[6])])],
+    };
+  };
+  const parseFastLine = (text) => {
+    if (!text.endsWith('.')) return null;
+    const ruleMatch = FAST_BINARY_RULE.exec(text);
+    if (ruleMatch) return parseFastBinaryRuleMatch(ruleMatch);
+    const factMatch = FAST_BINARY_FACT.exec(text);
+    if (factMatch) return { head: parseFastBinaryMatch(factMatch), body: [] };
+    return null;
   };
   const parseSimple = (text) => {
     if (!text.endsWith('.') || text.includes('\n')) return null;
+    const fast = parseFastLine(text);
+    if (fast) return fast;
     text = text.slice(0, -1);
-    const variables = new Map();
     const rule = text.indexOf(':-');
     if (rule < 0) {
-      const head = parseBinaryCompound(text, variables);
+      const head = parseBinaryCompound(text);
       return head ? { head, body: [] } : null;
     }
-    const head = parseBinaryCompound(text.slice(0, rule), variables);
-    const bodyGoal = parseBinaryCompound(text.slice(rule + 2), variables);
+    const head = parseBinaryCompound(text.slice(0, rule));
+    const bodyGoal = parseBinaryCompound(text.slice(rule + 2));
     return head && bodyGoal ? { head, body: [bodyGoal] } : null;
   };
 
@@ -375,7 +396,7 @@ function parseClausesFastNoSource(source) {
     const trimmed = line.trim();
     if (trimmed && !trimmed.startsWith('%')) {
       if (!chunk && trimmed.endsWith('.')) {
-        const simple = parseSimple(trimmed);
+        const simple = parseFastLine(trimmed) ?? parseSimple(trimmed);
         if (simple) clauses.push(simple);
         else {
           chunk = line + '\n';