From e44bf2c9e4108ab69a599acdbbf54a02b6984a07 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 5 Oct 2015 18:47:04 +0100 Subject: Use slice syntax instead of __getitem__ --- .../couscous/backends/python/PrimitiveMethods.java | 10 ++-------- .../couscous/backends/python/PythonSerializer.java | 16 ++++++++++++++++ .../backends/python/ast/PythonGetSliceNode.java | 18 ++++++++++++++++++ .../python/ast/visitors/PythonNodeVisitor.java | 2 ++ .../tests/backends/python/PythonSerializerTests.java | 14 +++++++++++++- 5 files changed, 51 insertions(+), 9 deletions(-) create mode 100644 src/main/java/org/zwobble/couscous/backends/python/ast/PythonGetSliceNode.java (limited to 'src') diff --git a/src/main/java/org/zwobble/couscous/backends/python/PrimitiveMethods.java b/src/main/java/org/zwobble/couscous/backends/python/PrimitiveMethods.java index 32d4272..67f66ea 100644 --- a/src/main/java/org/zwobble/couscous/backends/python/PrimitiveMethods.java +++ b/src/main/java/org/zwobble/couscous/backends/python/PrimitiveMethods.java @@ -11,8 +11,8 @@ import org.zwobble.couscous.values.TypeReference; import com.google.common.collect.ImmutableMap; import static java.util.Arrays.asList; -import static org.zwobble.couscous.backends.python.ast.PythonAttributeAccessNode.pythonAttributeAccess; import static org.zwobble.couscous.backends.python.ast.PythonCallNode.pythonCall; +import static org.zwobble.couscous.backends.python.ast.PythonGetSliceNode.pythonGetSlice; import static org.zwobble.couscous.backends.python.ast.PythonVariableReferenceNode.pythonVariableReference; public class PrimitiveMethods { @@ -25,13 +25,7 @@ public class PrimitiveMethods { asList(receiver))) .put("substring", (receiver, arguments) -> - pythonCall( - pythonAttributeAccess( - receiver, - "__getitem__"), - asList(pythonCall( - pythonVariableReference("slice"), - arguments)))) + pythonGetSlice(receiver, arguments)) .build(); 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 1e10315..abab1bf 100644 --- a/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java +++ b/src/main/java/org/zwobble/couscous/backends/python/PythonSerializer.java @@ -9,6 +9,7 @@ import org.zwobble.couscous.backends.python.ast.PythonClassNode; import org.zwobble.couscous.backends.python.ast.PythonConditionalExpressionNode; import org.zwobble.couscous.backends.python.ast.PythonExpressionNode; import org.zwobble.couscous.backends.python.ast.PythonFunctionDefinitionNode; +import org.zwobble.couscous.backends.python.ast.PythonGetSliceNode; import org.zwobble.couscous.backends.python.ast.PythonIntegerLiteralNode; import org.zwobble.couscous.backends.python.ast.PythonModuleNode; import org.zwobble.couscous.backends.python.ast.PythonNode; @@ -95,6 +96,21 @@ public class PythonSerializer implements PythonNodeVisitor { writer.writeSymbol(")"); } + @Override + public void visit(PythonGetSliceNode getSlice) { + writeParenthesised(getSlice.getReceiver()); + writer.writeSymbol("["); + // TODO: remove this duplication + if (!getSlice.getArguments().isEmpty()) { + write(getSlice.getArguments().get(0)); + for (val argumentName : skip(getSlice.getArguments(), 1)) { + writer.writeSymbol(":"); + write(argumentName); + } + } + writer.writeSymbol("]"); + } + @Override public void visit(PythonReturnNode pythonReturn) { writer.writeStatement(() -> { diff --git a/src/main/java/org/zwobble/couscous/backends/python/ast/PythonGetSliceNode.java b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonGetSliceNode.java new file mode 100644 index 0000000..27c191e --- /dev/null +++ b/src/main/java/org/zwobble/couscous/backends/python/ast/PythonGetSliceNode.java @@ -0,0 +1,18 @@ +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="pythonGetSlice") +public class PythonGetSliceNode implements PythonExpressionNode { + PythonExpressionNode receiver; + List 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 2e38d3b..29d6108 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,6 +7,7 @@ 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; +import org.zwobble.couscous.backends.python.ast.PythonGetSliceNode; import org.zwobble.couscous.backends.python.ast.PythonIntegerLiteralNode; import org.zwobble.couscous.backends.python.ast.PythonModuleNode; import org.zwobble.couscous.backends.python.ast.PythonPassNode; @@ -22,6 +23,7 @@ public interface PythonNodeVisitor { void visit(PythonConditionalExpressionNode conditional); void visit(PythonAttributeAccessNode attributeAccess); void visit(PythonCallNode call); + void visit(PythonGetSliceNode getSlice); void visit(PythonReturnNode pythonReturn); void visit(PythonPassNode pass); 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 a7708da..2f6d856 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 @@ -12,6 +12,7 @@ import static org.zwobble.couscous.backends.python.ast.PythonAttributeAccessNode 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.PythonConditionalExpressionNode.pythonConditionalExpression; +import static org.zwobble.couscous.backends.python.ast.PythonGetSliceNode.pythonGetSlice; import static org.zwobble.couscous.backends.python.ast.PythonIntegerLiteralNode.pythonIntegerLiteral; import static org.zwobble.couscous.backends.python.ast.PythonModuleNode.pythonModule; import static org.zwobble.couscous.backends.python.ast.PythonPassNode.PASS; @@ -68,10 +69,21 @@ public class PythonSerializerTests { assertEquals("(f)(x, y)", serialize( pythonCall( pythonVariableReference("f"), - asList(pythonVariableReference("x"), + asList( + pythonVariableReference("x"), pythonVariableReference("y"))))); } + @Test + public void getSliceIsSerializedUsingParenthesisedSubExpression() { + assertEquals("(x)[y:z]", serialize( + pythonGetSlice( + pythonVariableReference("x"), + asList( + pythonVariableReference("y"), + pythonVariableReference("z"))))); + } + @Test public void returnKeywordIsUsedForReturns() { val output = serialize(pythonReturn(pythonIntegerLiteral(42))); -- cgit v1.2.3