From 8896693ff24eba937466f9014f05f211c7fd10cd Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 6 Oct 2015 11:04:32 +0100
Subject: Remove usage of Java names in Python AST

---
 .../org/zwobble/couscous/backends/python/PythonCodeGenerator.java  | 2 +-
 .../org/zwobble/couscous/backends/python/PythonSerializer.java     | 2 +-
 .../org/zwobble/couscous/backends/python/ast/PythonImportNode.java | 7 +------
 3 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'src')

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) {
-- 
cgit v1.2.3