@harmoniclabs/pebble 0.1.10 → 0.3.0

package/dist/compiler/tir/expressions/TirShowExpr.js

@@ -0,0 +1,199 @@
+import { _ir_apps } from "../../../IR/IRNodes/IRApp.js";
+import { IRConst } from "../../../IR/IRNodes/IRConst.js";
+import { IRFunc } from "../../../IR/IRNodes/IRFunc.js";
+import { IRHoisted } from "../../../IR/IRNodes/IRHoisted.js";
+import { IRNative } from "../../../IR/IRNodes/IRNative/index.js";
+import { IRRecursive } from "../../../IR/IRNodes/IRRecursive.js";
+import { IRSelfCall } from "../../../IR/IRNodes/IRSelfCall.js";
+import { IRVar } from "../../../IR/IRNodes/IRVar.js";
+import { hoisted_bytesToHex } from "../../../IR/tree_utils/bytesToHex.js";
+import { hoisted_intToUtf8Bytes } from "../../../IR/tree_utils/intToUtf8Bytes.js";
+import { _ir_lazyIfThenElse } from "../../../IR/tree_utils/_ir_lazyIfThenElse.js";
+import { fromUtf8 } from "@harmoniclabs/uint8array-utils";
+import { bytes_t } from "../program/stdScope/stdScope.js";
+import { TirDataStructType } from "../types/TirStructType.js";
+import { TirBoolT } from "../types/TirNativeType/native/bool.js";
+import { TirBytesT } from "../types/TirNativeType/native/bytes.js";
+import { TirDataT } from "../types/TirNativeType/native/data.js";
+import { TirIntT } from "../types/TirNativeType/native/int.js";
+import { TirLinearMapT } from "../types/TirNativeType/native/linearMap.js";
+import { TirListT } from "../types/TirNativeType/native/list.js";
+import { TirStringT } from "../types/TirNativeType/native/string.js";
+import { TirDataOptT } from "../types/TirNativeType/native/Optional/data.js";
+import { TirVoidT } from "../types/TirNativeType/native/void.js";
+import { getListTypeArg } from "../types/utils/getListTypeArg.js";
+import { getUnaliased } from "../types/utils/getUnaliased.js";
+/**
+ * `_showIR`-backed compile-time-dispatched show expression.
+ *
+ * Created when the user writes `expr.show()` on a built-in type whose Show
+ * impl the compiler provides (int, bytes, bool, data, void, string,
+ * List<T>, LinearMap<K,V>, data-encoded structs). For user-declared
+ * `type X implements Show { show(self): bytes { ... } }` impls the
+ * regular method-dispatch path in `expressifyVars` keeps applying — this
+ * expr is only emitted when no user impl is registered.
+ */
+export class TirShowExpr {
+    inner;
+    range;
+    constructor(inner, range) {
+        this.inner = inner;
+        this.range = range;
+    }
+    get type() { return bytes_t; }
+    get isConstant() { return this.inner.isConstant; }
+    toString() { return `show( ${this.inner.toString()} )`; }
+    pretty(indent) {
+        return `show( ${this.inner.pretty(indent)} )`;
+    }
+    clone() {
+        return new TirShowExpr(this.inner.clone(), this.range.clone());
+    }
+    deps() { return this.inner.deps(); }
+    toIR(ctx) {
+        return _showIR(this.inner.type, this.inner.toIR(ctx));
+    }
+}
+/**
+ * Inline an `IRTerm` of type `t` into its UTF-8 textual representation
+ * (also bytes). Returns the IR producing the show-encoded bytes.
+ *
+ * Mirrors `_inlineToData` — fully compile-time-dispatched per source type:
+ *
+ *   int          -> hoisted_intToUtf8Bytes (decimal, sign-aware)
+ *   bytes        -> hoisted_bytesToHex (lowercase hex)
+ *   bool         -> "true" / "false" via lazy ifThenElse
+ *   data         -> serialiseData -> bytesToHex
+ *   void         -> "()"
+ *   string       -> encodeUtf8 (treat as already-readable text)
+ *   List<T>      -> "[" + intercalate(", ", map(_showIR(T), elems)) + "]"
+ *   LinearMap<K,V> -> "{" + intercalate(", ", map((k,v) -> showK(k) ++ ": " ++ showV(v), entries)) + "}"
+ *
+ * For struct-typed receivers (TirDataStructType / TirSoPStructType) this
+ * function does not produce IR — those should reach a user-declared
+ * `type X implements Show { show(self): bytes { ... } }` and dispatch
+ * through the regular method-call path. The caller is expected to detect
+ * that case before invoking `_showIR`.
+ */
+export function _showIR(origin_t, exprIR) {
+    const t = getUnaliased(origin_t);
+    if (t instanceof TirIntT)
+        return _ir_apps(hoisted_intToUtf8Bytes.clone(), exprIR);
+    if (t instanceof TirBytesT)
+        return _ir_apps(hoisted_bytesToHex.clone(), exprIR);
+    if (t instanceof TirBoolT)
+        return _ir_lazyIfThenElse(exprIR, _hoisted_litBytes("true").clone(), _hoisted_litBytes("false").clone());
+    if (t instanceof TirDataT)
+        return _ir_apps(hoisted_bytesToHex.clone(), _ir_apps(IRNative.serialiseData, exprIR));
+    if (t instanceof TirVoidT)
+        return _hoisted_litBytes("()").clone();
+    if (t instanceof TirStringT)
+        return _ir_apps(IRNative.encodeUtf8, exprIR);
+    if (t instanceof TirListT)
+        return _showListIR(t, exprIR);
+    if (t instanceof TirLinearMapT)
+        return _showLinearMapIR(t, exprIR);
+    // data-encoded structs and Optional<T> auto-show via serialiseData + hex.
+    // Users can override by declaring `type X implements Show { ... }` —
+    // that path is handled before _showIR is reached.
+    if (t instanceof TirDataStructType
+        || t instanceof TirDataOptT)
+        return _ir_apps(hoisted_bytesToHex.clone(), _ir_apps(IRNative.serialiseData, exprIR));
+    throw new Error(`_showIR: no built-in Show impl for type ${origin_t.toString()}; ` +
+        `the type must declare \`type X implements Show { show(self): bytes { ... } }\``);
+}
+// ---- helpers ----
+const _hoistedLits = {};
+function _hoisted_litBytes(s) {
+    let cached = _hoistedLits[s];
+    if (!cached) {
+        cached = new IRHoisted(IRConst.bytes(fromUtf8(s)));
+        cached.hash;
+        _hoistedLits[s] = cached;
+    }
+    return cached;
+}
+// recurses through `_showIR`. Caches per element-type to avoid repeated
+// IR construction across multiple call sites for the same `List<T>`.
+const _listShowCache = new Map();
+function _showListIR(listT, exprIR) {
+    const elemT = getUnaliased(getListTypeArg(listT));
+    if (!elemT)
+        throw new Error("_showListIR: missing element type");
+    const key = elemT.toConcreteTirTypeName();
+    let hoisted = _listShowCache.get(key);
+    if (!hoisted) {
+        // \xs ->
+        //   "[" ++
+        //   ( recur xs True )
+        //   ++ "]"
+        // recur = fix \self \xs \first ->
+        //   if nullList xs then ""
+        //   else
+        //     let head = headList xs
+        //     let tail = tailList xs
+        //     ( if first then "" else ", " )
+        //     ++ showElem(head)
+        //     ++ self(tail, False)
+        const xsOuter = Symbol("show_list_xs_outer");
+        const recSelf = Symbol("show_list_self");
+        const xs = Symbol("show_list_xs");
+        const first = Symbol("show_list_first");
+        const recur = new IRRecursive(recSelf, new IRFunc([xs, first], _ir_lazyIfThenElse(_ir_apps(IRNative.nullList, new IRVar(xs)), _hoisted_litBytes("").clone(), 
+        // separator + show(head) + recur(tail, false)
+        _ir_apps(IRNative.appendByteString, 
+        // separator
+        _ir_lazyIfThenElse(new IRVar(first), _hoisted_litBytes("").clone(), _hoisted_litBytes(", ").clone()), _ir_apps(IRNative.appendByteString, 
+        // show(head)
+        _showIR(elemT, _ir_apps(IRNative.headList, new IRVar(xs))), 
+        // recur(tail, false)
+        _ir_apps(new IRSelfCall(recSelf), _ir_apps(IRNative.tailList, new IRVar(xs)), IRConst.bool(false)))))));
+        hoisted = new IRHoisted(new IRFunc([xsOuter], _ir_apps(IRNative.appendByteString, _hoisted_litBytes("[").clone(), _ir_apps(IRNative.appendByteString, _ir_apps(recur, new IRVar(xsOuter), IRConst.bool(true)), _hoisted_litBytes("]").clone()))));
+        hoisted.hash;
+        _listShowCache.set(key, hoisted);
+    }
+    return _ir_apps(hoisted.clone(), exprIR);
+}
+const _linearMapShowCache = new Map();
+function _showLinearMapIR(mapT, exprIR) {
+    const keyT = getUnaliased(mapT.keyTypeArg);
+    const valT = getUnaliased(mapT.valTypeArg);
+    const cacheKey = keyT.toConcreteTirTypeName() + "→" + valT.toConcreteTirTypeName();
+    let hoisted = _linearMapShowCache.get(cacheKey);
+    if (!hoisted) {
+        // LinearMap is List<PairData> at the IR level. Iterate similarly to
+        // _showListIR, but on each entry call showK(fst(entry)) ++ ": " ++
+        // showV(snd(entry)). Both sides go through `unBData / unIData / etc.`
+        // implicitly because the Pebble runtime stores keys/values as data.
+        //
+        // For show purposes we treat the entry as an opaque pair-of-data and
+        // recover the value bytes via `_inlineFromData(...)`-like dispatch.
+        // To keep this turn focused, we invoke `_showIR` with `data` and
+        // accept that K/V are shown via their data encoding (compact). A
+        // future polish pass can recover the original K/V types and call
+        // `_showIR(K)` / `_showIR(V)` directly.
+        const xsOuter = Symbol("show_map_outer");
+        const recSelf = Symbol("show_map_self");
+        const xs = Symbol("show_map_xs");
+        const first = Symbol("show_map_first");
+        // key/value extraction at the IR level: an entry is a Pair<Data,Data>;
+        // fst gets the data-encoded key, snd the data-encoded value. We then
+        // just call _showIR(data, ...) on both, which is `serialiseData ++ hex`.
+        const showEntry = (entryIR) => _ir_apps(IRNative.appendByteString, _showIR(/* data */ /* fall back to data show */ 
+        /* Pebble stores K and V as data inside LinearMap */
+        /* see TirLinearMapT.toUplcConstType */
+        /* TirDataT */
+        /* hack: reach the singleton via a fresh instance */
+        new (require("../types/TirNativeType/native/data.js").TirDataT)(), _ir_apps(IRNative.fstPair, entryIR)), _ir_apps(IRNative.appendByteString, _hoisted_litBytes(": ").clone(), _showIR(new (require("../types/TirNativeType/native/data.js").TirDataT)(), _ir_apps(IRNative.sndPair, entryIR))));
+        const recur = new IRRecursive(recSelf, new IRFunc([xs, first], _ir_lazyIfThenElse(_ir_apps(IRNative.nullList, new IRVar(xs)), _hoisted_litBytes("").clone(), _ir_apps(IRNative.appendByteString, _ir_lazyIfThenElse(new IRVar(first), _hoisted_litBytes("").clone(), _hoisted_litBytes(", ").clone()), _ir_apps(IRNative.appendByteString, showEntry(_ir_apps(IRNative.headList, new IRVar(xs))), _ir_apps(new IRSelfCall(recSelf), _ir_apps(IRNative.tailList, new IRVar(xs)), IRConst.bool(false)))))));
+        hoisted = new IRHoisted(new IRFunc([xsOuter], _ir_apps(IRNative.appendByteString, _hoisted_litBytes("{").clone(), _ir_apps(IRNative.appendByteString, _ir_apps(recur, new IRVar(xsOuter), IRConst.bool(true)), _hoisted_litBytes("}").clone()))));
+        hoisted.hash;
+        _linearMapShowCache.set(cacheKey, hoisted);
+    }
+    return _ir_apps(hoisted.clone(), exprIR);
+}
+/** A canonical 1-arg `(T) -> bytes` IR closure for use as a `Show` dictionary entry. */
+export function _showUplcFunc(origin_t) {
+    const xSym = Symbol("show_self");
+    return new IRHoisted(new IRFunc([xSym], _showIR(origin_t, new IRVar(xSym))));
+}

