Hoist structs

1 files changed, 12 insertions, 1 deletions

diff --git a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
index dc171e00..cca640b4 100644
--- a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
+++ b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
@@ -5,6 +5,7 @@ import org.shedlang.compiler.ShedBuiltins;
 import org.shedlang.compiler.ast.typed.*;
 import org.shedlang.compiler.stackir.instructions.*;
 import org.shedlang.compiler.types.StructType;
+import org.shedlang.compiler.util.Iterables;
 import org.shedlang.compiler.util.P;
 
 import java.util.List;
@@ -337,7 +338,17 @@ public class StackCompiler {
             context = context.addShedVariable(boundVariableName);
         }
 
-        for (var statement : node.body()) {
+        var statementsAfterHoisting = Iterables.sortedBy(node.body(), statement -> switch (statement) {
+            case TypedAssignNode assign ->
+                1;
+
+            case TypedFunctionDefinitionNode functionDefinition ->
+                1;
+
+            case TypedStructDefinitionNode structDefinition ->
+                0;
+        });
+        for (var statement : statementsAfterHoisting) {
             context = compileNamespaceStatement(statement, context);
         }