Clarify name of Patio data element definitions

10 files changed, 42 insertions, 42 deletions

diff --git a/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java b/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java
index d8ef66af..c592287c 100644
--- a/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java
+++ b/src/main/java/org/shedlang/compiler/backends/llvm/codegen/PatioToLlvm.java
@@ -121,9 +121,9 @@ public class PatioToLlvm {
 
         for (var patioCompilationUnitElement : patioCompilationUnit.elements()) {
             switch (patioCompilationUnitElement) {
-                case PatioDataElementImmutable patioDataElementImmutable -> {
+                case PatioDataElementImmutableDefinition patioDataElementImmutableDefinition -> {
                 }
-                case PatioDataElementMutable patioDataElementMutable -> {
+                case PatioDataElementMutableDefinition patioDataElementMutableDefinition -> {
                 }
                 case PatioFunctionDeclaration patioFunctionDeclaration -> {
                     context = context.addFunctionNameToReturnType(
@@ -164,11 +164,11 @@ public class PatioToLlvm {
         PatioToLlvmModuleContext context
     ) {
         return switch (patioCompilationUnitElement) {
-            case PatioDataElementImmutable patioDataElementImmutable ->
-                generateDataElementImmutable(patioDataElementImmutable, context);
+            case PatioDataElementImmutableDefinition patioDataElementImmutableDefinition ->
+                generateDataElementImmutableDefinition(patioDataElementImmutableDefinition, context);
 
-            case PatioDataElementMutable patioDataElementMutable ->
-                generateDataElementMutable(patioDataElementMutable, context);
+            case PatioDataElementMutableDefinition patioDataElementMutableDefinition ->
+                generateDataElementMutableDefinition(patioDataElementMutableDefinition, context);
 
             case PatioExceptionTypeDefinition patioExceptionTypeDefinition ->
                 context;
@@ -181,42 +181,42 @@ public class PatioToLlvm {
         };
     }
 
-    private static PatioToLlvmModuleContext generateDataElementImmutable(
-        PatioDataElementImmutable patioDataElementImmutable,
+    private static PatioToLlvmModuleContext generateDataElementImmutableDefinition(
+        PatioDataElementImmutableDefinition patioDataElementImmutableDefinition,
         PatioToLlvmModuleContext context
     ) {
         return context.addTopLevelEntity(new LlvmGlobalDefinition(
-            patioDataElementImmutable.name(),
+            patioDataElementImmutableDefinition.name(),
             patioDataLayoutToLlvmType(
-                patioDataElementImmutable.value().layout(),
+                patioDataElementImmutableDefinition.value().layout(),
                 context.target()
             ),
             Optional.of(patioDataValueToLlvmOperand(
-                patioDataElementImmutable.value(),
+                patioDataElementImmutableDefinition.value(),
                 context.target()
             )),
             true,
-            patioDataElementImmutable.visibility().isPrivate(),
+            patioDataElementImmutableDefinition.visibility().isPrivate(),
             true
         ));
     }
 
-    private static PatioToLlvmModuleContext generateDataElementMutable(
-        PatioDataElementMutable patioDataElementMutable,
+    private static PatioToLlvmModuleContext generateDataElementMutableDefinition(
+        PatioDataElementMutableDefinition patioDataElementMutableDefinition,
         PatioToLlvmModuleContext context
     ) {
         return context.addTopLevelEntity(new LlvmGlobalDefinition(
-            patioDataElementMutable.name(),
+            patioDataElementMutableDefinition.name(),
             patioDataLayoutToLlvmType(
-                patioDataElementMutable.initialValue().layout(),
+                patioDataElementMutableDefinition.initialValue().layout(),
                 context.target()
             ),
             Optional.of(patioDataValueToLlvmOperand(
-                patioDataElementMutable.initialValue(),
+                patioDataElementMutableDefinition.initialValue(),
                 context.target()
             )),
             false,
-            patioDataElementMutable.visibility().isPrivate(),
+            patioDataElementMutableDefinition.visibility().isPrivate(),
             true
         ));
     }
diff --git a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
index 6d9bf4da..6cbe0491 100644
--- a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
+++ b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
@@ -42,17 +42,17 @@ public class PatioToWasm {
 
         for (var patioCompilationUnitElement : patioCompilationUnit.elements()) {
             switch (patioCompilationUnitElement) {
-                case PatioDataElementImmutable patioDataElementImmutable -> {
+                case PatioDataElementImmutableDefinition patioDataElementImmutableDefinition -> {
                     wasmMemoryBuilder = wasmMemoryBuilder.add(
-                        patioDataElementImmutable.name(),
-                        patioDataValueToBytes(patioDataElementImmutable.value(), target),
+                        patioDataElementImmutableDefinition.name(),
+                        patioDataValueToBytes(patioDataElementImmutableDefinition.value(), target),
                         WasmAlignment.ALIGN_32_BIT
                     ).memory();
                 }
-                case PatioDataElementMutable patioDataElementMutable -> {
+                case PatioDataElementMutableDefinition patioDataElementMutableDefinition -> {
                     wasmMemoryBuilder = wasmMemoryBuilder.add(
-                        patioDataElementMutable.name(),
-                        patioDataValueToBytes(patioDataElementMutable.initialValue(), target),
+                        patioDataElementMutableDefinition.name(),
+                        patioDataValueToBytes(patioDataElementMutableDefinition.initialValue(), target),
                         WasmAlignment.ALIGN_32_BIT
                     ).memory();
                 }
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioCompilationUnitElement.java b/src/main/java/org/shedlang/compiler/patio/PatioCompilationUnitElement.java
index 791b06d1..7f757a00 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioCompilationUnitElement.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioCompilationUnitElement.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.patio;
 
 import org.shedlang.compiler.sources.Source;
 
-public sealed interface PatioCompilationUnitElement permits PatioDataElementImmutable, PatioDataElementMutable, PatioExceptionTypeDefinition, PatioFunctionDeclaration, PatioFunctionDefinition {
+public sealed interface PatioCompilationUnitElement permits PatioDataElementImmutableDefinition, PatioDataElementMutableDefinition, PatioExceptionTypeDefinition, PatioFunctionDeclaration, PatioFunctionDefinition {
     String name();
     Source source();
 }
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioDataElementImmutable.java b/src/main/java/org/shedlang/compiler/patio/PatioDataElementImmutableDefinition.java
index c2f90725..1598f84e 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioDataElementImmutable.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioDataElementImmutableDefinition.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.patio;
 import org.shedlang.compiler.patio.types.PatioDataValue;
 import org.shedlang.compiler.sources.Source;
 
-public record PatioDataElementImmutable(
+public record PatioDataElementImmutableDefinition(
     String name,
     PatioVisibility visibility,
     PatioDataValue value,
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioDataElementMutable.java b/src/main/java/org/shedlang/compiler/patio/PatioDataElementMutableDefinition.java
index 303b5f81..ac4757ac 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioDataElementMutable.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioDataElementMutableDefinition.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.patio;
 import org.shedlang.compiler.patio.types.PatioDataValue;
 import org.shedlang.compiler.sources.Source;
 
-public record PatioDataElementMutable(
+public record PatioDataElementMutableDefinition(
     String name,
     PatioVisibility visibility,
     PatioDataValue initialValue,
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioSerializer.java b/src/main/java/org/shedlang/compiler/patio/PatioSerializer.java
index 78c23ffd..a67e2df2 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioSerializer.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioSerializer.java
@@ -95,20 +95,20 @@ public class PatioSerializer {
 
     private static Tree compilationUnitElementToTree(PatioCompilationUnitElement element) {
         return switch (element) {
-            case PatioDataElementImmutable dataElementImmutable ->
+            case PatioDataElementImmutableDefinition dataElementImmutableDefinition ->
                 treeList(
                     treeIdentifier("data-immutable"),
-                    treeString(dataElementImmutable.name()),
-                    visibilityToTree(dataElementImmutable.visibility()),
-                    dataValueToTree(dataElementImmutable.value())
+                    treeString(dataElementImmutableDefinition.name()),
+                    visibilityToTree(dataElementImmutableDefinition.visibility()),
+                    dataValueToTree(dataElementImmutableDefinition.value())
                 );
 
-            case PatioDataElementMutable dataElementMutable ->
+            case PatioDataElementMutableDefinition dataElementMutableDefinition ->
                 treeList(
                     treeIdentifier("data-mutable"),
-                    treeString(dataElementMutable.name()),
-                    visibilityToTree(dataElementMutable.visibility()),
-                    dataValueToTree(dataElementMutable.initialValue())
+                    treeString(dataElementMutableDefinition.name()),
+                    visibilityToTree(dataElementMutableDefinition.visibility()),
+                    dataValueToTree(dataElementMutableDefinition.initialValue())
                 );
 
             case PatioExceptionTypeDefinition exceptionTypeDefinition ->
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java
index cd315f86..a27168c4 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java
@@ -1,7 +1,7 @@
 package org.shedlang.compiler.shidtopatio;
 
 import org.shedlang.compiler.patio.PatioCompilationUnit;
-import org.shedlang.compiler.patio.PatioDataElementImmutable;
+import org.shedlang.compiler.patio.PatioDataElementImmutableDefinition;
 import org.shedlang.compiler.patio.PatioVisibility;
 import org.shedlang.compiler.patio.instructions.*;
 import org.shedlang.compiler.patio.operands.PatioIntConst;
@@ -1161,7 +1161,7 @@ public class ShidToPatio {
     ) {
         var runtimeTypeTags = context.runtimeTypeTags();
 
-        context = context.addCompilationUnitElement(new PatioDataElementImmutable(
+        context = context.addCompilationUnitElement(new PatioDataElementImmutableDefinition(
             "shed__rtti",
             PatioVisibility.PUBLIC,
             PatioDataValues.array(
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioContext.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioContext.java
index 3d4662e2..ac8f0094 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioContext.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioContext.java
@@ -611,7 +611,7 @@ public record ShidToPatioContext(
         PatioDataValue initialValue,
         Source source
     ) {
-        var dataElement = new PatioDataElementMutable(
+        var dataElement = new PatioDataElementMutableDefinition(
             name,
             visibility,
             initialValue,
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioMethods.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioMethods.java
index 3edd3d35..96f3a83c 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioMethods.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioMethods.java
@@ -1,6 +1,6 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.PatioDataElementMutable;
+import org.shedlang.compiler.patio.PatioDataElementMutableDefinition;
 import org.shedlang.compiler.patio.PatioVisibility;
 import org.shedlang.compiler.patio.instructions.PatioMemoryLoad;
 import org.shedlang.compiler.patio.instructions.PatioMemoryStore;
@@ -46,7 +46,7 @@ public class ShidToPatioMethods {
         Source source,
         ShidToPatioContext context
     ) {
-        context = context.addCompilationUnitElement(new PatioDataElementMutable(
+        context = context.addCompilationUnitElement(new PatioDataElementMutableDefinition(
             globalNameMethod(type, methodName),
             PatioVisibility.PRIVATE,
             PatioDataValues.int_(0),
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java
index 599d3319..1bf51582 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java
@@ -1,6 +1,6 @@
 package org.shedlang.compiler.shidtopatio;
 
-import org.shedlang.compiler.patio.PatioDataElementImmutable;
+import org.shedlang.compiler.patio.PatioDataElementImmutableDefinition;
 import org.shedlang.compiler.patio.PatioFunctionDeclaration;
 import org.shedlang.compiler.patio.PatioLocal;
 import org.shedlang.compiler.patio.PatioVisibility;
@@ -56,7 +56,7 @@ public class ShidToPatioStrings {
         var elementName = elementNameResult.value();
         context = elementNameResult.context();
 
-        context = context.addCompilationUnitElement(new PatioDataElementImmutable(
+        context = context.addCompilationUnitElement(new PatioDataElementImmutableDefinition(
             elementName,
             PatioVisibility.PRIVATE,
             dataValue,