From f525339cdcab1a44d370ffe619d46bdc2116c3b5 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 22 Jul 2023 11:06:46 +0100 Subject: Add struct as Patio data value --- .../java/org/shedlang/compiler/patio/ast/PatioSerializer.java | 10 ++++++++++ .../org/shedlang/compiler/patio/ast/types/PatioDataValue.java | 2 +- .../compiler/patio/ast/types/PatioDataValueStruct.java | 6 ++++++ .../org/shedlang/compiler/patio/ast/types/PatioDataValues.java | 4 ++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueStruct.java (limited to 'src/main/java') diff --git a/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java b/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java index 3bf96507..0c00ee09 100644 --- a/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java +++ b/src/main/java/org/shedlang/compiler/patio/ast/PatioSerializer.java @@ -340,6 +340,16 @@ public class PatioSerializer { treeIdentifier("int"), treeIdentifier(Integer.toString(int_.value())) ); + + case PatioDataValueStruct struct -> + treeList( + treeIdentifier("struct"), + treeList( + struct.elements().stream() + .map(element -> dataValueToTree(element)) + .toList() + ) + ); }; } diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValue.java b/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValue.java index 4f7a7f14..2c71d9df 100644 --- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValue.java +++ b/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValue.java @@ -1,4 +1,4 @@ package org.shedlang.compiler.patio.ast.types; -public sealed interface PatioDataValue permits PatioDataValueArray, PatioDataValueByte, PatioDataValueInt { +public sealed interface PatioDataValue permits PatioDataValueArray, PatioDataValueByte, PatioDataValueInt, PatioDataValueStruct { } diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueStruct.java b/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueStruct.java new file mode 100644 index 00000000..e8f1a23e --- /dev/null +++ b/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValueStruct.java @@ -0,0 +1,6 @@ +package org.shedlang.compiler.patio.ast.types; + +import java.util.List; + +public record PatioDataValueStruct(List elements) implements PatioDataValue { +} diff --git a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValues.java b/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValues.java index 3eac715a..7c59e95b 100644 --- a/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValues.java +++ b/src/main/java/org/shedlang/compiler/patio/ast/types/PatioDataValues.java @@ -16,4 +16,8 @@ public class PatioDataValues { public static PatioDataValue int_(int value) { return new PatioDataValueInt(value); } + + public static PatioDataValue struct(List elements) { + return new PatioDataValueStruct(elements); + } } -- cgit v1.2.3