diff options
Diffstat (limited to 'src/main/java/org')
5 files changed, 23 insertions, 5 deletions
diff --git a/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java b/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java index 358b4a8..c284d1f 100644 --- a/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java +++ b/src/main/java/org/zwobble/couscous/ast/MethodCallNode.java @@ -90,7 +90,7 @@ public class MethodCallNode implements ExpressionNode { public ExpressionNode transform(NodeTransformer transformer) { return new MethodCallNode( transformer.transformReceiver(receiver), - methodName, + transformer.transformMethodName(signature()), transformer.transformExpressions(arguments), transformer.transform(type)); } diff --git a/src/main/java/org/zwobble/couscous/ast/MethodNode.java b/src/main/java/org/zwobble/couscous/ast/MethodNode.java index b5dfd39..e0b2432 100644 --- a/src/main/java/org/zwobble/couscous/ast/MethodNode.java +++ b/src/main/java/org/zwobble/couscous/ast/MethodNode.java @@ -156,7 +156,7 @@ public class MethodNode implements CallableNode { return new MethodNode( transformer.transformAnnotations(annotations), isStatic, - name, + transformer.transformMethodName(signature()), transformer.transformFormalArguments(arguments), transformer.transform(returnType), transformer.transformStatements(body)); 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 683b3b9..277813c 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/NodeTransformer.java @@ -150,6 +150,7 @@ public class NodeTransformer { public static class Builder { private Function<ExpressionNode, Optional<ExpressionNode>> transformExpression = expression -> Optional.empty(); private Function<TypeName, TypeName> transformType = type -> type; + private Function<MethodSignature, String> transformMethodName = MethodSignature::getName; public Builder transformExpression( Function<ExpressionNode, Optional<ExpressionNode>> transformExpression) @@ -165,26 +166,38 @@ public class NodeTransformer { return this; } + public Builder transformMethodName(Function<MethodSignature, String> transformMethodName) { + this.transformMethodName = transformMethodName; + return this; + } + public NodeTransformer build() { - return new NodeTransformer(transformExpression, transformType); + return new NodeTransformer(transformExpression, transformType, transformMethodName); } } private final Function<ExpressionNode, Optional<ExpressionNode>> transformExpression; private final Function<TypeName, TypeName> transformType; + private final Function<MethodSignature, String> transformMethodName; private NodeTransformer( Function<ExpressionNode, Optional<ExpressionNode>> transformExpression, - Function<TypeName, TypeName> transformType) + Function<TypeName, TypeName> transformType, + Function<MethodSignature, String> transformMethodName) { this.transformExpression = transformExpression; this.transformType = transformType; + this.transformMethodName = transformMethodName; } public TypeName transform(TypeName type) { return transformType.apply(type); } + public String transformMethodName(MethodSignature signature) { + return transformMethodName.apply(signature); + } + public ExpressionNode transformExpression(ExpressionNode expression) { return transformExpression.apply(expression) .orElseGet(() -> expression.transform(this)); diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java index 2ba7470..a0db521 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java @@ -3,6 +3,7 @@ package org.zwobble.couscous.backends.csharp; import com.google.common.collect.ImmutableMap; import org.zwobble.couscous.ast.*; import org.zwobble.couscous.ast.visitors.NodeTransformer; +import org.zwobble.couscous.backends.python.PythonCodeGenerator; import org.zwobble.couscous.values.*; import java.util.Map; @@ -34,6 +35,7 @@ public class CsharpCodeGenerator { return NodeTransformer.builder() .transformType(this::transformType) .transformExpression(this::transformExpression) + .transformMethodName(this::transformMethodName) .build() .transform(node); } @@ -46,6 +48,10 @@ public class CsharpCodeGenerator { } } + private String transformMethodName(MethodSignature signature) { + return PythonCodeGenerator.toName(signature); + } + private Optional<ExpressionNode> transformExpression(ExpressionNode expression) { return tryCast(MethodCallNode.class, expression) .flatMap(this::transformMethodCall); 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 c45f85f..f3c946f 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java @@ -21,7 +21,6 @@ public class CsharpSerializer implements NodeVisitor { CsharpSerializer serializer = new CsharpSerializer(writer); serializer.write(node); - System.out.println(writer.asString()); return writer.asString(); } |