From 7830a6bfee5a517b34f9bd64c17cf3c585f2a3e2 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Thu, 31 Mar 2016 14:54:49 +0100
Subject: Use writeCommaSeparated where appropriate

---
 .../couscous/backends/python/PythonSerializer.java | 23 +++++-----------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java')

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 178efe6..36d4a34 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java
@@ -49,13 +49,9 @@ public class PythonSerializer implements PythonNodeVisitor {
     @Override
     public void visit(PythonListNode list) {
         writer.writeSymbol("[");
-        writer.writeWithSeparator(
+        writer.writeCommaSeparated(
             list.getElements(),
-            element -> write(element),
-            () -> {
-                writer.writeSymbol(",");
-                writer.writeSpace();
-            });
+            element -> write(element));
         writer.writeSymbol("]");
     }
 
@@ -83,10 +79,7 @@ public class PythonSerializer implements PythonNodeVisitor {
     public void visit(PythonCallNode call) {
         writeParenthesised(call.getCallee(), call);
         writer.writeSymbol("(");
-        writer.writeWithSeparator(call.getArguments(), this::write, () -> {
-            writer.writeSymbol(",");
-            writer.writeSpace();
-        });
+        writer.writeCommaSeparated(call.getArguments(), this::write);
         writer.writeSymbol(")");
     }
     
@@ -185,11 +178,8 @@ public class PythonSerializer implements PythonNodeVisitor {
             writer.writeSpace();
             writer.writeKeyword("import");
             writer.writeSpace();
-            writer.writeWithSeparator(importNode.getAliases(), alias -> {
+            writer.writeCommaSeparated(importNode.getAliases(), alias -> {
                 writer.writeIdentifier(alias.getName());
-            }, () -> {
-                writer.writeSymbol(",");
-                writer.writeSpace();
             });
         });
     }
@@ -230,10 +220,7 @@ public class PythonSerializer implements PythonNodeVisitor {
     }
     
     private void writeArgumentNames(PythonFunctionDefinitionNode functionDefinition) {
-        writer.writeWithSeparator(functionDefinition.getArgumentNames(), writer::writeIdentifier, () -> {
-            writer.writeSymbol(",");
-            writer.writeSpace();
-        });
+        writer.writeCommaSeparated(functionDefinition.getArgumentNames(), writer::writeIdentifier);
     }
 
     @Override
-- 
cgit v1.2.3