From a0e8824a6deff07ccfe76be813e508d9266ac23e Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 9 Apr 2016 15:08:18 +0100 Subject: C# backend: Support generic method definitions --- .../org/zwobble/couscous/ast/FormalTypeParameterNode.java | 2 +- src/main/java/org/zwobble/couscous/ast/MethodNode.java | 12 +++++++++--- src/main/java/org/zwobble/couscous/ast/Node.java | 6 ++++++ .../org/zwobble/couscous/ast/structure/NodeStructure.java | 5 +++++ .../java/org/zwobble/couscous/ast/visitors/NodeMapper.java | 2 ++ .../couscous/ast/visitors/NodeMapperWithDefault.java | 5 +++++ .../org/zwobble/couscous/ast/visitors/NodeTransformer.java | 5 +++++ .../org/zwobble/couscous/ast/visitors/NodeVisitor.java | 1 + .../zwobble/couscous/backends/csharp/CsharpSerializer.java | 14 ++++++++++++++ 9 files changed, 48 insertions(+), 4 deletions(-) (limited to 'src/main/java/org') 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 accept(NodeMapper 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 parameters = + ImmutableList.builder(); private final ImmutableList.Builder 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 @@ -120,6 +120,12 @@ public interface Node { return null; } + @Override + public Void visit(FormalTypeParameterNode parameter) { + visitor.visit(parameter); + return null; + } + @Override public Void visit(FormalArgumentNode formalArgumentNode) { visitor.visit(formalArgumentNode); 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 @@ -136,6 +136,11 @@ public class NodeStructure { whileLoop.getBody().stream()); } + @Override + public Stream visit(FormalTypeParameterNode parameter) { + return Stream.empty(); + } + @Override public Stream 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 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 @@ -104,6 +104,11 @@ public class NodeMapperWithDefault implements NodeMapper { return defaultValue; } + @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 @@ -125,6 +125,11 @@ public class NodeTransformer { return transformStatement(whileLoop); } + @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 @@ -363,6 +363,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()); @@ -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 typeParameters) { + if (!typeParameters.isEmpty()) { + writer.writeSymbol("<"); + writer.writeCommaSeparated(typeParameters, this::write); + writer.writeSymbol(">"); + } + } + private void writeFormalArguments(List arguments) { writer.writeSymbol("("); writer.writeCommaSeparated(arguments, this::write); -- cgit v1.2.3