@harmoniclabs/pebble 0.1.3-dev7 → 0.1.3-dev8

package/dist/compiler/AstCompiler/AstCompiler.js

@@ -630,8 +630,19 @@ export class AstCompiler extends DiagnosticEmitter {
                 // define on source top level scope
                 if (isValue)
                     srcImportsScope.variables.set(declName, importedSymbols.variables.get(declName));
-                if (isFunction)
-                    srcImportsScope.functions.set(declName, importedSymbols.functions.get(declName));
+                if (isFunction) {
+                    const tirFuncName = importedSymbols.functions.get(declName);
+                    srcImportsScope.functions.set(declName, tirFuncName);
+                    // also define as a value so that `resolveValue` can find it
+                    // (mirrors what `_collectTopLevelFuncDeclSig` does for local functions)
+                    const funcExpr = this.program.functions.get(tirFuncName);
+                    if (funcExpr)
+                        srcImportsScope.defineValue({
+                            isConstant: true,
+                            name: declName,
+                            type: funcExpr.type,
+                        });
+                }
                 if (isType)
                     srcImportsScope.types.set(declName, importedSymbols.types.get(declName));
                 if (isInterface)

package/dist/compiler/TirCompiler/compileTirProgram.js

@@ -1,3 +1,4 @@
+import { TirFuncExpr } from "../tir/expressions/TirFuncExpr.js";
 import { ToIRTermCtx } from "../tir/expressions/ToIRTermCtx.js";
 import { expressify } from "./expressify/expressify.js";
 /**
@@ -12,10 +13,18 @@ export function compileTypedProgram(cfg, tirProgram) {
         tirProgram,
     );
     //*/
+    // expressify all program functions (including imported ones)
+    // so they are ready for IR conversion when referenced via TirHoistedExpr.
+    // each TirFuncExpr may appear under multiple keys (ast name + tir name),
+    // so we use a Set to avoid expressifying the same function twice.
+    const expressified = new Set();
+    for (const func of tirProgram.functions.values()) {
+        if (func instanceof TirFuncExpr && !expressified.has(func)) {
+            expressify(func, undefined, tirProgram);
+            expressified.add(func);
+        }
+    }
     const mainFuncExpr = tirProgram.getMainOrThrow();
-    // console.log("main func:", mainFuncExpr.pretty() );
-    void expressify(mainFuncExpr, undefined, // loopReplacements
-    tirProgram);
     // console.log("main func expressified:", mainFuncExpr.pretty() );
     return mainFuncExpr.toIR(ToIRTermCtx.root());
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harmoniclabs/pebble",
-  "version": "0.1.3-dev7",
+  "version": "0.1.3-dev8",
   "description": "A simple, yet rock solid, functional language with an imperative bias, targeting UPLC",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",