@dallaylaen/ski-interpreter 2.8.0 → 2.8.1

package/lib/ski-interpreter.mjs

@@ -331,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 });
@@ -2061,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,
@@ -2124,65 +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 declare(expr, env) {
-  return expr.declare({ inventory: env });
+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";
 }
-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;