From 1d3f9768d5db906b4ba6e3c77345e4af4adddcd2 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Thu, 31 Mar 2016 14:51:20 +0100 Subject: Add array serialisation to C# backend --- .../org/zwobble/couscous/backends/SourceCodeWriter.java | 7 +++++++ .../zwobble/couscous/backends/csharp/CsharpSerializer.java | 10 +++++++++- .../tests/backends/csharp/CsharpSerializerTests.java | 13 +++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/org/zwobble/couscous/backends/SourceCodeWriter.java b/src/main/java/org/zwobble/couscous/backends/SourceCodeWriter.java index 3908f72..393cdc2 100644 --- a/src/main/java/org/zwobble/couscous/backends/SourceCodeWriter.java +++ b/src/main/java/org/zwobble/couscous/backends/SourceCodeWriter.java @@ -93,6 +93,13 @@ public class SourceCodeWriter { action.run(this); } + public void writeCommaSeparated(Iterable values, Consumer writeValue) { + writeWithSeparator(values, writeValue, () -> { + writeSymbol(","); + writeSpace(); + }); + } + public void writeWithSeparator(Iterable values, Consumer writeValue, Action separator) { Iterator iterator = values.iterator(); if (iterator.hasNext()) { diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java index e7ac3d7..499121c 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java @@ -88,7 +88,15 @@ public class CsharpSerializer implements NodeVisitor { @Override public void visit(ArrayNode array) { - throw new UnsupportedOperationException(); + writer.writeKeyword("new"); + writer.writeSpace(); + writeTypeReference(array.getElementType()); + writer.writeSymbol("["); + writer.writeSymbol("]"); + writer.writeSpace(); + writer.writeSymbol("{"); + writer.writeCommaSeparated(array.getElements(), this::write); + writer.writeSymbol("}"); } @Override diff --git a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java index 5c1044d..51cbeae 100644 --- a/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java +++ b/src/test/java/org/zwobble/couscous/tests/backends/csharp/CsharpSerializerTests.java @@ -8,6 +8,7 @@ import org.zwobble.couscous.tests.TestIds; import org.zwobble.couscous.types.Types; import static org.junit.Assert.assertEquals; +import static org.zwobble.couscous.ast.ArrayNode.array; import static org.zwobble.couscous.ast.AssignmentNode.assign; import static org.zwobble.couscous.ast.ConstructorCallNode.constructorCall; import static org.zwobble.couscous.ast.ExpressionStatementNode.expressionStatement; @@ -67,6 +68,18 @@ public class CsharpSerializerTests { assertEquals("this", output); } + @Test + public void emptyArraySpecifiesTypeOfArray() { + String output = serialize(array(ScalarType.of("X"), list())); + assertEquals("new X[] {}", output); + } + + @Test + public void arrayElementsAreSeparatedByComma() { + String output = serialize(array(ScalarType.of("X"), list(literal(1), literal(2)))); + assertEquals("new X[] {1, 2}", output); + } + @Test public void assignmentSeparatesTargetAndValueWithEqualsSign() { String output = serialize(assign( -- cgit v1.2.3