From 78c3d52bc16fefbe35dbceb778f52618078b0854 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Wed, 14 Jun 2023 18:29:10 +0100
Subject: Use field names on namespace node in StackCompiler

---
 .../org/shedlang/compiler/stackir/StackCompiler.java | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
index 8e66db30..6b8452c1 100644
--- a/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
+++ b/src/main/java/org/shedlang/compiler/stackir/StackCompiler.java
@@ -107,18 +107,14 @@ public class StackCompiler {
             .map(statement -> compileNamespaceStatement(statement))
             .reduce(P.vector(), PVector::plusAll);
 
-        // TODO: handle exports explicitly
-        for (var statement : node.body()) {
-            switch (statement) {
-                case TypedFunctionDefinitionNode functionDefinition ->
-                    instructions = instructions
-                        .plus(new LocalLoadInstruction(functionDefinition.name(), functionDefinition.source()))
-                        .plus(new NamespaceFieldStoreInstruction(
-                            node.namespaceName(),
-                            functionDefinition.name(),
-                            functionDefinition.source()
-                        ));
-            }
+        for (var fieldName : node.fieldNames()) {
+            instructions = instructions
+                .plus(new LocalLoadInstruction(fieldName, node.source()))
+                .plus(new NamespaceFieldStoreInstruction(
+                    node.namespaceName(),
+                    fieldName,
+                    node.source()
+                ));
         }
 
         return instructions;
-- 
cgit v1.2.3