From 5119013b30cc8f8881dc15352fe8bc69e85dbcc5 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 21 Dec 2023 15:57:51 +0000 Subject: Use proper source when generating Patio code for Shid namespace --- src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java | 1 + .../org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java index 1d35207c..19af1806 100644 --- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java +++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java @@ -108,6 +108,7 @@ public class ShidToPatio { shidNamespace.namespaceName(), initContext -> generateBlockNoResults(shidNamespace.body(), initContext), + shidNamespace.source(), context ); diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java index 7a9cc011..289c34f2 100644 --- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java +++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java @@ -9,7 +9,6 @@ import org.shedlang.compiler.patio.operands.PatioLocalRef; import org.shedlang.compiler.patio.operands.PatioOperand; import org.shedlang.compiler.patio.types.*; import org.shedlang.compiler.sources.Source; -import org.shedlang.compiler.sources.Sources; import org.shedlang.compiler.types.NamespaceName; import org.shedlang.compiler.types.NamespaceTypeInfo; import org.shedlang.compiler.util.Lists; @@ -26,11 +25,9 @@ public class ShidToPatioNamespaces { public static ShidToPatioContext define( NamespaceName namespaceName, Function generateInitBody, + Source source, ShidToPatioContext context ) { - // TODO: proper source. Probably wrap up stack namespace in a data structure with a source? - var source = Sources.NULL; - var namespaceTypeInfo = context.namespaceTypeInfo(namespaceName); var layout = namespaceDataLayout(namespaceTypeInfo); -- cgit v1.2.3