aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2015-10-06 11:04:32 +0100
committerMichael Williamson <mike@zwobble.org>2015-10-06 11:04:32 +0100
commit8896693ff24eba937466f9014f05f211c7fd10cd (patch)
tree82fb09b168beda4ffbd859637fcbda8c22b634a4 /src/main
parent56470c01483077849dae33f65364bad987afac7a (diff)
Remove usage of Java names in Python AST
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java2
-rw-r--r--src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java2
-rw-r--r--src/main/java/org/zwobble/couscous/backends/python/ast/PythonImportNode.java7
3 files changed, 3 insertions, 8 deletions
diff --git a/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java b/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java
index 1524be7..4f54d45 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java
@@ -80,7 +80,7 @@ public class PythonCodeGenerator {
private static Stream<PythonImportNode> generateImports(ClassNode classNode) {
val classes = findReferencedClasses(classNode);
return classes.stream()
- .map(name -> pythonImport(name));
+ .map(name -> pythonImport(name.getQualifiedName()));
}
private static Set<TypeName> findReferencedClasses(ClassNode classNode) {
diff --git a/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java b/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java
index be53faa..9c82b5d 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java
@@ -166,7 +166,7 @@ public class PythonSerializer implements PythonNodeVisitor {
writer.writeStatement(() -> {
writer.writeKeyword("import");
writer.writeSpace();
- writer.writeIdentifier(importNode.getName().getQualifiedName());
+ writer.writeIdentifier(importNode.getName());
});
}
diff --git a/src/main/java/org/zwobble/couscous/backends/python/ast/PythonImportNode.java b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonImportNode.java
index eb6f743..2d38004 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/ast/PythonImportNode.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonImportNode.java
@@ -1,17 +1,12 @@
package org.zwobble.couscous.backends.python.ast;
-import org.zwobble.couscous.ast.TypeName;
import org.zwobble.couscous.backends.python.ast.visitors.PythonNodeVisitor;
import lombok.Value;
@Value(staticConstructor="pythonImport")
public class PythonImportNode implements PythonStatementNode {
- public static PythonImportNode pythonImport(String name) {
- return pythonImport(TypeName.of(name));
- }
-
- TypeName name;
+ String name;
@Override
public void accept(PythonNodeVisitor visitor) {