diff options
Diffstat (limited to 'src/main/java')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java b/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java index db14773..282df33 100644 --- a/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java +++ b/src/main/java/org/zwobble/couscous/ast/ClassNodeBuilder.java @@ -38,7 +38,7 @@ public class ClassNodeBuilder { } public ClassNodeBuilder addTypeParameter(String name) { - this.typeParameters.add(formalTypeParameter(TypeName.of(name))); + this.typeParameters.add(formalTypeParameter(name)); return this; } diff --git a/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java b/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java index b2d7408..4582719 100644 --- a/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java +++ b/src/main/java/org/zwobble/couscous/ast/FormalTypeParameterNode.java @@ -4,22 +4,22 @@ import org.zwobble.couscous.ast.visitors.NodeMapper; import org.zwobble.couscous.ast.visitors.NodeTransformer; public class FormalTypeParameterNode implements Node { - public static FormalTypeParameterNode formalTypeParameter(TypeName name) { + public static FormalTypeParameterNode formalTypeParameter(String name) { return new FormalTypeParameterNode(name); } - private final TypeName name; + private final String name; - public FormalTypeParameterNode(TypeName name) { + public FormalTypeParameterNode(String name) { this.name = name; } - public TypeName getName() { + public String getName() { return name; } public FormalTypeParameterNode transform(NodeTransformer transformer) { - return new FormalTypeParameterNode(transformer.transform(name)); + return this; } @Override 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 33187a2..39cd443 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java @@ -353,7 +353,7 @@ public class CsharpSerializer implements NodeVisitor { writer.writeSymbol("<"); writer.writeWithSeparator( node.getTypeParameters(), - parameter -> writeTypeReference(parameter.getName()), + parameter -> writer.writeIdentifier(parameter.getName()), () -> { writer.writeSymbol(","); writer.writeSpace(); diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java index 7f9d528..73cf749 100644 --- a/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java +++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaReader.java @@ -104,7 +104,7 @@ public class JavaReader { private List<FormalTypeParameterNode> readTypeParameters(TypeDeclaration typeDeclaration) { return eagerMap( asList(typeDeclaration.resolveBinding().getTypeParameters()), - parameter -> formalTypeParameter(TypeName.of(parameter.getName()))); + parameter -> formalTypeParameter(parameter.getName())); } GeneratedClosure readExpressionMethodReference(Scope outerScope, ExpressionMethodReference expression) { |