From a063cdcec0ecfe449a22f0134dc559a40583fc09 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 6 Feb 2016 17:11:19 +0000 Subject: Move naming code out of Python backend --- .../zwobble/couscous/tests/backends/python/PythonMethodRunner.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/test/java/org/zwobble/couscous/tests/backends/python') diff --git a/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java b/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java index 14fcf80..e541459 100644 --- a/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java +++ b/src/test/java/org/zwobble/couscous/tests/backends/python/PythonMethodRunner.java @@ -5,6 +5,7 @@ import org.hamcrest.Matchers; import org.zwobble.couscous.ast.ClassNode; import org.zwobble.couscous.ast.MethodSignature; import org.zwobble.couscous.ast.TypeName; +import org.zwobble.couscous.backends.Names; import org.zwobble.couscous.backends.python.PythonBackend; import org.zwobble.couscous.backends.python.PythonCodeGenerator; import org.zwobble.couscous.backends.python.PythonSerializer; @@ -50,9 +51,10 @@ public class PythonMethodRunner implements MethodRunner { throws IOException, InterruptedException { String argumentsString = Joiner.on(", ").join(arguments.stream().map(PythonCodeGenerator::generateCode).map(PythonSerializer::serialize).iterator()); - String pythonMethodName = PythonCodeGenerator.toName(new MethodSignature( + MethodSignature signature = new MethodSignature( methodName, - eagerMap(arguments, argument -> argument.getType()))); + eagerMap(arguments, argument -> argument.getType())); + String pythonMethodName = Names.toUniqueName(signature); String program = "from couscous." + className.getQualifiedName() + " import " + className.getSimpleName() + ";" + "value = " + className.getSimpleName() + "." + pythonMethodName + "(" + argumentsString + ");" + "print(type(value)); print(value)"; -- cgit v1.2.3