refactor parent and edge fields

mlogjs · JeanJPNM · Jan 5, 2024 · Jan 11, 2024 · Jan 12, 2024 · Jan 12, 2024
commit 6304a3b8ed9ebfcdd15304f20e1b47facaf5da7c
diff --git a/compiler/src/flow/block.ts b/compiler/src/flow/block.ts
@@ -21,11 +21,19 @@ export class Block {
     public endInstruction?: TBlockEndInstruction,
   ) {}
 
+  get forwardParents(): Block[] {
+    return this.parents.filter(parent =>
+      parent.childEdges.some(
+        edge => edge.block === this && edge.type === "forward",
+      ),
+    );
+  }
+
   get children(): Block[] {
-    return this.edges.map(edge => edge.block);
+    return this.childEdges.map(edge => edge.block);
   }
 
-  get edges(): TEdge[] {
+  get childEdges(): TEdge[] {
     if (!this.endInstruction) return [];
     switch (this.endInstruction.type) {
       case "break":

diff --git a/compiler/src/flow/graph.ts b/compiler/src/flow/graph.ts
@@ -156,16 +156,9 @@ export class Graph {
 
     const flatten = (block: Block) => {
       if (visited.has(block)) return;
-      const { parents } = block;
+      const { forwardParents } = block;
 
-      if (
-        !parents
-          .filter(parent => {
-            const edge = parent.edges.find(edge => edge.block === block);
-            return edge?.type === "forward";
-          })
-          .every(parent => visited.has(parent))
-      ) {
+      if (!forwardParents.every(parent => visited.has(parent))) {
         return;
       }
       visited.add(block);
@@ -237,8 +230,8 @@ export class Graph {
       // and because of how break-if is implemented
       // having the alternate branch before the consequent branch
       // reduces the amount of instructions needed
-      for (let i = block.edges.length - 1; i >= 0; i--) {
-        const edge = block.edges[i];
+      for (let i = block.childEdges.length - 1; i >= 0; i--) {
+        const edge = block.childEdges[i];
         if (edge.type === "backward") continue;
         // for (let i = 0; i < block.children.length; i++) {
         flatten(edge.block);
@@ -300,7 +293,7 @@ export class Graph {
 function traverse(block: Block, action: (block: Block) => void) {
   function _traverse(block: Block) {
     action(block);
-    for (const edge of block.edges) {
+    for (const edge of block.childEdges) {
       if (edge.type === "backward") continue;
       _traverse(edge.block);
     }