@harmoniclabs/pebble 0.2.0 → 0.3.1

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

@@ -1,13 +1,11 @@
-import { _ir_apps, IRApp } from "../../../IR/IRNodes/IRApp.js";
+import { _ir_apps } from "../../../IR/IRNodes/IRApp.js";
+import { IRCase } from "../../../IR/IRNodes/IRCase.js";
 import { IRConst } from "../../../IR/IRNodes/IRConst.js";
 import { IRConstr } from "../../../IR/IRNodes/IRConstr.js";
-import { IRDelayed } from "../../../IR/IRNodes/IRDelayed.js";
-import { IRForced } from "../../../IR/IRNodes/IRForced.js";
 import { IRFunc } from "../../../IR/IRNodes/IRFunc.js";
 import { IRHoisted } from "../../../IR/IRNodes/IRHoisted.js";
 import { IRNative } from "../../../IR/IRNodes/IRNative/index.js";
 import { IRVar } from "../../../IR/IRNodes/IRVar.js";
-import { _ir_let } from "../../../IR/tree_utils/_ir_let.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";
@@ -19,7 +17,10 @@ import { TirDataOptT } from "../types/TirNativeType/native/Optional/data.js";
 import { TirSopOptT } from "../types/TirNativeType/native/Optional/sop.js";
 import { TirStringT } from "../types/TirNativeType/native/string.js";
 import { TirVoidT } from "../types/TirNativeType/native/void.js";
