From f495be56b344bf79f45ce1bc55165ae6933e8246 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sun, 28 Jan 2024 19:52:36 +0000 Subject: Name pointer types more consistently --- .../shedlang/compiler/patio/PatioExampleTests.java | 2 +- .../compiler/patio/PatioSerializerTests.java | 26 +++++++++++----------- .../ShidToPatioDefineFunctionTests.java | 4 ++-- .../shidtopatio/ShidToPatioVarLoadTests.java | 2 +- .../shidtopatio/ShidToPatioVarStoreTests.java | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java index d25d5e94..1a646bdd 100644 --- a/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java +++ b/src/test/java/org/shedlang/compiler/patio/PatioExampleTests.java @@ -93,7 +93,7 @@ public abstract class PatioExampleTests { var patioFunction = PatioFunctionDefinition.builder() .withName(FUNCTION_NAME) .withReturnType(PatioTypes.INT) - .addLocal(Patio.val("x", PatioTypes.DATA_POINTER)) + .addLocal(Patio.val("x", PatioTypes.DATA_PTR)) .addLocal(Patio.val("y", PatioTypes.INT)) .addLocal(Patio.val("z", PatioTypes.INT)) .addLocal(Patio.val("r", PatioTypes.INT)) diff --git a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java index cc4751f7..f3c57b96 100644 --- a/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java +++ b/src/test/java/org/shedlang/compiler/patio/PatioSerializerTests.java @@ -86,7 +86,7 @@ public class PatioSerializerTests { var element = PatioFunctionDeclaration.builder() .withName("f") .addParam(Patio.param("param1", PatioTypes.INT)) - .addParam(Patio.param("param2", PatioTypes.DATA_POINTER)) + .addParam(Patio.param("param2", PatioTypes.DATA_PTR)) .withReturnType(PatioTypes.VOID) .build(); @@ -108,8 +108,8 @@ public class PatioSerializerTests { .withName("f") .withVisibility(PatioVisibility.PRIVATE) .addLocal(Patio.param("param1", PatioTypes.INT)) - .addLocal(Patio.param("param2", PatioTypes.DATA_POINTER)) - .addLocal(Patio.val("local1", PatioTypes.FUNCTION_POINTER)) + .addLocal(Patio.param("param2", PatioTypes.DATA_PTR)) + .addLocal(Patio.val("local1", PatioTypes.FUNCTION_PTR)) .addLocal(Patio.val("local2", PatioTypes.INT)) .withReturnType(PatioTypes.VOID) .addBodyInstruction(Patio.localStore(Patio.localRef("local2"), Patio.intConst(2))) @@ -876,8 +876,8 @@ public class PatioSerializerTests { } @Test - public void canSerializeDataPointerType() { - var type = PatioTypes.DATA_POINTER; + public void canSerializeDataPtrType() { + var type = PatioTypes.DATA_PTR; var string = PatioTesting.serializeType(type); @@ -885,8 +885,8 @@ public class PatioSerializerTests { } @Test - public void canSerializeFunctionPointerType() { - var type = PatioTypes.FUNCTION_POINTER; + public void canSerializeFunctionPtrType() { + var type = PatioTypes.FUNCTION_PTR; var string = PatioTesting.serializeType(type); @@ -950,8 +950,8 @@ public class PatioSerializerTests { } @Test - public void canSerializeDataLayoutDataPointer() { - var layout = PatioDataLayouts.DATA_POINTER; + public void canSerializeDataLayoutDataPtr() { + var layout = PatioDataLayouts.DATA_PTR; var string = PatioTesting.serializeDataLayout(layout); @@ -959,8 +959,8 @@ public class PatioSerializerTests { } @Test - public void canSerializeDataLayoutFunctionPointer() { - var layout = PatioDataLayouts.FUNCTION_POINTER; + public void canSerializeDataLayoutFunctionPtr() { + var layout = PatioDataLayouts.FUNCTION_PTR; var string = PatioTesting.serializeDataLayout(layout); @@ -1033,8 +1033,8 @@ public class PatioSerializerTests { } @Test - public void canSerializeDataValueDataPointerNull() { - var value = PatioDataValues.dataPointerNull(); + public void canSerializeDataValueDataPtr() { + var value = PatioDataValues.dataPtrNull(); var string = PatioTesting.serializeDataValue(value); diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineFunctionTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineFunctionTests.java index 2bd24199..c918f782 100644 --- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineFunctionTests.java +++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioDefineFunctionTests.java @@ -112,9 +112,9 @@ public class ShidToPatioDefineFunctionTests { Sources.NULL ); var context = ShidToPatioContext.EMPTY - .declareShidVal("a", PatioTypes.DATA_POINTER).context() + .declareShidVal("a", PatioTypes.DATA_PTR).context() .initShidLocal("a") - .declareShidVal("b", PatioTypes.DATA_POINTER).context() + .declareShidVal("b", PatioTypes.DATA_PTR).context() .initShidLocal("b"); var result = ShidToPatio.generateInstruction(instruction, context); diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarLoadTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarLoadTests.java index 272daa4f..e05323cb 100644 --- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarLoadTests.java +++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarLoadTests.java @@ -17,7 +17,7 @@ public class ShidToPatioVarLoadTests { public void canGenerateCodeForVarLoad(Snapshotter snapshotter) throws IOException { var shid = Shid.varLoad("x"); var context = ShidToPatioContext.EMPTY - .declareShidVal("x", PatioTypes.DATA_POINTER).context(); + .declareShidVal("x", PatioTypes.DATA_PTR).context(); var result = ShidToPatio.generateInstruction(shid, context); diff --git a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarStoreTests.java b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarStoreTests.java index 78e55a5f..2ee3db3b 100644 --- a/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarStoreTests.java +++ b/src/test/java/org/shedlang/compiler/shidtopatio/ShidToPatioVarStoreTests.java @@ -18,7 +18,7 @@ public class ShidToPatioVarStoreTests { public void canGenerateCodeForVarStore(Snapshotter snapshotter) throws IOException { var shid = Shid.varStore("x"); var context = ShidToPatioContext.EMPTY - .declareShidVal("x", PatioTypes.DATA_POINTER).context() + .declareShidVal("x", PatioTypes.DATA_PTR).context() .temporaryPush(new PatioLocalRef("a")) .temporaryPush(new PatioLocalRef("b")); @@ -31,7 +31,7 @@ public class ShidToPatioVarStoreTests { public void canStoreIntoVarMultipleTimes(Snapshotter snapshotter) throws IOException { var shid = Shid.varStore("x"); var context = ShidToPatioContext.EMPTY - .declareShidVal("x", PatioTypes.DATA_POINTER).context() + .declareShidVal("x", PatioTypes.DATA_PTR).context() .temporaryPush(new PatioLocalRef("a")) .temporaryPush(new PatioLocalRef("b")); -- cgit v1.2.3