@dallaylaen/ski-interpreter 2.7.0 → 2.8.1

package/lib/ski-interpreter.mjs

@@ -85,10 +85,13 @@ var control = {
 var native = {};
 var Expr = class _Expr {
   /**
+   * Add metadata based on user-supplied values and/or the properties of the term itself.
    *
-   *  Define properties of the term based on user supplied options and/or inference results.
-   *       Typically useful for declaring Native and Alias terms.
-   * @protected
+   * Typically applied to named terms shortly after instantiation.
+   *
+   * Experimental. Name and meaning may change in the future.
+   *
+   * @experimental
    * @param {Object} options
    * @param {string} [options.note] - a brief description what the term does
    * @param {number} [options.arity] - number of arguments the term is waiting for (if known)
@@ -98,7 +101,7 @@ var Expr = class _Expr {
    * @param {number} [options.maxArgs] - maximum number of arguments for inference, if canonize is true
    * @return {this}
    */
-  _setup(options = {}) {
+  annotate(options = {}) {
     if (options.fancy !== void 0 && this instanceof Named)
       this.fancyName = options.fancy;
     if (options.note !== void 0)
@@ -328,11 +331,9 @@ var Expr = class _Expr {
     let steps = 0;
     let expr = this;
     main: for (let i = 0; i < options.maxArgs; i++) {
-      const next = expr.run({ max: options.max - steps, maxSize: options.maxSize });
+      const next = expr.run({ max: Math.max((options.max - steps) / 2, 10), maxSize: options.maxSize });
       steps += next.steps;
-      if (!next.final)
-        break;
-      if (firstVar(next.expr)) {
+      if (next.final && firstVar(next.expr)) {
         expr = next.expr;
         if (!expr.any((e) => !(e instanceof FreeVar || e instanceof App)))
           return maybeLambda(probe, expr, { steps });
@@ -402,7 +403,9 @@ var Expr = class _Expr {
    */
   *toLambda(options = {}) {
     let expr = this.traverse((e) => {
-      if (e instanceof FreeVar || e instanceof App || e instanceof Lambda || e instanceof Alias)
+      if (e instanceof FreeVar)
+        return e;
+      if (e instanceof App || e instanceof Lambda || e instanceof Alias)
         return null;
       const guess = e.infer({ max: options.max, maxArgs: options.maxArgs });
       if (!guess.normal)
@@ -768,16 +771,26 @@ var Expr = class _Expr {
   diag(indent = "") {
     return indent + this.constructor.name + ": " + this;
   }
+  declare(options = {}) {
+    const { declaration: d = ["", "=", "; "], ...format } = options;
+    const res = toposort({ list: [this], env: format.inventory });
+    return res.list.map((s) => {
+      if (s instanceof Alias)
+        return d[0] + s.name + d[1] + s.impl.format({ ...format, inventory: res.env });
+      if (s instanceof FreeVar)
+        return d[0] + s.name + d[1];
+      return s.format({ ...format, inventory: res.env });
+    }).join(d[2]);
+  }
   /**
    * Convert the expression to a JSON-serializable format.
    * Sadly the format is not yet finalized and may change in the future.
    *
    * @experimental
-   * @returns {string}
    * @sealed
    */
   toJSON() {
-    return this.format();
+    return this.declare();
   }
 };
 var App = class _App extends Expr {
@@ -944,7 +957,7 @@ var Native = class extends Named {
   constructor(name, impl, opt = {}) {
     super(name);
     this.invoke = impl;
-    this._setup({ canonize: true, ...opt });
+    this.annotate({ canonize: true, ...opt });
   }
 };
 var Lambda = class _Lambda extends Expr {
@@ -1051,7 +1064,7 @@ var Alias = class extends Named {
     if (!(impl instanceof Expr))
       throw new Error("Attempt to create an alias for a non-expression: " + impl);
     this.impl = impl;
-    this._setup(options);
+    this.annotate(options);
     this.invoke = waitn(options.inline ? 0 : this.arity ?? 0)(impl);
     this.size = impl.size;
     if (options.inline)
@@ -1189,40 +1202,43 @@ function maybeLambda(args, expr, caps) {
 function nthvar(n) {
   return new FreeVar("abcdefgh"[n] ?? "x" + n);
 }
-var classes = { Expr, App, Named, FreeVar, Native, Lambda, Church, Alias };
-
-// src/toposort.ts
-function toposort(list, env) {
-  if (list instanceof Expr)
-    list = [list];
-  if (env) {
-    if (!list)
-      list = Object.keys(env).sort().map((k) => env[k]);
-  } else {
-    if (!list)
-      return { list: [], env: {} };
-    env = {};
-    for (const item of list) {
-      if (!(item instanceof Named))
-        continue;
-      if (env[item.name])
-        throw new Error("duplicate name " + item);
-      env[item.name] = item;
+function toposort(options) {
+  if (typeof options !== "object" || options === null || Array.isArray(options) || options instanceof Expr)
+    throw new Error("positional arguments to toposort are deprecated, use { list: ..., env: ... } instead");
+  const allow = options.allow ? { ...options.allow } : null;
+  const env = { ...options.env ?? {} };
+  const list = options.list instanceof Expr ? [options.list] : options.list ?? [];
+  if (allow) {
+    for (const term of list) {
+      if (term instanceof Named)
+        allow[term.name] = term;
     }
   }
+  for (const term of list) {
+    if (term instanceof Named && env[term.name] === term)
+      delete env[term.name];
+  }
   const out = [];
-  const seen = /* @__PURE__ */ new Set();
+  const seen = new Set(Object.values(env));
   const rec = (term) => {
     if (seen.has(term))
       return;
-    term.fold(false, (acc, e) => {
-      if (e !== term && e instanceof Named && env[e.name] === e) {
+    term.fold(void 0, (_, e) => {
+      if (!(e instanceof Named))
+        return;
+      if (allow && allow[e.name] !== e)
+        return;
+      if (!allow && e instanceof Alias && e.inline)
+        return;
+      if (e !== term) {
         rec(e);
-        return control.prune(false);
+        return control.prune();
       }
     });
     out.push(term);
     seen.add(term);
+    if (term instanceof Named)
+      env[term.name] ||= term;
   };
   for (const term of list)
     rec(term);
@@ -1231,6 +1247,7 @@ function toposort(list, env) {
     env
   };
 }
+var classes = { Expr, App, Named, FreeVar, Native, Lambda, Church, Alias };
 
 // src/parser.ts
 var Empty = class extends Expr {
@@ -1333,7 +1350,7 @@ var Parser = class {
   add(term, impl, options) {
     const named = this._named(term, impl);
     const opts = typeof options === "string" ? { note: options, canonize: false } : options ?? {};
-    named._setup({ canonize: this.annotate, ...opts });
+    named.annotate({ canonize: this.annotate, ...opts });
     const old = this.known[named.name];
     if (old instanceof Alias)
       old.makeInline();
@@ -1478,7 +1495,7 @@ var Parser = class {
       env[temp.name] = temp;
       delete env[name];
     }
-    const list = toposort(void 0, env).list;
+    const list = toposort({ list: Object.values(env), allow: {} }).list;
     const detour = /* @__PURE__ */ new Map();
     if (Object.keys(needDetour).length) {
       const rework = (expr) => {
@@ -1505,14 +1522,15 @@ var Parser = class {
     return out;
   }
   /**
-   * @template T
    * @param {string} source
    * @param {Object} [options]
-   * @param {{[keys: string]: Expr}} [options.env]
-   * @param {T} [options.scope]
-   * @param {boolean} [options.numbers]
-   * @param {boolean} [options.lambdas]
-   * @param {string} [options.allow]
+   * @param [options.env] - additional
+   * @param [options.scope] - assign this scope to unknown free variables
+   * @param {boolean} [options.numbers] - whether numbers are allowed
+   * @param {boolean} [options.lambdas] - whether lambdas are allowed
+   * @param {string} [options.allow] - restrict known terms
+   * @param [options.canonize] - whether to calculate canonical form, arity, and properties
+   *                             of intermediate aliases
    * @return {Expr}
    */
   parse(source, options = {}) {
@@ -1522,18 +1540,19 @@ var Parser = class {
     const jar = { ...options.env };
     let expr = new Empty();
     for (const item of lines) {
-      if (expr instanceof Alias)
-        expr.makeInline();
-      const def = item.match(/^([A-Z]|[a-z][a-z_0-9]*)\s*=(.*)$/s);
-      if (def && def[2] === "")
-        expr = new FreeVar(def[1], options.scope ?? FreeVar.global);
+      const [_, name, def] = item.match(/^([A-Z]|[a-z][a-z_0-9]*)\s*=(.*)$/s) || [];
+      if (name !== void 0) {
+        if (jar[name] instanceof Alias && jar[name] !== options.env?.[name]) {
+          jar[name].makeInline();
+        }
+        delete jar[name];
+      }
+      if (def === "")
+        expr = new FreeVar(name, options.scope ?? FreeVar.global);
       else
         expr = this.parseLine(item, jar, options);
-      if (def) {
-        if (jar[def[1]] !== void 0)
-          throw new Error("Attempt to redefine a known term: " + def[1]);
-        jar[def[1]] = expr;
-      }
+      if (name)
+        jar[name] = expr;
     }
     if (this.addContext) {
       if (expr instanceof Named)
@@ -1565,7 +1584,7 @@ var Parser = class {
   parseLine(source, env = {}, options = {}) {
     const aliased = source.match(/^\s*([A-Z]|[a-z][a-z_0-9]*)\s*=\s*(.*)$/s);
     if (aliased)
-      return new Alias(aliased[1], this.parseLine(aliased[2], env, options));
+      return new Alias(aliased[1], this.parseLine(aliased[2], env, options), { canonize: options.canonize });
     const opt = {
       numbers: options.numbers ?? this.hasNumbers,
       lambdas: options.lambdas ?? this.hasLambdas,
@@ -2040,6 +2059,77 @@ function canonize(term, options = {}) {
 }
 
 // src/extras.ts
+var formatSchema = {
+  html: (x) => typeof x === "boolean" ? void 0 : "must be a boolean",
+  terse: (x) => typeof x === "boolean" ? void 0 : "must be a boolean",
+  space: (x) => typeof x === "string" ? void 0 : "must be a string",
+  brackets: isStringPair,
+  var: isStringPair,
+  around: isStringPair,
+  redex: isStringPair,
+  lambda: isStringTriple,
+  inventory: (x) => {
+    if (typeof x !== "object" || x === null || x.constructor !== Object)
+      return "must be an object, not " + (x?.constructor?.name ?? typeof x);
+    const refined = x;
+    for (const key of Object.keys(refined)) {
+      if (!(refined[key] instanceof Expr))
+        return "key " + key + "is not an Expr";
+    }
+    return void 0;
+  }
+};
+function checkFormatOptions(raw) {
+  if (raw === null || raw === void 0)
+    return { value: {} };
+  if (typeof raw !== "object" || Array.isArray(raw) || raw.constructor !== Object)
+    return { error: { object: "Format options must be an object, not " + (raw?.constructor?.name ?? typeof raw) } };
+  const rec = raw;
+  const error = {};
+  for (const key in rec) {
+    if (formatSchema[key]) {
+      const err = formatSchema[key](rec[key]);
+      if (err)
+        error[key] = err;
+    } else
+      error[key] = "unknown option";
+  }
+  return Object.keys(error).length > 0 ? { error } : { value: rec };
+}
+function equiv(e1, e2, options = {}) {
+  let steps = 0;
+  const [n1, n2] = [e1, e2].map((x) => x.traverse((e) => {
+    const props = e.infer(options);
+    steps += props.steps ?? 0;
+    return props.expr;
+  }));
+  const normal = !!(n1 && n2);
+  return {
+    steps,
+    normal,
+    equal: normal ? n1.equals(n2) : false,
+    canonical: [n1, n2]
+  };
+}
+function declare(expr, env) {
+  return expr.declare({ inventory: env });
+}
+function deepFormat(obj, options = {}) {
+  if (obj instanceof Expr)
+    return obj.format(options);
+  if (obj instanceof Quest)
+    return "Quest(" + obj.name + ")";
+  if (obj instanceof Quest.Case)
+    return "Quest.Case";
+  if (Array.isArray(obj))
+    return obj.map((item) => deepFormat(item, options));
+  if (typeof obj !== "object" || obj === null || obj.constructor !== Object)
+    return obj;
+  const out = {};
+  for (const key in obj)
+    out[key] = deepFormat(obj[key], options);
+  return out;
+}
 function search(seed, options, predicate) {
   const {
     depth = 16,
@@ -2103,72 +2193,13 @@ function search(seed, options, predicate) {
   }
   return { total, probed, gen: depth, ...options.retain ? { cache } : {} };
 }
-function deepFormat(obj, options = {}) {
-  if (obj instanceof Expr)
-    return obj.format(options);
-  if (obj instanceof Quest)
-    return "Quest(" + obj.name + ")";
-  if (obj instanceof Quest.Case)
-    return "Quest.Case";
-  if (Array.isArray(obj))
-    return obj.map((item) => deepFormat(item, options));
-  if (typeof obj !== "object" || obj === null || obj.constructor !== Object)
-    return obj;
-  const out = {};
-  for (const key in obj)
-    out[key] = deepFormat(obj[key], options);
-  return out;
+function isStringPair(x) {
+  return Array.isArray(x) && x.length === 2 && typeof x[0] === "string" && typeof x[1] === "string" ? void 0 : "must be a pair of strings";
 }
-function declare(expr, env = {}) {
-  const res = toposort([expr], env);
-  return res.list.map((s) => {
-    if (s instanceof Alias)
-      return s.name + "=" + s.impl.format({ inventory: res.env });
-    if (s instanceof FreeVar)
-      return s.name + "=";
-    return s.format({ inventory: res.env });
-  }).join("; ");
-}
-var isStringPair = (x) => Array.isArray(x) && x.length === 2 && typeof x[0] === "string" && typeof x[1] === "string" ? void 0 : "must be a pair of strings";
-var isStringTriple = (x) => Array.isArray(x) && x.length === 3 && typeof x[0] === "string" && typeof x[1] === "string" && typeof x[2] === "string" ? void 0 : "must be a triplet of strings";
-var schema = {
-  html: (x) => typeof x === "boolean" ? void 0 : "must be a boolean",
-  terse: (x) => typeof x === "boolean" ? void 0 : "must be a boolean",
-  space: (x) => typeof x === "string" ? void 0 : "must be a string",
-  brackets: isStringPair,
-  var: isStringPair,
-  around: isStringPair,
-  redex: isStringPair,
-  lambda: isStringTriple,
-  inventory: (x) => {
-    if (typeof x !== "object" || x === null || x.constructor !== Object)
-      return "must be an object, not " + (x?.constructor?.name ?? typeof x);
-    const refined = x;
-    for (const key of Object.keys(refined)) {
-      if (!(refined[key] instanceof Expr))
-        return "key " + key + "is not an Expr";
-    }
-    return void 0;
-  }
-};
-function checkFormatOptions(raw) {
-  if (raw === null || raw === void 0)
-    return { value: {} };
-  if (typeof raw !== "object" || Array.isArray(raw) || raw.constructor !== Object)
-    return { error: { object: "Format options must be an object, not " + (raw?.constructor?.name ?? typeof raw) } };
-  const rec = raw;
-  const error = {};
-  for (const key in rec) {
-    if (schema[key]) {
-      const err = schema[key](rec[key]);
-      if (err)
-        error[key] = err;
-    } else
-      error[key] = "unknown option";
-  }
-  return Object.keys(error).length > 0 ? { error } : { value: rec };
+function isStringTriple(x) {
+  return Array.isArray(x) && x.length === 3 && typeof x[0] === "string" && typeof x[1] === "string" && typeof x[2] === "string" ? void 0 : "must be a triplet of strings";
 }
-var extras = { search, deepFormat, declare, toposort, checkFormatOptions };
+var extras = { search, deepFormat, declare, toposort, checkFormatOptions, equiv };
 
 // src/index.ts
 extras.toposort = toposort;