From 382f7b13a89060bea37c59f07de077bb117b61ec Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 17 Jun 2023 12:27:13 +0100 Subject: Extract record for LLVM closure types --- .../backends/llvm/LlvmCompilerCallTests.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java index 26804c2b..38ac3f35 100644 --- a/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java +++ b/src/test/java/org/shedlang/compiler/backends/llvm/LlvmCompilerCallTests.java @@ -32,12 +32,12 @@ public class LlvmCompilerCallTests { has("target", x -> x.target(), isLlvmVariableLocal("closurePointer__0")), has("sourceType", x -> x.sourceType(), equalTo(LlvmCompilerTypes.VALUE_TYPE)), has("value", x -> x.value(), isLlvmVariableLocal("f")), - has("targetType", x -> x.targetType(), equalTo(LlvmCompilerClosures.typeClosurePointer(Optional.empty()))) + has("targetType", x -> x.targetType(), equalTo(LlvmCompilerClosures.CALLABLE_TYPES.closurePointer())) ), instanceOf( LlvmGetElementPtr.class, has("target", x -> x.target(), isLlvmVariableLocal("closureFunctionPointerPointer__0")), - has("pointerType", x -> x.pointerType(), equalTo(LlvmCompilerClosures.typeClosurePointer(Optional.empty()))), + has("pointerType", x -> x.pointerType(), equalTo(LlvmCompilerClosures.CALLABLE_TYPES.closurePointer())), has("pointer", x -> x.pointer(), isLlvmVariableLocal("closurePointer__0")), has("indexes", x -> x.indexes(), isSequence( isLlvmTypedOperand(LlvmTypes.INT_64, isLlvmOperandInt(0)), @@ -47,13 +47,13 @@ public class LlvmCompilerCallTests { instanceOf( LlvmLoad.class, has("target", x -> x.target(), isLlvmVariableLocal("closureFunctionPointer__0")), - has("type", x -> x.type(), equalTo(LlvmCompilerClosures.typeClosureFunctionPointer(Optional.empty()))), + has("type", x -> x.type(), equalTo(LlvmCompilerClosures.CALLABLE_TYPES.closureFunctionPointer())), has("pointer", x -> x.pointer(), isLlvmVariableLocal("closureFunctionPointerPointer__0")) ), instanceOf( LlvmGetElementPtr.class, has("target", x -> x.target(), isLlvmVariableLocal("closureEnvironmentPointer__0")), - has("pointerType", x -> x.pointerType(), equalTo(LlvmCompilerClosures.typeClosurePointer(Optional.empty()))), + has("pointerType", x -> x.pointerType(), equalTo(LlvmCompilerClosures.CALLABLE_TYPES.closurePointer())), has("pointer", x -> x.pointer(), isLlvmVariableLocal("closurePointer__0")), has("indexes", x -> x.indexes(), isSequence( isLlvmTypedOperand(LlvmTypes.INT_64, isLlvmOperandInt(0)), @@ -67,7 +67,7 @@ public class LlvmCompilerCallTests { has("functionPointer", x -> x.functionPointer(), isLlvmVariableLocal("closureFunctionPointer__0")), has("args", x -> x.args(), isSequence( isLlvmTypedOperand( - LlvmCompilerClosures.typeClosureEnvironmentPointer(Optional.empty()), + LlvmCompilerClosures.CALLABLE_TYPES.closureEnvironmentPointer(), isLlvmVariableLocal("closureEnvironmentPointer__0") ) )) @@ -98,12 +98,12 @@ public class LlvmCompilerCallTests { has("target", x -> x.target(), isLlvmVariableLocal("closurePointer__0")), has("sourceType", x -> x.sourceType(), equalTo(LlvmCompilerTypes.VALUE_TYPE)), has("value", x -> x.value(), isLlvmVariableLocal("f")), - has("targetType", x -> x.targetType(), equalTo(LlvmCompilerClosures.typeClosurePointer(Optional.empty()))) + has("targetType", x -> x.targetType(), equalTo(LlvmCompilerClosures.CALLABLE_TYPES.closurePointer())) ), instanceOf( LlvmGetElementPtr.class, has("target", x -> x.target(), isLlvmVariableLocal("closureFunctionPointerPointer__0")), - has("pointerType", x -> x.pointerType(), equalTo(LlvmCompilerClosures.typeClosurePointer(Optional.empty()))), + has("pointerType", x -> x.pointerType(), equalTo(LlvmCompilerClosures.CALLABLE_TYPES.closurePointer())), has("pointer", x -> x.pointer(), isLlvmVariableLocal("closurePointer__0")), has("indexes", x -> x.indexes(), isSequence( isLlvmTypedOperand(LlvmTypes.INT_64, isLlvmOperandInt(0)), @@ -113,13 +113,13 @@ public class LlvmCompilerCallTests { instanceOf( LlvmLoad.class, has("target", x -> x.target(), isLlvmVariableLocal("closureFunctionPointer__0")), - has("type", x -> x.type(), equalTo(LlvmCompilerClosures.typeClosureFunctionPointer(Optional.empty()))), + has("type", x -> x.type(), equalTo(LlvmCompilerClosures.CALLABLE_TYPES.closureFunctionPointer())), has("pointer", x -> x.pointer(), isLlvmVariableLocal("closureFunctionPointerPointer__0")) ), instanceOf( LlvmGetElementPtr.class, has("target", x -> x.target(), isLlvmVariableLocal("closureEnvironmentPointer__0")), - has("pointerType", x -> x.pointerType(), equalTo(LlvmCompilerClosures.typeClosurePointer(Optional.empty()))), + has("pointerType", x -> x.pointerType(), equalTo(LlvmCompilerClosures.CALLABLE_TYPES.closurePointer())), has("pointer", x -> x.pointer(), isLlvmVariableLocal("closurePointer__0")), has("indexes", x -> x.indexes(), isSequence( isLlvmTypedOperand(LlvmTypes.INT_64, isLlvmOperandInt(0)), @@ -133,7 +133,7 @@ public class LlvmCompilerCallTests { has("functionPointer", x -> x.functionPointer(), isLlvmVariableLocal("closureFunctionPointer__0")), has("args", x -> x.args(), isSequence( isLlvmTypedOperand( - LlvmCompilerClosures.typeClosureEnvironmentPointer(Optional.empty()), + LlvmCompilerClosures.CALLABLE_TYPES.closureEnvironmentPointer(), isLlvmVariableLocal("closureEnvironmentPointer__0") ), isLlvmTypedOperand(LlvmCompilerTypes.VALUE_TYPE, isLlvmVariableLocal("positional1")), -- cgit v1.2.3