diff options
11 files changed, 63 insertions, 9 deletions
diff --git a/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java b/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java index 3147d1d..d81eadb 100644 --- a/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java +++ b/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java @@ -34,7 +34,7 @@ public class FormalTypeParameterNode implements Node { @Override public <T> T accept(NodeMapper<T> visitor) { - throw new UnsupportedOperationException(); + return visitor.visit(this); } @Override diff --git a/src/main/java/org/zwobble/couscous/ast/MethodNode.java b/src/main/java/org/zwobble/couscous/ast/MethodNode.java index 0f91024..1cb3766 100644 --- a/src/main/java/org/zwobble/couscous/ast/MethodNode.java +++ b/src/main/java/org/zwobble/couscous/ast/MethodNode.java @@ -1,9 +1,9 @@ package org.zwobble.couscous.ast; import com.google.common.collect.ImmutableList; -import org.zwobble.couscous.types.Type; import org.zwobble.couscous.ast.visitors.NodeMapper; import org.zwobble.couscous.ast.visitors.NodeTransformer; +import org.zwobble.couscous.types.Type; import org.zwobble.couscous.types.Types; import java.util.List; @@ -11,7 +11,6 @@ import java.util.Optional; import java.util.function.Function; import static org.zwobble.couscous.util.ExtraLists.eagerMap; -import static org.zwobble.couscous.util.ExtraLists.list; public class MethodNode implements Node { public static Builder staticMethod(String name) { @@ -27,6 +26,8 @@ public class MethodNode implements Node { private boolean isStatic = false; private boolean isAbstract = false; private final String name; + private final ImmutableList.Builder<FormalTypeParameterNode> parameters = + ImmutableList.builder(); private final ImmutableList.Builder<FormalArgumentNode> arguments = ImmutableList.builder(); private Type returnType = Types.VOID; @@ -53,6 +54,11 @@ public class MethodNode implements Node { this.isAbstract = true; return this; } + + public Builder typeParameter(FormalTypeParameterNode parameter) { + parameters.add(parameter); + return this; + } public Builder argument(FormalArgumentNode argument) { arguments.add(argument); @@ -84,7 +90,7 @@ public class MethodNode implements Node { annotations.build(), isStatic, name, - list(), + parameters.build(), arguments.build(), returnType, isAbstract ? Optional.empty() : Optional.of(body.build()), diff --git a/src/main/java/org/zwobble/couscous/ast/Node.java b/src/main/java/org/zwobble/couscous/ast/Node.java index 4f21904..89d9b75 100644 --- a/src/main/java/org/zwobble/couscous/ast/Node.java +++ b/src/main/java/org/zwobble/couscous/ast/Node.java @@ -121,6 +121,12 @@ public interface Node { } @Override + public Void visit(FormalTypeParameterNode parameter) { + visitor.visit(parameter); + return null; + } + + @Override public Void visit(FormalArgumentNode formalArgumentNode) { visitor.visit(formalArgumentNode); return null; diff --git a/src/main/java/org/zwobble/couscous/ast/structure/NodeStructure.java b/src/main/java/org/zwobble/couscous/ast/structure/NodeStructure.java index ed5b474..3e19037 100644 --- a/src/main/java/org/zwobble/couscous/ast/structure/NodeStructure.java +++ b/src/main/java/org/zwobble/couscous/ast/structure/NodeStructure.java @@ -137,6 +137,11 @@ public class NodeStructure { } @Override + public Stream<? extends Node> visit(FormalTypeParameterNode parameter) { + return Stream.empty(); + } + + @Override public Stream<? extends Node> visit(FormalArgumentNode formalArgumentNode) { return Stream.empty(); } diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapper.java b/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapper.java index 3596896..8b7cb3b 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapper.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapper.java @@ -25,6 +25,8 @@ public interface NodeMapper<T> { T visit(IfStatementNode ifStatement); T visit(WhileNode whileLoop); + + T visit(FormalTypeParameterNode parameter); T visit(FormalArgumentNode formalArgumentNode); T visit(AnnotationNode annotation); T visit(MethodNode methodNode); diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapperWithDefault.java b/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapperWithDefault.java index b3285ba..6ff3c06 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapperWithDefault.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/NodeMapperWithDefault.java @@ -105,6 +105,11 @@ public class NodeMapperWithDefault<T> implements NodeMapper<T> { } @Override + public T visit(FormalTypeParameterNode parameter) { + return defaultValue; + } + + @Override public T visit(AnnotationNode annotation) { return defaultValue; } diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java b/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java index 6e63059..e86e2ee 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java @@ -126,6 +126,11 @@ public class NodeTransformer { } @Override + public Node visit(FormalTypeParameterNode parameter) { + return transformFormalTypeParameter(parameter); + } + + @Override public Node visit(FormalArgumentNode formalArgumentNode) { return transformFormalArgument(formalArgumentNode); } diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/NodeVisitor.java b/src/main/java/org/zwobble/couscous/ast/visitors/NodeVisitor.java index c70d662..336d016 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/NodeVisitor.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/NodeVisitor.java @@ -25,6 +25,7 @@ public interface NodeVisitor { void visit(IfStatementNode ifStatement); void visit(WhileNode whileLoop); + void visit(FormalTypeParameterNode parameter); void visit(FormalArgumentNode formalArgumentNode); void visit(AnnotationNode annotation); void visit(MethodNode methodNode); 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 13c3756..d93f2df 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java @@ -364,6 +364,11 @@ public class CsharpSerializer implements NodeVisitor { } @Override + public void visit(FormalTypeParameterNode parameter) { + writer.writeIdentifier(parameter.getName()); + } + + @Override public void visit(FormalArgumentNode argument) { writeTypeReference(argument.getType()); writer.writeSpace(); @@ -387,11 +392,20 @@ public class CsharpSerializer implements NodeVisitor { writeTypeReference(method.getReturnType()); writer.writeSpace(); writer.writeIdentifier(method.getName()); + writeFormalTypeParameters(method.getTypeParameters()); writeFormalArguments(method.getArguments()); writeBlock(method.getBody().get()); }); } + private void writeFormalTypeParameters(List<FormalTypeParameterNode> typeParameters) { + if (!typeParameters.isEmpty()) { + writer.writeSymbol("<"); + writer.writeCommaSeparated(typeParameters, this::write); + writer.writeSymbol(">"); + } + } + private void writeFormalArguments(List<FormalArgumentNode> arguments) { writer.writeSymbol("("); writer.writeCommaSeparated(arguments, this::write); 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 52849dc..30b4768 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 @@ -2,6 +2,7 @@ package org.zwobble.couscous.tests.backends.csharp; import org.junit.Test; import org.zwobble.couscous.ast.*; +import org.zwobble.couscous.ast.identifiers.Identifiers; import org.zwobble.couscous.types.ScalarType; import org.zwobble.couscous.backends.csharp.CsharpSerializer; import org.zwobble.couscous.tests.TestIds; @@ -15,6 +16,7 @@ import static org.zwobble.couscous.ast.ConstructorCallNode.constructorCall; import static org.zwobble.couscous.ast.ExpressionStatementNode.expressionStatement; import static org.zwobble.couscous.ast.FieldAccessNode.fieldAccess; import static org.zwobble.couscous.ast.FormalArgumentNode.formalArg; +import static org.zwobble.couscous.ast.FormalTypeParameterNode.formalTypeParameter; import static org.zwobble.couscous.ast.IfStatementNode.ifStatement; import static org.zwobble.couscous.ast.LiteralNode.literal; import static org.zwobble.couscous.ast.LocalVariableDeclarationNode.localVariableDeclaration; @@ -325,6 +327,19 @@ public class CsharpSerializerTests { } @Test + public void methodWithTypeParameters() { + MethodNode methodNode = MethodNode.staticMethod("nothing") + .typeParameter(formalTypeParameter(Identifiers.method(Identifiers.forType("com.Example.example"), "nothing"), "T")) + .typeParameter(formalTypeParameter(Identifiers.method(Identifiers.forType("com.Example.example"), "nothing"), "U")) + .returns(ScalarType.of("void")) + .build(); + + String output = serialize(methodNode); + + assertEquals("public static void nothing<T, U>() {\n}\n", output); + } + + @Test public void classIsInNamespace() { ClassNode classNode = ClassNode.builder("com.example.Example") .build(); diff --git a/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java b/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java index b6a0cb7..a585efd 100644 --- a/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java +++ b/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java @@ -18,11 +18,6 @@ import static org.zwobble.couscous.tests.util.ExtraFiles.deleteRecursively; import static org.zwobble.couscous.util.ExtraLists.list; public class JavaToCsharpTests extends CompilerTests { - @Test - @Ignore("WIP") - public void genericMethods() throws Exception { - } - protected PrimitiveValue execProgram( Path directory, ScalarType type, |