+import { TirValueT } from "../types/TirNativeType/native/value.js";
+import { TirArrayT } from "../types/TirNativeType/native/array.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";
@@ -68,6 +69,20 @@ export function _inlineFromData(target_t, dataExprIR) {
     // LinearMapEntry is Pair<Data,Data> at runtime — no conversion needed
     if (to_t instanceof TirLinearMapEntryT)
         return dataExprIR;
+    // Native Value: data -> Value via `unValueData`
+    if (to_t instanceof TirValueT)
+        return _ir_apps(IRNative.unValueData, dataExprIR);
+    // Native Array<T>: data -> [data] (unListData) -> Array<T>
+    // for non-data element types we map elements through their fromData first.
+    if (to_t instanceof TirArrayT) {
+        const elems_t = getUnaliased(to_t.typeArg);
+        const listOfDataExpr = _ir_apps(IRNative.unListData, dataExprIR);
+        if (elems_t instanceof TirDataStructType
+            || elems_t instanceof TirDataOptT
+            || elems_t instanceof TirDataT)
+            return _ir_apps(IRNative.listToArray, listOfDataExpr);
+        return _ir_apps(IRNative.listToArray, _ir_apps(IRNative._mkMapList, IRConst.listOf(elems_t)([]), _fromDataUplcFunc(elems_t), listOfDataExpr));
+    }
     if (to_t instanceof TirListT) {
         const elems_t = getUnaliased(getListTypeArg(to_t));
         const listOfDataExpr = _ir_apps(IRNative.unListData, dataExprIR);
@@ -81,16 +96,24 @@ export function _inlineFromData(target_t, dataExprIR) {
         const value_t = getOptTypeArg(to_t);
         if (!isTirType(value_t))
             throw new Error("TirFromDataExpr: unreachable");
-        return _ir_let(// introuduce a var
-        _ir_apps(IRNative.unConstrData, dataExprIR), unConstrDataResultSym => _ir_apps(IRNative.strictIfThenElse, _ir_apps(IRNative.equalsInteger, _ir_apps(IRNative.fstPair, new IRVar(unConstrDataResultSym) // unConstrData result
-        ), IRConst.int(0)), 
-        // then (Just value)
-        new IRConstr(0, [
-            _ir_apps(_fromDataUplcFunc(value_t), _ir_apps(IRNative.headList, _ir_apps(IRNative.sndPair, new IRVar(unConstrDataResultSym) // unConstrData result
-            )))
-        ]), 
-        // else (Nothing)
-        new IRHoisted(new IRConstr(1, []))));
+        // Case(unConstrData(data), [\idxSym fieldsSym ->
+        //     Case(idxSym, [
+        //         IRConstr(0, [fromData(headList(fieldsSym))]),  -- Some
+        //         IRConstr(1, [])                                -- None
+        //     ])
+        // ])
+        const idxSym = Symbol("optIdx");
+        const fieldsListSym = Symbol("optFields");
+        return new IRCase(_ir_apps(IRNative.unConstrData, dataExprIR), [
+            new IRFunc([idxSym, fieldsListSym], new IRCase(new IRVar(idxSym), [
+                // ctor 0: Some
+                new IRConstr(0, [
+                    _ir_apps(_fromDataUplcFunc(value_t), _ir_apps(IRNative.headList, new IRVar(fieldsListSym)))
+                ]),
+                // ctor 1: None
+                new IRHoisted(new IRConstr(1, []))
+            ]))
+        ]);
     }
     if (to_t instanceof TirSoPStructType) {
         return _inlineMultiSopConstrFromData(to_t, dataExprIR);
@@ -106,6 +129,8 @@ export function _fromDataUplcFunc(_target_t) {
         return IRNative._id;
     if (target_t instanceof TirIntT)
         return IRNative.unIData;
+    if (target_t instanceof TirEnumType)
+        return IRNative.unIData;
     if (target_t instanceof TirBytesT)
         return IRNative.unBData;
     if (target_t instanceof TirVoidT)
@@ -114,6 +139,9 @@ export function _fromDataUplcFunc(_target_t) {
         return _boolFromData.clone();
     if (target_t instanceof TirStringT)
         return _strFromData.clone();
+    // Native Value: data -> Value via `unValueData`
+    if (target_t instanceof TirValueT)
+        return IRNative.unValueData;
     if (target_t instanceof TirLinearMapT)
         // linear maps only have pairs as elements
         // and we only support pairs of data (bc we only have `mkPairData`)
@@ -136,8 +164,21 @@ export function _fromDataUplcFunc(_target_t) {
 const _unitFromDataSym = Symbol("unit");
 const _mkUnit = new IRHoisted(new IRFunc([_unitFromDataSym], IRConst.unit));
 const _boolFromDataDataSym = Symbol("boolData");
+// Case(unConstrData(data), [\idxSym _fieldsSym ->
+//     Case(idxSym, [
+//         IRConst.bool(true),   -- ctor 0 → true   (preserves equalsInteger(_, 0) semantics)
+//         IRConst.bool(false)   -- ctor 1 → false
+//     ])
+// ])
+const _boolFromDataIdxSym = Symbol("boolIdx");
+const _boolFromDataFieldsSym = Symbol("boolFields_unused");
 const _boolFromData = new IRHoisted(new IRFunc([_boolFromDataDataSym], // data
-_ir_apps(IRNative.equalsInteger, new IRApp(IRNative.fstPair, new IRApp(IRNative.unConstrData, new IRVar(_boolFromDataDataSym))), IRConst.int(0))));
+new IRCase(_ir_apps(IRNative.unConstrData, new IRVar(_boolFromDataDataSym)), [
+    new IRFunc([_boolFromDataIdxSym, _boolFromDataFieldsSym], new IRCase(new IRVar(_boolFromDataIdxSym), [
+        IRConst.bool(true),
+        IRConst.bool(false)
+    ]))
+])));
 const _strFromDataDataSym = Symbol("strData");
 const _strFromData = new IRHoisted(new IRFunc([_strFromDataDataSym], // data
 _ir_apps(IRNative.decodeUtf8, _ir_apps(IRNative.unBData, new IRVar(_strFromDataDataSym)))));
@@ -147,63 +188,57 @@ export function _inilneSingeSopConstrFromData(sop_t, dataExprIR) {
     const constr = sop_t.constructors[0];
     if (constr.fields.length === 0)
         return new IRHoisted(new IRConstr(0, []));
-    if (constr.fields.length === 1) {
-        const value_t = getUnaliased(constr.fields[0].type);
-        if (!isTirType(value_t))
-            throw new Error("TirFromDataExpr: unreachable");
-        return new IRConstr(0, [
-            _inlineFromData(value_t, 
-            // get head of fields list
-            _ir_apps(IRNative.headList, _ir_apps(IRNative.sndPair, _ir_apps(IRNative.unConstrData, dataExprIR))))
-        ]);
-    }
-    return _ir_let(_ir_apps(IRNative.sndPair, _ir_apps(IRNative.unConstrData, dataExprIR)), // introduce fields list
-    // introduce fields list
-    fieldsListSym => new IRConstr(0, constr.fields.map((field, i) => {
-        const field_t = getUnaliased(field.type);
-        if (!isTirType(field_t))
-            throw new Error("TirFromDataExpr: unreachable");
-        return _inlineFromData(field_t, _ir_apps(IRNative.headList, i === 0
-            ? new IRVar(fieldsListSym)
-            : _ir_apps(IRNative._dropList, IRConst.int(i), new IRVar(fieldsListSym))));
-    })));
+    // Case(unConstrData(data), [\_idxSym fieldsListSym -> IRConstr(0, [...fields])])
+    // Single ctor, so the index is ignored — the outer Case destructures
+    // the pair via a 2-arg branch and we only consume the fields list.
+    const idxSym = Symbol("singleCtorIdx_unused");
+    const fieldsListSym = Symbol("fieldsList");
+    return new IRCase(_ir_apps(IRNative.unConstrData, dataExprIR), [
+        new IRFunc([idxSym, fieldsListSym], new IRConstr(0, constr.fields.map((field, i) => {
+            const field_t = getUnaliased(field.type);
+            if (!isTirType(field_t))
+                throw new Error("TirFromDataExpr: unreachable");
+            return _inlineFromData(field_t, _ir_apps(IRNative.headList, i === 0
+                ? new IRVar(fieldsListSym)
+                : _ir_apps(IRNative.dropList, IRConst.int(i), new IRVar(fieldsListSym))));
+        })))
+    ]);
 }
 export function _inlineMultiSopConstrFromData(sop_t, dataExprIR) {
     if (sop_t.constructors.length <= 1)
         return _inilneSingeSopConstrFromData(sop_t, dataExprIR);
-    return _ir_let(_ir_apps(IRNative.unConstrData, dataExprIR), // introduce unConstrData result
-    // introduce unConstrData result
-    unConstrDataSym => _ir_let(_ir_apps(IRNative.equalsInteger, _ir_apps(IRNative.fstPair, new IRVar(unConstrDataSym))), // introduce isConstrIdx predicate (a function expecting an int)
-    // introduce isConstrIdx predicate (a function expecting an int)
-    isConstrIdxSym => _ir_let(_ir_apps(IRNative.sndPair, new IRVar(unConstrDataSym)), // introduce fields list
-    // introduce fields list
-    fieldsListSym => {
-        const continuations = sop_t.constructors.map((constr, constrIdx) => {
-            if (constr.fields.length === 0)
-                return new IRHoisted(new IRConstr(constrIdx, []));
-            if (constr.fields.length === 1) {
-                const value_t = getUnaliased(constr.fields[0].type);
-                if (!isTirType(value_t))
-                    throw new Error("TirFromDataExpr: unreachable");
-                return new IRConstr(constrIdx, [
-                    _inlineFromData(value_t, _ir_apps(IRNative.headList, new IRVar(fieldsListSym)))
-                ]);
-            }
-            return new IRConstr(constrIdx, constr.fields.map((field, i) => {
-                const field_t = getUnaliased(field.type);
-                if (!isTirType(field_t))
-                    throw new Error("TirFromDataExpr: unreachable");
-                return _inlineFromData(field_t, _ir_apps(IRNative.headList, i === 0
-                    ? new IRVar(fieldsListSym)
-                    : _ir_apps(IRNative._dropList, IRConst.int(i), new IRVar(fieldsListSym))));
-            }));
-        });
-        let finalIfThenElseChain = continuations[continuations.length - 1];
-        for (let i = continuations.length - 2; i >= 0; i--) {
-            finalIfThenElseChain = new IRForced(_ir_apps(IRNative.strictIfThenElse, _ir_apps(new IRVar(isConstrIdxSym), IRConst.int(i)), new IRDelayed(continuations[i]), new IRDelayed(finalIfThenElseChain)));
+    // Case(unConstrData(data), [\idxSym fieldsListSym ->
+    //     Case(idxSym, [
+    //         IRConstr(0, [...fields_of_ctor_0]),
+    //         IRConstr(1, [...fields_of_ctor_1]),
+    //         ...
+    //     ])
+    // ])
+    const idxSym = Symbol("ctorIdx");
+    const fieldsListSym = Symbol("fieldsList");
+    const continuations = sop_t.constructors.map((constr, constrIdx) => {
+        if (constr.fields.length === 0)
+            return new IRHoisted(new IRConstr(constrIdx, []));
+        if (constr.fields.length === 1) {
+            const value_t = getUnaliased(constr.fields[0].type);
+            if (!isTirType(value_t))
+                throw new Error("TirFromDataExpr: unreachable");
+            return new IRConstr(constrIdx, [
+                _inlineFromData(value_t, _ir_apps(IRNative.headList, new IRVar(fieldsListSym)))
+            ]);
         }
-        return finalIfThenElseChain;
-    })));
+        return new IRConstr(constrIdx, constr.fields.map((field, i) => {
+            const field_t = getUnaliased(field.type);
+            if (!isTirType(field_t))
+                throw new Error("TirFromDataExpr: unreachable");
+            return _inlineFromData(field_t, _ir_apps(IRNative.headList, i === 0
+                ? new IRVar(fieldsListSym)
+                : _ir_apps(IRNative.dropList, IRConst.int(i), new IRVar(fieldsListSym))));
+        }));
+    });
+    return new IRCase(_ir_apps(IRNative.unConstrData, dataExprIR), [
+        new IRFunc([idxSym, fieldsListSym], new IRCase(new IRVar(idxSym), continuations))
+    ]);
 }
 // new cached hoisted helpers (mirroring TirToDataExpr pattern)
 const _mapListFromDataOfType = {};

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

@@ -4,6 +4,7 @@ import { IRConst } from "../../../IR/IRNodes/IRConst.js";
 import { IRFunc } from "../../../IR/IRNodes/IRFunc.js";
 import { IRNative } from "../../../IR/IRNodes/IRNative/index.js";
 import { TirDataStructType, TirSoPStructType } from "../types/TirStructType.js";
+import { TirEnumType } from "../types/TirEnumType.js";
 import { getUnaliased } from "../types/utils/getUnaliased.js";
 export class TirIsExpr {
     instanceExpr;
@@ -34,8 +35,20 @@ export class TirIsExpr {
     }
     get isConstant() { return this.instanceExpr.isConstant; }
     toIR(ctx) {
-        const structType = getUnaliased(this.instanceExpr.type);
+        const unaliased = getUnaliased(this.instanceExpr.type);
+        if (unaliased instanceof TirEnumType) {
+            // enums lower to a plain int; `is Member` is integer equality
+            return _ir_apps(IRNative.equalsInteger, IRConst.int(this.parentCtorIdx), this.instanceExpr.toIR(ctx));
+        }
+        const structType = unaliased;
         if (structType instanceof TirDataStructType) {
+            // untagged data structs have exactly one constructor; the
+            // runtime value carries no tag — `is Ctor` is statically true.
+            // We still evaluate `instanceExpr` to preserve any error it
+            // would produce (the redundancy is also flagged with a warning
+            // at AstCompiler time).
+            if (structType.untagged)
+                return _ir_apps(new IRFunc([Symbol("_unused_is_untagged")], IRConst.bool(true)), this.instanceExpr.toIR(ctx));
             // equalsInteger(parentCtorIdx, fstPair(unConstrData(<instance>)))
             return _ir_apps(IRNative.equalsInteger, IRConst.int(this.parentCtorIdx), _ir_apps(IRNative.fstPair, _ir_apps(IRNative.unConstrData, this.instanceExpr.toIR(ctx))));
         }

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

@@ -42,7 +42,6 @@ export declare class TirNativeFunc implements ITirExpr {
     static get verifyEd25519Signature(): TirNativeFunc;
     static strictIfThenElse(returnT: TirType): TirNativeFunc;
     static chooseUnit(returnT: TirType): TirNativeFunc;
-    static strictChooseList(elemT: TirType, returnT: TirType): TirNativeFunc;
     static mkCons(elemT: TirType): TirNativeFunc;
     static headList(elemT: TirType): TirNativeFunc;
     static tailList(elemT: TirType): TirNativeFunc;
@@ -98,7 +97,7 @@ export declare class TirNativeFunc implements ITirExpr {
     static get countSetBits(): TirNativeFunc;
     static get findFirstSetBit(): TirNativeFunc;
     static get ripemd_160(): TirNativeFunc;
-    static _dropList(elemT: TirType): TirNativeFunc;
+    static dropList(elemT: TirType): TirNativeFunc;
     static _foldr(elemT: TirType, returnT: TirType): TirNativeFunc;
     static _foldl(elemT: TirType, returnT: TirType): TirNativeFunc;
     static _findSopOptional(elems_t: TirType): TirNativeFunc;

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

@@ -229,16 +229,6 @@ export class TirNativeFunc {
             void_t
         ], returnT));
     }
-    static strictChooseList(elemT, returnT) {
-        return new TirNativeFunc(IRNativeTag.strictChooseList, new TirFuncT([
-            // list
-            new TirListT(elemT),
-            // caseNil
-            returnT,
-            // caseCons
-            returnT
-        ], returnT));
-    }
     // List operations with type parameters
     static mkCons(elemT) {
         return new TirNativeFunc(IRNativeTag.mkCons, new TirFuncT([
@@ -577,8 +567,8 @@ export class TirNativeFunc {
         ], bytes_t));
     }
     // Custom utility functions
-    static _dropList(elemT) {
-        return new TirNativeFunc(IRNativeTag._dropList, new TirFuncT([
+    static dropList(elemT) {
+        return new TirNativeFunc(IRNativeTag.dropList, new TirFuncT([
             // n
             int_t,
             // list

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/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() {