diff options
| author | Michael Williamson <mike@zwobble.org> | 2016-03-31 18:48:20 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2016-03-31 18:48:20 +0100 |
| commit | 4f42453c77772c62bc34c5efc4a410eb125cba77 (patch) | |
| tree | 3a5ffcbcda89bfb4ff2f1db99c3a048d6bd15583 /src/main/java/org/zwobble | |
| parent | 0ca0aaab2e2f38d25d96a9661ee95f33f9054467 (diff) | |
Switch method naming to use simple name of args/return type
Diffstat (limited to 'src/main/java/org/zwobble')
| -rw-r--r-- | src/main/java/org/zwobble/couscous/backends/Names.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/couscous/backends/Naming.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/couscous/backends/SignaturesContainSimpleNames.java (renamed from src/main/java/org/zwobble/couscous/backends/SignaturesContainFullyQualifiedNames.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/org/zwobble/couscous/backends/Names.java b/src/main/java/org/zwobble/couscous/backends/Names.java index d7b3ac2..a9024ac 100644 --- a/src/main/java/org/zwobble/couscous/backends/Names.java +++ b/src/main/java/org/zwobble/couscous/backends/Names.java @@ -20,7 +20,7 @@ public class Names { return argument.accept(new Type.Visitor<String>() { @Override public String visit(ScalarType type) { - return type.getQualifiedName().replace('.', '_'); + return type.getSimpleName(); } @Override diff --git a/src/main/java/org/zwobble/couscous/backends/Naming.java b/src/main/java/org/zwobble/couscous/backends/Naming.java index 1681efd..52be8b8 100644 --- a/src/main/java/org/zwobble/couscous/backends/Naming.java +++ b/src/main/java/org/zwobble/couscous/backends/Naming.java @@ -3,8 +3,8 @@ package org.zwobble.couscous.backends; import org.zwobble.couscous.ast.MethodSignature; public interface Naming { - static Naming signaturesContainsSimpleNames() { - return new SignaturesContainFullyQualifiedNames(); + static Naming signaturesContainSimpleNames() { + return new SignaturesContainSimpleNames(); } String methodName(MethodSignature signature); diff --git a/src/main/java/org/zwobble/couscous/backends/SignaturesContainFullyQualifiedNames.java b/src/main/java/org/zwobble/couscous/backends/SignaturesContainSimpleNames.java index f8b9faf..fec7a88 100644 --- a/src/main/java/org/zwobble/couscous/backends/SignaturesContainFullyQualifiedNames.java +++ b/src/main/java/org/zwobble/couscous/backends/SignaturesContainSimpleNames.java @@ -2,7 +2,7 @@ package org.zwobble.couscous.backends; import org.zwobble.couscous.ast.MethodSignature; -public class SignaturesContainFullyQualifiedNames implements Naming { +public class SignaturesContainSimpleNames implements Naming { @Override public String methodName(MethodSignature signature) { return Names.toUniqueName(signature); 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 5f00f85..c3ef019 100644 --- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java +++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpCodeGenerator.java @@ -29,7 +29,7 @@ public class CsharpCodeGenerator { private final NodeTransformer nodeTransformer; public static Node generateCode(Node node, String namespace) { - return new CsharpCodeGenerator(Naming.signaturesContainsSimpleNames(), namespace).generateCode(node); + return new CsharpCodeGenerator(Naming.signaturesContainSimpleNames(), namespace).generateCode(node); } private CsharpCodeGenerator(Naming naming, String namespace) { |
