aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
-rw-r--r--src/test/java/org/zwobble/couscous/tests/backends/python/PythonCodeGeneratorTests.java4
-rw-r--r--src/test/java/org/zwobble/couscous/tests/backends/python/PythonSerializerTests.java8
6 files changed, 15 insertions, 15 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);
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/python/PythonCodeGeneratorTests.java b/src/test/java/org/zwobble/couscous/tests/backends/python/PythonCodeGeneratorTests.java
index 1b043bc..98d2e20 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/python/PythonCodeGeneratorTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/python/PythonCodeGeneratorTests.java
@@ -4,7 +4,7 @@ import org.hamcrest.FeatureMatcher;
import org.hamcrest.Matcher;
import org.junit.Test;
import org.zwobble.couscous.backends.python.PythonCodeGenerator;
-import org.zwobble.couscous.backends.python.ast.PythonArrayNode;
+import org.zwobble.couscous.backends.python.ast.PythonListNode;
import org.zwobble.couscous.backends.python.ast.PythonExpressionNode;
import org.zwobble.couscous.backends.python.ast.PythonStringLiteralNode;
import org.zwobble.couscous.types.Types;
@@ -42,7 +42,7 @@ public class PythonCodeGeneratorTests {
private static Matcher<PythonExpressionNode> isPythonList(
List<Matcher<? super PythonExpressionNode>> expectedElements)
{
- return isA(PythonArrayNode.class, hasFeature(
+ return isA(PythonListNode.class, hasFeature(
"elements",
list -> list.getElements(),
contains(expectedElements)));
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/python/PythonSerializerTests.java b/src/test/java/org/zwobble/couscous/tests/backends/python/PythonSerializerTests.java
index 98b2eed..23787a4 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/python/PythonSerializerTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/python/PythonSerializerTests.java
@@ -7,7 +7,7 @@ import org.zwobble.couscous.backends.python.ast.PythonModuleNode;
import static org.junit.Assert.assertEquals;
import static org.zwobble.couscous.backends.python.PythonSerializer.serialize;
-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.backends.python.ast.PythonAssignmentNode.pythonAssignment;
import static org.zwobble.couscous.backends.python.ast.PythonAttributeAccessNode.pythonAttributeAccess;
import static org.zwobble.couscous.backends.python.ast.PythonBinaryOperation.pythonAnd;
@@ -61,11 +61,11 @@ public class PythonSerializerTests {
@Test
public void elementsOfArrayAreSerialised() {
- assertEquals("[]", serialize(pythonArray(list())));
- assertEquals("[one]", serialize(pythonArray(list(pythonVariableReference("one")))));
+ assertEquals("[]", serialize(pythonList(list())));
+ assertEquals("[one]", serialize(pythonList(list(pythonVariableReference("one")))));
assertEquals(
"[one, two]",
- serialize(pythonArray(list(
+ serialize(pythonList(list(
pythonVariableReference("one"),
pythonVariableReference("two")))));
}