Implement attribute access and calls in Python backend

5 files changed, 73 insertions, 1 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 0db2be6..690375d 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java
@@ -32,7 +32,9 @@ import org.zwobble.couscous.values.UnitValue;
 
 import static java.util.Arrays.asList;
 import static org.zwobble.couscous.backends.python.ast.PythonAssignmentNode.pythonAssignment;
+import static org.zwobble.couscous.backends.python.ast.PythonAttributeAccessNode.pythonAttributeAccess;
 import static org.zwobble.couscous.backends.python.ast.PythonBooleanLiteralNode.pythonBooleanLiteral;
+import static org.zwobble.couscous.backends.python.ast.PythonCallNode.pythonCall;
 import static org.zwobble.couscous.backends.python.ast.PythonClassNode.pythonClass;
 import static org.zwobble.couscous.backends.python.ast.PythonConditionalExpressionNode.pythonConditionalExpression;
 import static org.zwobble.couscous.backends.python.ast.PythonFunctionDefinitionNode.pythonFunctionDefinition;
@@ -154,7 +156,14 @@ public class PythonCodeGenerator {
 
         @Override
         public PythonExpressionNode visit(MethodCallNode methodCall) {
-            throw new UnsupportedOperationException();
+            val arguments = methodCall.getArguments().stream()
+                .map(PythonCodeGenerator::generateExpression)
+                .collect(Collectors.toList());
+            return pythonCall(
+                pythonAttributeAccess(
+                    generateExpression(methodCall.getReceiver()),
+                    methodCall.getMethodName()),
+                arguments);
         }
 
         @Override
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 7eaf2fb..1e10315 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java
@@ -1,8 +1,10 @@
 package org.zwobble.couscous.backends.python;
 
 import org.zwobble.couscous.backends.python.ast.PythonAssignmentNode;
+import org.zwobble.couscous.backends.python.ast.PythonAttributeAccessNode;
 import org.zwobble.couscous.backends.python.ast.PythonBlock;
 import org.zwobble.couscous.backends.python.ast.PythonBooleanLiteralNode;
+import org.zwobble.couscous.backends.python.ast.PythonCallNode;
 import org.zwobble.couscous.backends.python.ast.PythonClassNode;
 import org.zwobble.couscous.backends.python.ast.PythonConditionalExpressionNode;
 import org.zwobble.couscous.backends.python.ast.PythonExpressionNode;
@@ -72,6 +74,28 @@ public class PythonSerializer implements PythonNodeVisitor {
     }
 
     @Override
+    public void visit(PythonAttributeAccessNode attributeAccess) {
+        writeParenthesised(attributeAccess.getLeft());
+        writer.writeSymbol(".");
+        writer.writeIdentifier(attributeAccess.getAttributeName());
+    }
+
+    @Override
+    public void visit(PythonCallNode call) {
+        writeParenthesised(call.getCallee());
+        writer.writeSymbol("(");
+        if (!call.getArguments().isEmpty()) {
+            write(call.getArguments().get(0));
+            for (val argumentName : skip(call.getArguments(), 1)) {
+                writer.writeSymbol(",");
+                writer.writeSpace();
+                write(argumentName);
+            }
+        }
+        writer.writeSymbol(")");
+    }
+
+    @Override
     public void visit(PythonReturnNode pythonReturn) {
         writer.writeStatement(() -> {
             writer.writeKeyword("return");
diff --git a/src/main/java/org/zwobble/couscous/backends/python/ast/PythonAttributeAccessNode.java b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonAttributeAccessNode.java
new file mode 100644
index 0000000..ccd795f
--- /dev/null
+++ b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonAttributeAccessNode.java
@@ -0,0 +1,16 @@
+package org.zwobble.couscous.backends.python.ast;
+
+import org.zwobble.couscous.backends.python.ast.visitors.PythonNodeVisitor;
+
+import lombok.Value;
+
+@Value(staticConstructor="pythonAttributeAccess")
+public class PythonAttributeAccessNode implements PythonExpressionNode {
+    PythonExpressionNode left;
+    String attributeName;
+    
+    @Override
+    public void accept(PythonNodeVisitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/main/java/org/zwobble/couscous/backends/python/ast/PythonCallNode.java b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonCallNode.java
new file mode 100644
index 0000000..92c8b20
--- /dev/null
+++ b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonCallNode.java
@@ -0,0 +1,19 @@
+package org.zwobble.couscous.backends.python.ast;
+
+import java.util.List;
+
+import org.zwobble.couscous.backends.python.ast.visitors.PythonNodeVisitor;
+
+import lombok.Value;
+
+@Value(staticConstructor="pythonCall")
+public class PythonCallNode implements PythonExpressionNode {
+    PythonExpressionNode callee;
+    List<PythonExpressionNode> arguments;
+    
+    
+    @Override
+    public void accept(PythonNodeVisitor visitor) {
+        visitor.visit(this);
+    }
+}
diff --git a/src/main/java/org/zwobble/couscous/backends/python/ast/visitors/PythonNodeVisitor.java b/src/main/java/org/zwobble/couscous/backends/python/ast/visitors/PythonNodeVisitor.java
index 0cd43ae..2e38d3b 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/ast/visitors/PythonNodeVisitor.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/ast/visitors/PythonNodeVisitor.java
@@ -1,7 +1,9 @@
 package org.zwobble.couscous.backends.python.ast.visitors;
 
 import org.zwobble.couscous.backends.python.ast.PythonAssignmentNode;
+import org.zwobble.couscous.backends.python.ast.PythonAttributeAccessNode;
 import org.zwobble.couscous.backends.python.ast.PythonBooleanLiteralNode;
+import org.zwobble.couscous.backends.python.ast.PythonCallNode;
 import org.zwobble.couscous.backends.python.ast.PythonClassNode;
 import org.zwobble.couscous.backends.python.ast.PythonConditionalExpressionNode;
 import org.zwobble.couscous.backends.python.ast.PythonFunctionDefinitionNode;
@@ -18,6 +20,8 @@ public interface PythonNodeVisitor {
     void visit(PythonBooleanLiteralNode booleanLiteral);
     void visit(PythonVariableReferenceNode reference);
     void visit(PythonConditionalExpressionNode conditional);
+    void visit(PythonAttributeAccessNode attributeAccess);
+    void visit(PythonCallNode call);
     
     void visit(PythonReturnNode pythonReturn);
     void visit(PythonPassNode pass);