@dallaylaen/ski-interpreter 2.5.2 → 2.6.0

package/lib/ski-interpreter.esm.js

@@ -14810,8 +14810,8 @@ var Church = class _Church extends Expr {
     return nargs >= 2 ? options.redex[0] + this.n + options.redex[1] : this.n + "";
   }
 };
-function waitn(expr, n) {
-  return (arg) => n <= 1 ? expr.apply(arg) : waitn(expr.apply(arg), n - 1);
+function waitn(n) {
+  return n <= 1 ? (e) => (arg) => e.apply(arg) : (e) => (arg) => waitn(n - 1)(e.apply(arg));
 }
 var Alias = class extends Named {
   constructor(name, impl, options = {}) {
@@ -14820,17 +14820,28 @@ var Alias = class extends Named {
       throw new Error("Attempt to create an alias for a non-expression: " + impl);
     this.impl = impl;
     this._setup(options);
-    this.terminal = options.terminal ?? this.props?.proper;
-    this.invoke = waitn(impl, this.arity ?? 0);
+    this.invoke = waitn(options.inline ? 0 : this.arity ?? 0)(impl);
     this.size = impl.size;
-    if (options.outdated)
-      this.outdated = true;
+    if (options.inline)
+      this.inline = true;
+  }
+  /**
+   * @desc Make the alias inline, i.e. replace it with its implementation everywhere.
+   *
+   * Replaces the old `outdated` attribute.
+   * Used by the parser when a term definition is removed or updated.
+   *
+   * May change in future versions, use with caution.
+   *
+   * @experimental
+   * @returns {this}
+   */
+  makeInline() {
+    this.invoke = waitn(0)(this.impl);
+    this.inline = true;
+    return this;
   }
   /**
-   * @property {boolean} [outdated] - whether the alias is outdated
-   *     and should be replaced with its definition when encountered.
-   * @property {boolean} [terminal] - whether the alias should behave like a standalone term
-   *     // TODO better name?
    * @property {boolean} [proper] - whether the alias is a proper combinator (i.e. contains no free variables or constants)
    * @property {number} [arity] - the number of arguments the alias waits for before expanding
    * @property {Expr} [canonical] - equivalent lambda term.
@@ -14873,11 +14884,11 @@ var Alias = class extends Named {
     return other.diff(this.impl, !swap);
   }
   _braced(first) {
-    return this.outdated ? this.impl._braced(first) : false;
+    return this.inline ? this.impl._braced(first) : false;
   }
   formatImpl(options, nargs) {
-    const outdated = options.inventory ? options.inventory[this.name] !== this : this.outdated;
-    return outdated ? this.impl.formatImpl(options, nargs) : super.formatImpl(options, nargs);
+    const inline = options.inventory ? options.inventory[this.name] !== this : this.inline;
+    return inline ? this.impl.formatImpl(options, nargs) : super.formatImpl(options, nargs);
   }
   diag(indent = "") {
     return `${indent}Alias (${this.name}): \\
@@ -15089,8 +15100,9 @@ var Parser = class {
     const named = this._named(term, impl);
     const opts = typeof options === "string" ? { note: options, canonize: false } : options ?? {};
     named._setup({ canonize: this.annotate, ...opts });
-    if (this.known[named.name])
-      this.known[named.name].outdated = true;
+    const old = this.known[named.name];
+    if (old instanceof Alias)
+      old.makeInline();
     this.known[named.name] = named;
     this.allow.add(named.name);
     return this;
@@ -15190,7 +15202,9 @@ var Parser = class {
    * @return {SKI}
    */
   remove(name) {
-    this.known[name].outdated = true;
+    const old = this.known[name];
+    if (old instanceof Alias)
+      old.makeInline();
     delete this.known[name];
     this.allow.delete(name);
     return this;
@@ -15275,7 +15289,7 @@ var Parser = class {
     let expr = new Empty();
     for (const item of lines) {
       if (expr instanceof Alias)
-        expr.outdated = true;
+        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);
@@ -15289,7 +15303,7 @@ var Parser = class {
     }
     if (this.addContext) {
       if (expr instanceof Named)
-        expr = new Alias(expr.name, expr, { outdated: true });
+        expr = new Alias(expr.name, expr, { inline: true });
       expr.context = {
         env: { ...this.getTerms(), ...jar },
         // also contains pre-parsed terms
@@ -15397,7 +15411,7 @@ var Quest = class {
     for (const term of env ?? []) {
       const expr = this.engineFull.parse(term, { env: jar, scope: this });
       if (expr instanceof Alias)
-        this.env[expr.name] = new Alias(expr.name, expr.impl, { terminal: true, canonize: false });
+        this.env[expr.name] = new Alias(expr.name, expr.impl, { canonize: false });
       else if (expr instanceof FreeVar)
         this.env[expr.name] = expr;
       else
@@ -15486,7 +15500,7 @@ var Quest = class {
         if (e instanceof Named && arsenal[e.name] === e)
           return control.prune(a + 1);
       });
-      const expr = impl instanceof FreeVar ? impl : new Alias(spec.fancy ?? spec.name, impl, { terminal: true, canonize: false });
+      const expr = impl instanceof FreeVar ? impl : new Alias(spec.fancy ?? spec.name, impl, { canonize: false });
       jar[spec.name] = expr;
       prepared.push(expr);
     }