Use writeCommaSeparated where appropriate

2 files changed, 13 insertions, 42 deletions

diff --git a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java
index 499121c..63bb283 100644
--- a/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java
+++ b/src/main/java/org/zwobble/couscous/backends/csharp/CsharpSerializer.java
@@ -158,7 +158,7 @@ public class CsharpSerializer implements NodeVisitor {
 
     private void writeArguments(List<? extends ExpressionNode> arguments) {
         writer.writeSymbol("(");
-        writer.writeWithSeparator(arguments, this::write, () -> writer.writeSymbol(", "));
+        writer.writeCommaSeparated(arguments, this::write);
         writer.writeSymbol(")");
     }
 
@@ -285,10 +285,7 @@ public class CsharpSerializer implements NodeVisitor {
 
     private void writeFormalArguments(List<FormalArgumentNode> arguments) {
         writer.writeSymbol("(");
-        writer.writeWithSeparator(
-            arguments,
-            this::write,
-            () -> writer.writeSymbol(", "));
+        writer.writeCommaSeparated(arguments, this::write);
         writer.writeSymbol(")");
     }
 
@@ -364,13 +361,9 @@ public class CsharpSerializer implements NodeVisitor {
     private void writeTypeParameters(TypeNode node) {
         if (!node.getTypeParameters().isEmpty()) {
             writer.writeSymbol("<");
-            writer.writeWithSeparator(
+            writer.writeCommaSeparated(
                 node.getTypeParameters(),
-                parameter -> writer.writeIdentifier(parameter.getName()),
-                () -> {
-                    writer.writeSymbol(",");
-                    writer.writeSpace();
-                });
+                parameter -> writer.writeIdentifier(parameter.getName()));
             writer.writeSymbol(">");
         }
     }
@@ -380,13 +373,9 @@ public class CsharpSerializer implements NodeVisitor {
             writer.writeSpace();
             writer.writeSymbol(":");
             writer.writeSpace();
-            writer.writeWithSeparator(
+            writer.writeCommaSeparated(
                 node.getSuperTypes(),
-                this::writeTypeReference,
-                () -> {
-                    writer.writeSymbol(",");
-                    writer.writeSpace();
-                });
+                this::writeTypeReference);
         }
     }
 
@@ -444,14 +433,9 @@ public class CsharpSerializer implements NodeVisitor {
             public Void visit(ParameterizedType type) {
                 writer.writeIdentifier(typeReference(type.getRawType()));
                 writer.writeSymbol("<");
-                writer.writeWithSeparator(
+                writer.writeCommaSeparated(
                     type.getParameters(),
-                    parameter -> writeTypeReference(parameter),
-                    () -> {
-                        writer.writeSymbol(",");
-                        writer.writeSpace();
-                    }
-                );
+                    parameter -> writeTypeReference(parameter));
                 writer.writeSymbol(">");
                 return null;
             }
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