aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2016-03-30 19:58:38 +0100
committerMichael Williamson <mike@zwobble.org>2016-03-30 19:58:38 +0100
commitf89273cc65a2abfeae7ea58b37424e066b9f81b3 (patch)
treed3319266960db99ddd8492ddf5826959e3a59005 /src/main/java
parentc58796cf60fcb109ab56ae2b1c0872c58771f3e1 (diff)
Correct name of Python arrays to lists
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java4
-rw-r--r--src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java4
-rw-r--r--src/main/java/org/zwobble/couscous/backends/python/ast/PythonListNode.java (renamed from src/main/java/org/zwobble/couscous/backends/python/ast/PythonArrayNode.java)8
-rw-r--r--src/main/java/org/zwobble/couscous/backends/python/ast/visitors/PythonNodeVisitor.java2
4 files changed, 9 insertions, 9 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 9aa679a..693a06b 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/PythonCodeGenerator.java
@@ -23,7 +23,7 @@ import java.util.stream.Stream;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.transform;
import static com.google.common.collect.Iterators.singletonIterator;
-import static org.zwobble.couscous.backends.python.ast.PythonArrayNode.pythonArray;
+import static org.zwobble.couscous.backends.python.ast.PythonListNode.pythonList;
import static org.zwobble.couscous.types.Types.erasure;
import static org.zwobble.couscous.backends.python.ast.PythonAssignmentNode.pythonAssignment;
import static org.zwobble.couscous.backends.python.ast.PythonAttributeAccessNode.pythonAttributeAccess;
@@ -254,7 +254,7 @@ public class PythonCodeGenerator {
@Override
public PythonExpressionNode visit(ArrayNode array) {
- return pythonArray(eagerMap(
+ return pythonList(eagerMap(
array.getElements(),
PythonCodeGenerator::generateExpression));
}
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 0a7735d..668b6f7 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java
@@ -48,10 +48,10 @@ public class PythonSerializer implements PythonNodeVisitor {
}
@Override
- public void visit(PythonArrayNode array) {
+ public void visit(PythonListNode list) {
writer.writeSymbol("[");
writer.writeWithSeparator(
- array.getElements(),
+ list.getElements(),
element -> write(element),
() -> {
writer.writeSymbol(",");
diff --git a/src/main/java/org/zwobble/couscous/backends/python/ast/PythonArrayNode.java b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonListNode.java
index 91588ea..ee00023 100644
--- a/src/main/java/org/zwobble/couscous/backends/python/ast/PythonArrayNode.java
+++ b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonListNode.java
@@ -4,14 +4,14 @@ import org.zwobble.couscous.backends.python.ast.visitors.PythonNodeVisitor;
import java.util.List;
-public class PythonArrayNode implements PythonExpressionNode {
- public static PythonExpressionNode pythonArray(List<PythonExpressionNode> elements) {
- return new PythonArrayNode(elements);
+public class PythonListNode implements PythonExpressionNode {
+ public static PythonExpressionNode pythonList(List<PythonExpressionNode> elements) {
+ return new PythonListNode(elements);
}
private final List<PythonExpressionNode> elements;
- public PythonArrayNode(List<PythonExpressionNode> elements) {
+ public PythonListNode(List<PythonExpressionNode> elements) {
this.elements = elements;
}
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 bcc8604..c585e8c 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
@@ -7,7 +7,7 @@ public interface PythonNodeVisitor {
void visit(PythonStringLiteralNode stringLiteral);
void visit(PythonBooleanLiteralNode booleanLiteral);
void visit(PythonVariableReferenceNode reference);
- void visit(PythonArrayNode array);
+ void visit(PythonListNode list);
void visit(PythonConditionalExpressionNode conditional);
void visit(PythonAttributeAccessNode attributeAccess);
void visit(PythonCallNode call);