aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/zwobble/couscous/backends/Names.java2
-rw-r--r--src/main/java/org/zwobble/couscous/backends/Naming.java4
-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.java2
-rw-r--r--src/main/resources/csharp/runtime/java/lang/Integer.cs4
-rw-r--r--src/main/resources/csharp/runtime/java/lang/Object.cs2
-rw-r--r--src/main/resources/python/runtime/java/lang/Integer.py4
7 files changed, 10 insertions, 10 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) {
diff --git a/src/main/resources/csharp/runtime/java/lang/Integer.cs b/src/main/resources/csharp/runtime/java/lang/Integer.cs
index 8d6174d..e1fcf5b 100644
--- a/src/main/resources/csharp/runtime/java/lang/Integer.cs
+++ b/src/main/resources/csharp/runtime/java/lang/Integer.cs
@@ -1,6 +1,6 @@
namespace Couscous.java.lang {
internal class Integer : Object {
- internal static int valueOf__int__java_lang_Integer(int value) {
+ internal static int valueOf__int__Integer(int value) {
return value;
}
@@ -10,7 +10,7 @@ namespace Couscous.java.lang {
_value = value;
}
- internal override bool equals__java_lang_Object__boolean(Object other) {
+ internal override bool equals__Object__boolean(Object other) {
var integer = other as Integer;
return integer != null && integer._value == _value;
}
diff --git a/src/main/resources/csharp/runtime/java/lang/Object.cs b/src/main/resources/csharp/runtime/java/lang/Object.cs
index 618ec3c..2b75c65 100644
--- a/src/main/resources/csharp/runtime/java/lang/Object.cs
+++ b/src/main/resources/csharp/runtime/java/lang/Object.cs
@@ -1,6 +1,6 @@
namespace Couscous.java.lang {
internal class Object {
- internal virtual bool equals__java_lang_Object__boolean(Object other) {
+ internal virtual bool equals__Object__boolean(Object other) {
return System.Object.ReferenceEquals(this, other);
}
diff --git a/src/main/resources/python/runtime/java/lang/Integer.py b/src/main/resources/python/runtime/java/lang/Integer.py
index 8a55b33..4504cb1 100644
--- a/src/main/resources/python/runtime/java/lang/Integer.py
+++ b/src/main/resources/python/runtime/java/lang/Integer.py
@@ -1,12 +1,12 @@
class Integer(object):
@staticmethod
- def valueOf__int__java_lang_Integer(value):
+ def valueOf__int__Integer(value):
return value
def __init__(self, value):
self._value = value
- def equals__java_lang_Object__boolean(self, other):
+ def equals__Object__boolean(self, other):
# TODO: test this properly
return isinstance(other, Integer) and other._value == self._value