Rename const operands to with const suffix

21 files changed, 78 insertions, 78 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 7d70a90b..71212189 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
@@ -1118,16 +1118,16 @@ public class PatioToLlvm {
         PatioToLlvmFunctionContext context
     ) {
         return switch (patioOperand) {
-            case PatioBool patioBool ->
+            case PatioBoolConst patioBoolConst ->
                 LlvmTypes.INT_1;
 
-            case PatioDataPtr patioDataPtr ->
+            case PatioDataPtrConst patioDataPtrConst ->
                 LlvmTypes.pointer(LlvmTypes.VOID);
 
-            case PatioFunctionPtr patioFunctionPtr ->
+            case PatioFunctionPtrConst patioFunctionPtrConst ->
                 LlvmTypes.pointer(LlvmTypes.VOID);
 
-            case PatioInt patioInt ->
+            case PatioIntConst patioIntConst ->
                 context.target().patioIntType();
 
             case PatioLocalRef patioLocalRef ->
@@ -1140,17 +1140,17 @@ public class PatioToLlvm {
         PatioToLlvmFunctionContext context
     ) {
         return switch (patioOperand) {
-            case PatioBool patioBool ->
-                new LlvmOperandInt(patioBool.value() ? 1 : 0);
+            case PatioBoolConst patioBoolConst ->
+                new LlvmOperandInt(patioBoolConst.value() ? 1 : 0);
 
-            case PatioDataPtr patioDataPtr ->
-                new LlvmVariableGlobal(patioDataPtr.name());
+            case PatioDataPtrConst patioDataPtrConst ->
+                new LlvmVariableGlobal(patioDataPtrConst.name());
 
-            case PatioFunctionPtr patioFunctionPtr ->
-                new LlvmVariableGlobal(patioFunctionPtr.name());
+            case PatioFunctionPtrConst patioFunctionPtrConst ->
+                new LlvmVariableGlobal(patioFunctionPtrConst.name());
 
-            case PatioInt patioInt ->
-                new LlvmOperandInt(patioInt.value());
+            case PatioIntConst patioIntConst ->
+                new LlvmOperandInt(patioIntConst.value());
 
             case PatioLocalRef patioLocalRef ->
                 context.patioLocalToOperand(patioLocalRef);
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 fcf55e79..66519767 100644
--- a/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
+++ b/src/main/java/org/shedlang/compiler/backends/wasm/PatioToWasm.java
@@ -554,19 +554,19 @@ public class PatioToWasm {
         Context context
     ) {
         return switch (patioOperand) {
-            case PatioBool patioBool ->
-                context.addInstruction(new WasmI32Const(patioBool.value() ? 1 : 0));
+            case PatioBoolConst patioBoolConst ->
+                context.addInstruction(new WasmI32Const(patioBoolConst.value() ? 1 : 0));
 
-            case PatioDataPtr patioDataPtr -> {
-                var wasmMemoryAddress = new WasmMemoryAddress(patioDataPtr.name());
+            case PatioDataPtrConst patioDataPtrConst -> {
+                var wasmMemoryAddress = new WasmMemoryAddress(patioDataPtrConst.name());
                 yield context.addInstruction(new WasmMemoryAddressConst(
                     context.target.indexType(),
                     wasmMemoryAddress
                 ));
             }
 
-            case PatioFunctionPtr patioFunctionPtr -> {
-                var wasmFuncName = new WasmFuncName(patioFunctionPtr.name());
+            case PatioFunctionPtrConst patioFunctionPtrConst -> {
+                var wasmFuncName = new WasmFuncName(patioFunctionPtrConst.name());
                 context = context
                     .addInstruction(new WasmTableElementIndexConst(wasmFuncName));
 
@@ -577,10 +577,10 @@ public class PatioToWasm {
                 yield context;
             }
 
-            case PatioInt patioInt ->
+            case PatioIntConst patioIntConst ->
                 context.addInstruction(wasmIntConst(
                     context.target.patioIntType(),
-                    patioInt.value()
+                    patioIntConst.value()
                 ));
 
             case PatioLocalRef patioLocalRef -> {
@@ -752,13 +752,13 @@ public class PatioToWasm {
     ) {
         // TODO: push into PatioOperand?
         return switch (operand) {
-            case PatioBool patioBool ->
+            case PatioBoolConst patioBoolConst ->
                 patioTypeToWasmValueType(PatioTypes.BOOL, context.target);
-            case PatioDataPtr patioDataPtr ->
+            case PatioDataPtrConst patioDataPtrConst ->
                 patioTypeToWasmValueType(PatioTypes.DATA_POINTER, context.target);
-            case PatioFunctionPtr patioFunctionPtr ->
+            case PatioFunctionPtrConst patioFunctionPtrConst ->
                 patioTypeToWasmValueType(PatioTypes.FUNCTION_POINTER, context.target);
-            case PatioInt patioInt ->
+            case PatioIntConst patioIntConst ->
                 patioTypeToWasmValueType(PatioTypes.INT, context.target);
             case PatioLocalRef patioLocalRef ->
                 context.wasmLocalType(patioLocalRef);
diff --git a/src/main/java/org/shedlang/compiler/patio/PatioSerializer.java b/src/main/java/org/shedlang/compiler/patio/PatioSerializer.java
index 3203993b..c770cd21 100644
--- a/src/main/java/org/shedlang/compiler/patio/PatioSerializer.java
+++ b/src/main/java/org/shedlang/compiler/patio/PatioSerializer.java
@@ -421,17 +421,17 @@ public class PatioSerializer {
 
     private static Tree operandToTree(PatioOperand operand) {
         return switch (operand) {
-            case PatioBool bool ->
-                treeList(treeIdentifier("bool"), treeBool(bool.value()));
+            case PatioBoolConst bool ->
+                treeList(treeIdentifier("bool-const"), treeBool(bool.value()));
 
-            case PatioDataPtr dataPtr ->
-                treeList(treeIdentifier("data-ptr"), treeString(dataPtr.name()));
+            case PatioDataPtrConst dataPtr ->
+                treeList(treeIdentifier("data-ptr-const"), treeString(dataPtr.name()));
 
-            case PatioFunctionPtr functionPtr ->
-                treeList(treeIdentifier("function-ptr"), treeString(functionPtr.name()));
+            case PatioFunctionPtrConst functionPtr ->
+                treeList(treeIdentifier("function-ptr-const"), treeString(functionPtr.name()));
 
-            case PatioInt int_ ->
-                treeList(treeIdentifier("int"), treeInt(int_.value()));
+            case PatioIntConst int_ ->
+                treeList(treeIdentifier("int-const"), treeInt(int_.value()));
 
             case PatioLocalRef localRef ->
                 treeList(treeIdentifier("local"), treeString(localRef.name()));
diff --git a/src/main/java/org/shedlang/compiler/patio/operands/PatioBool.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioBool.java
deleted file mode 100644
index 769667c1..00000000
--- a/src/main/java/org/shedlang/compiler/patio/operands/PatioBool.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.shedlang.compiler.patio.operands;
-
-public record PatioBool(boolean value) implements PatioOperand {
-}
diff --git a/src/main/java/org/shedlang/compiler/patio/operands/PatioBoolConst.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioBoolConst.java
new file mode 100644
index 00000000..eadb7e1c
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioBoolConst.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.patio.operands;
+
+public record PatioBoolConst(boolean value) implements PatioOperand {
+}
diff --git a/src/main/java/org/shedlang/compiler/patio/operands/PatioDataPtr.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioDataPtr.java
deleted file mode 100644
index 9907733b..00000000
--- a/src/main/java/org/shedlang/compiler/patio/operands/PatioDataPtr.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.shedlang.compiler.patio.operands;
-
-public record PatioDataPtr(String name) implements PatioOperand {
-}
diff --git a/src/main/java/org/shedlang/compiler/patio/operands/PatioDataPtrConst.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioDataPtrConst.java
new file mode 100644
index 00000000..3899b380
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioDataPtrConst.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.patio.operands;
+
+public record PatioDataPtrConst(String name) implements PatioOperand {
+}
diff --git a/src/main/java/org/shedlang/compiler/patio/operands/PatioFunctionPtr.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioFunctionPtr.java
deleted file mode 100644
index b025089e..00000000
--- a/src/main/java/org/shedlang/compiler/patio/operands/PatioFunctionPtr.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.shedlang.compiler.patio.operands;
-
-public record PatioFunctionPtr(String name) implements PatioOperand {
-}
diff --git a/src/main/java/org/shedlang/compiler/patio/operands/PatioFunctionPtrConst.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioFunctionPtrConst.java
new file mode 100644
index 00000000..2457163f
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioFunctionPtrConst.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.patio.operands;
+
+public record PatioFunctionPtrConst(String name) implements PatioOperand {
+}
diff --git a/src/main/java/org/shedlang/compiler/patio/operands/PatioInt.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioInt.java
deleted file mode 100644
index 4191def2..00000000
--- a/src/main/java/org/shedlang/compiler/patio/operands/PatioInt.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.shedlang.compiler.patio.operands;
-
-public record PatioInt(int value) implements PatioOperand {
-}
diff --git a/src/main/java/org/shedlang/compiler/patio/operands/PatioIntConst.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioIntConst.java
new file mode 100644
index 00000000..d7734096
--- /dev/null
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioIntConst.java
@@ -0,0 +1,4 @@
+package org.shedlang.compiler.patio.operands;
+
+public record PatioIntConst(int value) implements PatioOperand {
+}
diff --git a/src/main/java/org/shedlang/compiler/patio/operands/PatioOperand.java b/src/main/java/org/shedlang/compiler/patio/operands/PatioOperand.java
index 3bd1849c..17ffb0e4 100644
--- a/src/main/java/org/shedlang/compiler/patio/operands/PatioOperand.java
+++ b/src/main/java/org/shedlang/compiler/patio/operands/PatioOperand.java
@@ -1,5 +1,5 @@
 package org.shedlang.compiler.patio.operands;
 
-public sealed interface PatioOperand permits PatioBool, PatioDataPtr, PatioFunctionPtr, PatioInt, PatioLocalRef {
+public sealed interface PatioOperand permits PatioBoolConst, PatioDataPtrConst, PatioFunctionPtrConst, PatioIntConst, PatioLocalRef {
 
 }
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java
index 66d9c3be..438ebac3 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatio.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.shidtopatio;
 import org.shedlang.compiler.patio.PatioCompilationUnit;
 import org.shedlang.compiler.patio.PatioVisibility;
 import org.shedlang.compiler.patio.instructions.*;
-import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioIntConst;
 import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.patio.types.PatioTypes;
@@ -1008,7 +1008,7 @@ public class ShidToPatio {
         context = localResult.context();
 
         return context
-            .addInstruction(new PatioLocalStore(local, new PatioInt(value), source))
+            .addInstruction(new PatioLocalStore(local, new PatioIntConst(value), source))
             .temporaryPush(local);
     }
 }
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioClosures.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioClosures.java
index 43b19744..b1d40a87 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioClosures.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioClosures.java
@@ -4,7 +4,7 @@ import org.shedlang.compiler.ast.typed.FreeVariable;
 import org.shedlang.compiler.ast.typed.FreeVariables;
 import org.shedlang.compiler.patio.PatioVisibility;
 import org.shedlang.compiler.patio.instructions.*;
-import org.shedlang.compiler.patio.operands.PatioFunctionPtr;
+import org.shedlang.compiler.patio.operands.PatioFunctionPtrConst;
 import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.patio.types.PatioDataLayout;
@@ -176,7 +176,7 @@ class ShidToPatioClosures {
             closurePointer,
             layout,
             FUNCTION_POINTER_OFFSET,
-            new PatioFunctionPtr(functionName),
+            new PatioFunctionPtrConst(functionName),
             source
         ));
 
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffects.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffects.java
index fb113850..51f198e3 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffects.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioEffects.java
@@ -5,7 +5,7 @@ import org.shedlang.compiler.patio.PatioExceptionTypeDefinition;
 import org.shedlang.compiler.patio.PatioFunctionDeclaration;
 import org.shedlang.compiler.patio.PatioLocal;
 import org.shedlang.compiler.patio.instructions.*;
-import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioIntConst;
 import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.patio.types.PatioDataLayout;
@@ -187,8 +187,8 @@ public class ShidToPatioEffects {
                         Optional.of(handlerMethod),
                         FIND_HANDLER_METHOD_DECLARATION.name(),
                         List.of(
-                            new PatioInt(bodyContext.effectTag(effect)),
-                            new PatioInt(method.fieldIndex())
+                            new PatioIntConst(bodyContext.effectTag(effect)),
+                            new PatioIntConst(method.fieldIndex())
                         ),
                         source
                     ));
@@ -307,8 +307,8 @@ public class ShidToPatioEffects {
             Optional.of(effectHandler),
             PUSH_HANDLER_DECLARATION.name(),
             List.of(
-                new PatioInt(context.effectTag(effect)),
-                new PatioInt(effectInfo.methodCount())
+                new PatioIntConst(context.effectTag(effect)),
+                new PatioIntConst(effectInfo.methodCount())
             ),
             source
         ));
@@ -319,7 +319,7 @@ public class ShidToPatioEffects {
                 SET_HANDLER_METHOD_DECLARATION.name(),
                 List.of(
                     effectHandler,
-                    new PatioInt(handlerMethodInfo.fieldIndex()),
+                    new PatioIntConst(handlerMethodInfo.fieldIndex()),
                     handlerMethodsByName.get(handlerMethodInfo.name())
                 ),
                 source
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioGc.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioGc.java
index 8dd36463..32971b8b 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioGc.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioGc.java
@@ -5,7 +5,7 @@ import org.shedlang.compiler.patio.PatioLocal;
 import org.shedlang.compiler.patio.instructions.PatioByteOffsetOf;
 import org.shedlang.compiler.patio.instructions.PatioByteSizeOf;
 import org.shedlang.compiler.patio.instructions.PatioCall;
-import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioIntConst;
 import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.patio.types.*;
@@ -164,7 +164,7 @@ public class ShidToPatioGc {
         return context.addInstruction(new PatioCall(
             Optional.of(destination),
             ALLOC.name(),
-            List.of(size, offset, new PatioInt(childrenCount)),
+            List.of(size, offset, new PatioIntConst(childrenCount)),
             source
         ));
     }
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioInts.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioInts.java
index 77dada45..fee88bec 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioInts.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioInts.java
@@ -3,7 +3,7 @@ package org.shedlang.compiler.shidtopatio;
 import org.shedlang.compiler.patio.PatioFunctionDeclaration;
 import org.shedlang.compiler.patio.PatioLocal;
 import org.shedlang.compiler.patio.instructions.PatioCall;
-import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioIntConst;
 import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.patio.types.PatioType;
@@ -81,7 +81,7 @@ public class ShidToPatioInts {
             .addInstruction(new PatioCall(
                 Optional.of(destination),
                 INT_CREATE_DECLARATION.name(),
-                List.of(new PatioInt(value.intValueExact())),
+                List.of(new PatioIntConst(value.intValueExact())),
                 source
             ));
     }
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java
index c12a25bb..913bb966 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioNamespaces.java
@@ -3,8 +3,8 @@ package org.shedlang.compiler.shidtopatio;
 import org.shedlang.compiler.patio.PatioFunctionDeclaration;
 import org.shedlang.compiler.patio.PatioVisibility;
 import org.shedlang.compiler.patio.instructions.*;
-import org.shedlang.compiler.patio.operands.PatioBool;
-import org.shedlang.compiler.patio.operands.PatioDataPtr;
+import org.shedlang.compiler.patio.operands.PatioBoolConst;
+import org.shedlang.compiler.patio.operands.PatioDataPtrConst;
 import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.patio.types.*;
@@ -66,7 +66,7 @@ public class ShidToPatioNamespaces {
                 );
 
                 initContext = initContext.addInstruction(new PatioMemoryStore(
-                    new PatioDataPtr(globalNameNamespaceValue(namespaceName)),
+                    new PatioDataPtrConst(globalNameNamespaceValue(namespaceName)),
                     PatioDataLayouts.DATA_POINTER,
                     List.of(),
                     namespaceValue,
@@ -76,10 +76,10 @@ public class ShidToPatioNamespaces {
                 initContext = generateInitBody.apply(initContext);
 
                 initContext = initContext.addInstruction(new PatioMemoryStore(
-                    new PatioDataPtr(globalNameNamespaceIsInited(namespaceName)),
+                    new PatioDataPtrConst(globalNameNamespaceIsInited(namespaceName)),
                     PatioDataLayouts.BOOL,
                     List.of(),
-                    new PatioBool(true),
+                    new PatioBoolConst(true),
                     source
                 ));
 
@@ -104,7 +104,7 @@ public class ShidToPatioNamespaces {
 
                 importContext = importContext.addInstruction(new PatioMemoryLoad(
                     isInited,
-                    new PatioDataPtr(globalNameNamespaceIsInited(namespaceName)),
+                    new PatioDataPtrConst(globalNameNamespaceIsInited(namespaceName)),
                     PatioDataLayouts.BOOL,
                     List.of(),
                     source
@@ -142,7 +142,7 @@ public class ShidToPatioNamespaces {
 
                 importContext = importContext.addInstruction(new PatioMemoryLoad(
                     namespaceValuePointer,
-                    new PatioDataPtr(globalNameNamespaceValue(namespaceName)),
+                    new PatioDataPtrConst(globalNameNamespaceValue(namespaceName)),
                     PatioDataLayouts.DATA_POINTER,
                     List.of(),
                     source
@@ -251,7 +251,7 @@ public class ShidToPatioNamespaces {
 
         context = context.addInstruction(new PatioMemoryLoad(
             namespaceValue,
-            new PatioDataPtr(globalNameNamespaceValue(namespaceName)),
+            new PatioDataPtrConst(globalNameNamespaceValue(namespaceName)),
             PatioDataLayouts.DATA_POINTER,
             List.of(),
             source
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java
index af037ae6..a1c7d9bf 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStrings.java
@@ -4,7 +4,7 @@ import org.shedlang.compiler.patio.PatioDataElementImmutable;
 import org.shedlang.compiler.patio.PatioFunctionDeclaration;
 import org.shedlang.compiler.patio.PatioLocal;
 import org.shedlang.compiler.patio.instructions.PatioCall;
-import org.shedlang.compiler.patio.operands.PatioDataPtr;
+import org.shedlang.compiler.patio.operands.PatioDataPtrConst;
 import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.patio.types.PatioDataLayouts;
@@ -31,7 +31,7 @@ public class ShidToPatioStrings {
 
     private ShidToPatioStrings() {}
 
-    public static ShidToPatioResult<PatioDataPtr> define(
+    public static ShidToPatioResult<PatioDataPtrConst> define(
         String value,
         Source source,
         ShidToPatioContext context
@@ -60,7 +60,7 @@ public class ShidToPatioStrings {
             source
         ));
 
-        return context.toResult(new PatioDataPtr(elementName));
+        return context.toResult(new PatioDataPtrConst(elementName));
     }
 
     public static ShidToPatioContext add(
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStructs.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStructs.java
index 7146320d..0e36f05c 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStructs.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioStructs.java
@@ -2,7 +2,7 @@ package org.shedlang.compiler.shidtopatio;
 
 import org.shedlang.compiler.ast.typed.FreeVariables;
 import org.shedlang.compiler.patio.instructions.*;
-import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioIntConst;
 import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.patio.types.PatioDataLayout;
@@ -59,7 +59,7 @@ public class ShidToPatioStructs {
                         valuePointer,
                         structDataLayout,
                         TAG_OFFSET,
-                        new PatioInt(context.structTag(type)),
+                        new PatioIntConst(context.structTag(type)),
                         source
                     ));
 
diff --git a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTuples.java b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTuples.java
index acf24c08..e86bc366 100644
--- a/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTuples.java
+++ b/src/main/java/org/shedlang/compiler/shidtopatio/ShidToPatioTuples.java
@@ -1,7 +1,7 @@
 package org.shedlang.compiler.shidtopatio;
 
 import org.shedlang.compiler.patio.instructions.*;
-import org.shedlang.compiler.patio.operands.PatioInt;
+import org.shedlang.compiler.patio.operands.PatioIntConst;
 import org.shedlang.compiler.patio.operands.PatioLocalRef;
 import org.shedlang.compiler.patio.operands.PatioOperand;
 import org.shedlang.compiler.patio.types.PatioDataLayout;
@@ -31,7 +31,7 @@ public class ShidToPatioTuples {
         if (elements.size() == 0) {
             context = context.addInstruction(new PatioLocalStore(
                 tuple,
-                new PatioInt(0),
+                new PatioIntConst(0),
                 source
             ));