generic changes

JeanJPNM · JeanJPNM · commit c60f732670d6 · 2025-01-20T15:01:00.000-03:00
diff --git a/compiler/src/flow/graph.ts b/compiler/src/flow/graph.ts
@@ -187,12 +187,12 @@ export class Graph {
 
       for (const node of block.instructions.nodes()) {
         const inst = node.instruction;
-        if (isLowerable(inst)) {
-          cursor.position = node;
-          inst.lower(c, cursor);
-          cursor.position = node;
-          cursor.removeInstruction();
-        }
+        if (!isLowerable(inst)) continue;
+
+        cursor.position = node;
+        inst.lower(c, cursor);
+        cursor.position = node;
+        cursor.removeInstruction();
       }
     });
   }
diff --git a/compiler/src/flow/instructions.ts b/compiler/src/flow/instructions.ts
@@ -3,7 +3,6 @@ import { ICompilerContext } from "../CompilerContext";
 import { CompilerError } from "../CompilerError";
 import { InstructionBase, SetInstruction } from "../instructions";
 import { IInstruction, Location, TLiteral, es } from "../types";
-import { nullId } from "../utils";
 import { LiteralValue } from "../values";
 import { Block, TEdge } from "./block";
 import { GlobalId, ImmutableId } from "./id";
diff --git a/compiler/src/values/FunctionValue.ts b/compiler/src/values/FunctionValue.ts
@@ -6,7 +6,6 @@ import {
   nodeName,
   pipeInsts,
 } from "../utils";
-import { Compiler } from "../Compiler";
 import { CompilerError } from "../CompilerError";
 import {
   AddressResolver,
@@ -34,6 +33,8 @@ import {
   DestructuringValue,
   TDestructuringMembers,
 } from "./DestructuringValue";
+import { ICompilerContext } from "../CompilerContext";
+import { ImmutableId } from "../flow";
 
 export type TFunctionValueInitParams = (childScope: IScope) => {
   paramStores: StoreValue[];
@@ -67,7 +68,7 @@ export class FunctionValue extends VoidValue implements IFunctionValue {
   private inline!: boolean;
   private tryingInline!: boolean;
   private body: es.BlockStatement;
-  private c: Compiler;
+  private c: ICompilerContext;
   private callSize!: number;
   private inlineTemp!: IValue;
   private inlineEnd?: LiteralValue<number | null>;
@@ -80,11 +81,13 @@ export class FunctionValue extends VoidValue implements IFunctionValue {
     body,
     c,
     out,
+    id,
   }: {
     scope: IScope;
     body: es.BlockStatement;
-    c: Compiler;
-    params: es.Identifier[];
+    c: ICompilerContext;
+    params: FunctionParam[];
+    id: ImmutableId;
     out?: TEOutput;
   }) {
     super();