package/dist/compiler/tir/expressions/TirToDataExpr.js

@@ -7,6 +7,7 @@ import { IRNative } from "../../../IR/IRNodes/IRNative/index.js";
 import { IRVar } from "../../../IR/IRNodes/IRVar.js";
 import { data_t } from "../program/stdScope/stdScope.js";
 import { TirDataStructType, TirSoPStructType } from "../types/TirStructType.js";
+import { TirEnumType } from "../types/TirEnumType.js";
 import { isTirType } from "../types/TirType.js";
 import { getListTypeArg } from "../types/utils/getListTypeArg.js";
 import { getOptTypeArg } from "../types/utils/getOptTypeArg.js";
@@ -99,6 +100,8 @@ export function _toDataUplcFunc(origin_t) {
         return IRNative._id;
     if (from_t instanceof TirIntT)
         return IRNative.iData;
+    if (from_t instanceof TirEnumType)
+        return IRNative.iData;
     if (from_t instanceof TirBytesT)
         return IRNative.bData;
     if (from_t instanceof TirVoidT)

package/dist/compiler/tir/expressions/TirTraceExpr.js

@@ -2,10 +2,10 @@ import { _ir_apps } from "../../../IR/IRNodes/IRApp.js";
 import { IRDelayed } from "../../../IR/IRNodes/IRDelayed.js";
 import { IRForced } from "../../../IR/IRNodes/IRForced.js";
 import { IRNative } from "../../../IR/IRNodes/IRNative/index.js";
-import { hoisted_intToUtf8Bytes } from "../../../IR/tree_utils/intToUtf8Bytes.js";
 import { mergeSortedStrArrInplace } from "../../../utils/array/mergeSortedStrArrInplace.js";
-import { TirIntT } from "../types/TirNativeType/index.js";
+import { TirBytesT } from "../types/TirNativeType/index.js";
 import { getUnaliased } from "../types/utils/getUnaliased.js";
+import { _showIR } from "./TirShowExpr.js";
 export class TirTraceExpr {
     traceExpr;
     continuation;
@@ -40,13 +40,17 @@ export class TirTraceExpr {
     toIR(ctx) {
         let bytesIR;
         const exprType = getUnaliased(this.traceExpr.type);
-        if (exprType instanceof TirIntT) {
-            // int -> bytes via intToUtf8Bytes
-            bytesIR = _ir_apps(hoisted_intToUtf8Bytes.clone(), this.traceExpr.toIR(ctx));
+        if (exprType instanceof TirBytesT) {
+            // bytes are assumed to already be valid UTF-8 — pass through
+            // unchanged, as documented for the Show interface.
+            bytesIR = this.traceExpr.toIR(ctx);
         }
         else {
-            // assume bytes
-            bytesIR = this.traceExpr.toIR(ctx);
+            // any other type implementing Show: dispatch through `_showIR`,
+            // which uses the per-type compile-time table (int → decimal,
+            // bool → "true"/"false", data → serialiseData+hex, struct →
+            // user impl or auto-derive, list/map → recursive, ...).
+            bytesIR = _showIR(exprType, this.traceExpr.toIR(ctx));
         }
         // Force(trace(msg, Delay(continuation)))
         // Delay prevents the continuation from being evaluated

package/dist/compiler/tir/expressions/TirTypeConversionExpr.js

@@ -7,6 +7,7 @@ import { TirIntT } from "../types/TirNativeType/native/int.js";
 import { TirDataOptT } from "../types/TirNativeType/native/Optional/data.js";
 import { TirStringT } from "../types/TirNativeType/native/string.js";
 import { TirDataStructType } from "../types/TirStructType.js";
+import { TirEnumType } from "../types/TirEnumType.js";
 import { getUnaliased } from "../types/utils/getUnaliased.js";
 import { _inlineFromData } from "./TirFromDataExpr.js";
 import { _inlineToData } from "./TirToDataExpr.js";
@@ -49,12 +50,21 @@ export class TirTypeConversionExpr {
         if (to_t instanceof TirIntT) {
             if (from_t instanceof TirIntT)
                 return exprIR;
+            // enum is already an int at runtime; identity conversion.
+            if (from_t instanceof TirEnumType)
+                return exprIR;
             if (from_t instanceof TirBytesT)
                 return _ir_apps(IRNative._bytesToIntBE, exprIR);
             if (from_t instanceof TirBoolT)
                 return _ir_apps(IRNative._boolToInt, exprIR);
             throw new Error(`Cannot convert from ${from_t.toString()} to ${to_t.toString()}`);
         }
+        if (to_t instanceof TirEnumType) {
+            // identity at runtime — same enum type.
+            if (from_t instanceof TirEnumType)
+                return exprIR;
+            throw new Error(`Cannot convert from ${from_t.toString()} to ${to_t.toString()}`);
+        }
         if (to_t instanceof TirBytesT) {
             if (from_t instanceof TirBytesT)
                 return exprIR;

package/dist/compiler/tir/expressions/TirVariableAccessExpr.d.ts

@@ -1,6 +1,5 @@
 import { SourceRange } from "../../../ast/Source/SourceRange.js";
-import { IRSelfCall } from "../../../IR/IRNodes/IRSelfCall.js";
-import { IRVar } from "../../../IR/IRNodes/IRVar.js";
+import type { IRTerm } from "../../../IR/IRTerm.js";
 import { ResolveValueResult } from "../../AstCompiler/scope/AstScope.js";
 import { TirType } from "../types/TirType.js";
 import type { ITirExpr } from "./ITirExpr.js";
@@ -17,5 +16,5 @@ export declare class TirVariableAccessExpr implements ITirExpr {
     get isConstant(): boolean;
     get varName(): string;
     deps(): string[];
-    toIR(ctx: ToIRTermCtx): IRVar | IRSelfCall;
+    toIR(ctx: ToIRTermCtx): IRTerm;
 }

package/dist/compiler/tir/expressions/TirVariableAccessExpr.js

@@ -1,5 +1,3 @@
-import { IRSelfCall } from "../../../IR/IRNodes/IRSelfCall.js";
-import { IRVar } from "../../../IR/IRNodes/IRVar.js";
 export class TirVariableAccessExpr {
     range;
     resolvedValue;
@@ -35,8 +33,7 @@ export class TirVariableAccessExpr {
     deps() { return [this.varName]; }
     toIR(ctx) {
         const ir = ctx.getVarAccessIR(this.varName);
-        if (!(ir instanceof IRVar
-            || ir instanceof IRSelfCall)) {
+        if (!ir) {
             throw new Error(`variable '${this.varName}' is missing in [${ctx.allVariables().join(", ")}]`);
         }
         return ir;

package/dist/compiler/tir/expressions/ToIRTermCtx.d.ts

@@ -1,9 +1,17 @@
-import { IRVar } from "../../../IR/IRNodes/IRVar.js";
-import { IRSelfCall } from "../../../IR/IRNodes/IRSelfCall.js";
+import type { IRTerm } from "../../../IR/IRTerm.js";
 export declare class ToIRTermCtx {
     readonly parent: ToIRTermCtx | undefined;
     readonly _creationStack?: string | undefined;
     private readonly localVars;
+    /**
+     * Per-name overrides whose lookup synthesizes a fresh IR term at each
+     * access (rather than resolving to a pre-allocated IRVar). Used to
+     * implement lazy field extraction in case-arms — the body's references
+     * to pattern-bound fields each emit an `IRLetted` over the extraction
+     * IR, so the letted-handling pass can dedup, hoist or eliminate as
+     * appropriate.
+     */
+    private readonly deferredAccess;
     private _firstVariableIsRecursive;
     _children: ToIRTermCtx[];
     constructor(parent: ToIRTermCtx | undefined);
@@ -13,7 +21,16 @@ export declare class ToIRTermCtx {
     newChild(): ToIRTermCtx;
     private localVarSym;
     getVarAccessSym(name: string): symbol | undefined;
-    getVarAccessIR(name: string): IRVar | IRSelfCall | undefined;
+    private getDeferredAccessFactory;
+    getVarAccessIR(name: string): IRTerm | undefined;
+    /**
+     * Register a per-name lookup override. Subsequent `getVarAccessIR(name)`
+     * calls in this context (or its descendants) return the IR term produced
+     * by `factory()`. The factory is invoked once per access — wrap the
+     * result in `IRLetted` if you want the IR-level let-handling pass to
+     * dedup / hoist / eliminate as appropriate.
+     */
+    defineDeferredAccess(name: string, factory: () => IRTerm): void;
     /**
      * @returns the symbol of the defined variable (for eventual `new IRFunc( ... )`)
     **/

package/dist/compiler/tir/expressions/ToIRTermCtx.js

@@ -5,6 +5,15 @@ export class ToIRTermCtx {
     parent;
     _creationStack;
     localVars = new Map();
+    /**
+     * Per-name overrides whose lookup synthesizes a fresh IR term at each
+     * access (rather than resolving to a pre-allocated IRVar). Used to
+     * implement lazy field extraction in case-arms — the body's references
+     * to pattern-bound fields each emit an `IRLetted` over the extraction
+     * IR, so the letted-handling pass can dedup, hoist or eliminate as
+     * appropriate.
+     */
+    deferredAccess = new Map();
     _firstVariableIsRecursive = false;
     _children = [];
     constructor(parent) {
@@ -37,15 +46,51 @@ export class ToIRTermCtx {
         return (this.localVarSym(name)
             ?? this.parent?.getVarAccessSym(name));
     }
+    getDeferredAccessFactory(name) {
+        return (this.deferredAccess.get(name)
+            ?? this.parent?.getDeferredAccessFactory(name));
+    }
     getVarAccessIR(name) {
+        // deferred accesses (lazy field extraction in case-arms etc.)
+        // shadow symbol-based lookups when present.
+        const deferred = this.getDeferredAccessFactory(name);
+        if (deferred)
+            return deferred();
         const accessSym = this.getVarAccessSym(name);
         if (typeof accessSym !== "symbol")
             return undefined;
-        if (this._firstVariableIsRecursive
-            && name === this.localVars.keys().next().value)
-            return new IRSelfCall(accessSym);
+        // Recursive accesses must use IRSelfCall (the recursive symbol is
+        // bound by an IRRecursive, not an IRFunc — IRVar references would
+        // not find a binder during the unused-var pass). Walk the parent
+        // chain to find the ctx that owns `name`; that ctx may not be the
+        // current one when we're deep inside the recursive function's body
+        // (e.g. inside a `case` continuation that newChild'd from it).
+        let cur = this;
+        while (cur) {
+            const localSym = cur.localVars.get(name);
+            if (localSym !== undefined) {
+                if (cur._firstVariableIsRecursive
+                    && name === cur.localVars.keys().next().value)
+                    return new IRSelfCall(accessSym);
+                break;
+            }
+            cur = cur.parent;
+        }
         return new IRVar(accessSym);
     }
+    /**
+     * Register a per-name lookup override. Subsequent `getVarAccessIR(name)`
+     * calls in this context (or its descendants) return the IR term produced
+     * by `factory()`. The factory is invoked once per access — wrap the
+     * result in `IRLetted` if you want the IR-level let-handling pass to
+     * dedup / hoist / eliminate as appropriate.
+     */
+    defineDeferredAccess(name, factory) {
+        if (this.localVars.has(name) || this.deferredAccess.has(name)) {
+            throw new Error(`variable '${name}' already defined in the current scope`);
+        }
+        this.deferredAccess.set(name, factory);
+    }
     /**
      * @returns the symbol of the defined variable (for eventual `new IRFunc( ... )`)
     **/

package/dist/compiler/tir/expressions/binary/TirBinaryExpr.d.ts

@@ -119,7 +119,7 @@ export declare class TirSubExpr implements ITirBinaryExpr {
     left: TirExpr;
     right: TirExpr;
     readonly range: SourceRange;
-    readonly type: TirType;
+    get type(): TirType;
     constructor(left: TirExpr, right: TirExpr, range: SourceRange);
     toString(): string;
     pretty(indent: number): string;
@@ -132,7 +132,7 @@ export declare class TirMultExpr implements ITirBinaryExpr {
     left: TirExpr;
     right: TirExpr;
     readonly range: SourceRange;
-    readonly type: TirType;
+    get type(): TirType;
     constructor(left: TirExpr, right: TirExpr, range: SourceRange);
     toString(): string;
     pretty(indent: number): string;

package/dist/compiler/tir/expressions/binary/TirBinaryExpr.js

@@ -5,6 +5,8 @@ import { getUnaliased } from "../../types/utils/getUnaliased.js";
 import { CEKConst, Machine } from "@harmoniclabs/plutus-machine";
 import { TirBytesT } from "../../types/TirNativeType/native/bytes.js";
 import { TirIntT } from "../../types/TirNativeType/native/int.js";
+import { TirEnumType } from "../../types/TirEnumType.js";
+import { TirValueT } from "../../types/TirNativeType/native/value.js";
 import { IRNative } from "../../../../IR/IRNodes/IRNative/index.js";
 import { IRConst } from "../../../../IR/IRNodes/IRConst.js";
 import { compileIRToUPLC } from "../../../../IR/toUPLC/compileIRToUPLC.js";
@@ -87,7 +89,7 @@ export class TirLessThanExpr {
     get isConstant() { return this.left.isConstant && this.right.isConstant; }
     toIR(ctx) {
         const type = getUnaliased(this.left.type);
-        const irFunc = (type instanceof TirIntT ? IRNative.lessThanInteger :
+        const irFunc = ((type instanceof TirIntT || type instanceof TirEnumType) ? IRNative.lessThanInteger :
             type instanceof TirBytesT ? IRNative.lessThanByteString :
                 undefined);
         if (!irFunc)
@@ -124,7 +126,7 @@ export class TirGreaterThanExpr {
     get isConstant() { return this.left.isConstant && this.right.isConstant; }
     toIR(ctx) {
         const type = getUnaliased(this.left.type);
-        const irFunc = (type instanceof TirIntT ? IRNative.lessThanInteger :
+        const irFunc = ((type instanceof TirIntT || type instanceof TirEnumType) ? IRNative.lessThanInteger :
             type instanceof TirBytesT ? IRNative.lessThanByteString :
                 undefined);
         if (!irFunc)
@@ -163,7 +165,7 @@ export class TirLessThanEqualExpr {
     get isConstant() { return this.left.isConstant && this.right.isConstant; }
     toIR(ctx) {
         const type = getUnaliased(this.left.type);
-        const irFunc = (type instanceof TirIntT ? IRNative.lessThanEqualInteger :
+        const irFunc = ((type instanceof TirIntT || type instanceof TirEnumType) ? IRNative.lessThanEqualInteger :
             type instanceof TirBytesT ? IRNative.lessThanEqualsByteString :
                 undefined);
         if (!irFunc)
@@ -200,7 +202,7 @@ export class TirGreaterThanEqualExpr {
     get isConstant() { return this.left.isConstant && this.right.isConstant; }
     toIR(ctx) {
         const type = getUnaliased(this.left.type);
-        const irFunc = (type instanceof TirIntT ? IRNative.lessThanEqualInteger :
+        const irFunc = ((type instanceof TirIntT || type instanceof TirEnumType) ? IRNative.lessThanEqualInteger :
             type instanceof TirBytesT ? IRNative.lessThanEqualsByteString :
                 undefined);
         if (!irFunc)
@@ -285,9 +287,14 @@ export class TirAddExpr {
     _creationStack;
     get type() {
         const leftType = getUnaliased(this.left.type);
+        if (leftType instanceof TirValueT)
+            return this.left.type;
         if (leftType instanceof TirIntT
             || leftType instanceof TirBytesT)
             return leftType;
+        // enum + int yields an int (enums lower to ints at runtime)
+        if (leftType instanceof TirEnumType)
+            return int_t;
         throw new Error("invalid type for addition");
     }
     constructor(left, right, range) {
@@ -312,9 +319,10 @@ export class TirAddExpr {
     get isConstant() { return this.left.isConstant && this.right.isConstant; }
     toIR(ctx) {
         const type = getUnaliased(this.left.type);
-        const irFunc = (type instanceof TirIntT ? IRNative.addInteger :
+        const irFunc = ((type instanceof TirIntT || type instanceof TirEnumType) ? IRNative.addInteger :
             type instanceof TirBytesT ? IRNative.appendByteString :
-                undefined);
+                type instanceof TirValueT ? IRNative.unionValue :
+                    undefined);
         if (!irFunc)
             throw new Error("invalid left type for TirAddExpr");
         return _ir_apps(irFunc, this.left.toIR(ctx), this.right.toIR(ctx));
@@ -329,7 +337,12 @@ export class TirSubExpr {
     left;
     right;
     range;
-    type = int_t;
+    get type() {
+        const leftType = getUnaliased(this.left.type);
+        if (leftType instanceof TirValueT)
+            return this.left.type;
+        return int_t;
+    }
     constructor(left, right, range) {
         this.left = left;
         this.right = right;
@@ -348,6 +361,11 @@ export class TirSubExpr {
     }
     get isConstant() { return this.left.isConstant && this.right.isConstant; }
     toIR(ctx) {
+        const type = getUnaliased(this.left.type);
+        if (type instanceof TirValueT) {
+            // a - b  →  unionValue a (negateValue b)
+            return _ir_apps(IRNative.unionValue, this.left.toIR(ctx), _ir_apps(IRNative._negateValue, this.right.toIR(ctx)));
+        }
         return _ir_apps(IRNative.subtractInteger, this.left.toIR(ctx), this.right.toIR(ctx));
     }
     deps() {
@@ -360,7 +378,15 @@ export class TirMultExpr {
     left;
     right;
     range;
-    type = int_t;
+    get type() {
+        const leftTy = getUnaliased(this.left.type);
+        const rightTy = getUnaliased(this.right.type);
+        if (leftTy instanceof TirValueT)
+            return this.left.type;
+        if (rightTy instanceof TirValueT)
+            return this.right.type;
+        return int_t;
+    }
     constructor(left, right, range) {
         this.left = left;
         this.right = right;
@@ -379,6 +405,17 @@ export class TirMultExpr {
     }
     get isConstant() { return this.left.isConstant && this.right.isConstant; }
     toIR(ctx) {
+        const leftTy = getUnaliased(this.left.type);
+        const rightTy = getUnaliased(this.right.type);
+        // scaleValue :: int -> Value -> Value
+        if (leftTy instanceof TirValueT) {
+            // Value * int  →  scaleValue int Value
+            return _ir_apps(IRNative.scaleValue, this.right.toIR(ctx), this.left.toIR(ctx));
+        }
+        if (rightTy instanceof TirValueT) {
+            // int * Value  →  scaleValue int Value
+            return _ir_apps(IRNative.scaleValue, this.left.toIR(ctx), this.right.toIR(ctx));
+        }
         return _ir_apps(IRNative.multiplyInteger, this.left.toIR(ctx), this.right.toIR(ctx));
     }
     deps() {

package/dist/compiler/tir/expressions/litteral/TirLitEnumMemberExpr.d.ts

@@ -0,0 +1,19 @@
+import { ITirExpr } from "../ITirExpr.js";
+import { SourceRange } from "../../../../ast/Source/SourceRange.js";
+import { TirEnumType } from "../../types/TirEnumType.js";
+import { ToIRTermCtx } from "../ToIRTermCtx.js";
+import { IRTerm } from "../../../../IR/index.js";
+import type { TirExpr } from "../TirExpr.js";
+export declare class TirLitEnumMemberExpr implements ITirExpr {
+    readonly type: TirEnumType;
+    readonly memberIdx: number;
+    readonly range: SourceRange;
+    readonly isConstant: boolean;
+    constructor(type: TirEnumType, memberIdx: number, range: SourceRange);
+    get memberName(): string;
+    pretty(): string;
+    toString(): string;
+    clone(): TirExpr;
+    deps(): string[];
+    toIR(_ctx: ToIRTermCtx): IRTerm;
+}

package/dist/compiler/tir/expressions/litteral/TirLitEnumMemberExpr.js

@@ -0,0 +1,24 @@
+import { IRConst } from "../../../../IR/index.js";
+export class TirLitEnumMemberExpr {
+    type;
+    memberIdx;
+    range;
+    isConstant = true;
+    constructor(type, memberIdx, range) {
+        this.type = type;
+        this.memberIdx = memberIdx;
+        this.range = range;
+    }
+    get memberName() { return this.type.members[this.memberIdx]; }
+    pretty() { return this.toString(); }
+    toString() {
+        return `${this.type.name}.${this.memberName}`;
+    }
+    clone() {
+        return new TirLitEnumMemberExpr(this.type.clone(), this.memberIdx, this.range.clone());
+    }
+    deps() { return []; }
+    toIR(_ctx) {
+        return IRConst.int(BigInt(this.memberIdx));
+    }
+}

package/dist/compiler/tir/expressions/litteral/TirLitteralExpr.d.ts

@@ -1,4 +1,5 @@
 import { TirLitArrExpr } from "./TirLitArrExpr.js";
+import { TirLitEnumMemberExpr } from "./TirLitEnumMemberExpr.js";
 import { TirLitFailExpr } from "./TirLitFailExpr.js";
 import { TirLitFalseExpr } from "./TirLitFalseExpr.js";
 import { TirLitHexBytesExpr } from "./TirLitHexBytesExpr.js";
@@ -10,5 +11,5 @@ import { TirLitThisExpr } from "./TirLitThisExpr.js";
 import { TirLitTrueExpr } from "./TirLitTrueExpr.js";
 import { TirLitUndefExpr } from "./TirLitUndefExpr.js";
 import { TirLitVoidExpr } from "./TirLitVoidExpr.js";
-export type TirLitteralExpr = TirLitVoidExpr | TirLitUndefExpr | TirLitTrueExpr | TirLitFalseExpr | TirLitStrExpr | TirLitIntExpr | TirLitHexBytesExpr | TirLitThisExpr | TirLitArrExpr | TirLitObjExpr | TirLitNamedObjExpr | TirLitFailExpr;
+export type TirLitteralExpr = TirLitVoidExpr | TirLitUndefExpr | TirLitTrueExpr | TirLitFalseExpr | TirLitStrExpr | TirLitIntExpr | TirLitHexBytesExpr | TirLitThisExpr | TirLitArrExpr | TirLitObjExpr | TirLitNamedObjExpr | TirLitEnumMemberExpr | TirLitFailExpr;
 export declare function isTirLitteralExpr(thing: any): thing is TirLitteralExpr;

package/dist/compiler/tir/expressions/litteral/TirLitteralExpr.js

@@ -1,4 +1,5 @@
 import { TirLitArrExpr } from "./TirLitArrExpr.js";
+import { TirLitEnumMemberExpr } from "./TirLitEnumMemberExpr.js";
 import { TirLitFailExpr } from "./TirLitFailExpr.js";
 import { TirLitFalseExpr } from "./TirLitFalseExpr.js";
 import { TirLitHexBytesExpr } from "./TirLitHexBytesExpr.js";
@@ -19,6 +20,7 @@ export function isTirLitteralExpr(thing) {
         || thing instanceof TirLitArrExpr
         || thing instanceof TirLitObjExpr
         || thing instanceof TirLitNamedObjExpr
+        || thing instanceof TirLitEnumMemberExpr
         || thing instanceof TirLitStrExpr
         || thing instanceof TirLitIntExpr
         || thing instanceof TirLitHexBytesExpr