From 38cc6849339b37c29af80e2affc1931479d61c05 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 5 Oct 2015 13:31:20 +0100 Subject: Support assignment statements in the Python backend --- .../org/zwobble/couscous/tests/BackendTests.java | 15 +++++++++++++++ .../backends/python/PythonSerializerTests.java | 22 +++++++++++++++------- .../couscous/tests/interpreter/EvaluatorTests.java | 2 +- .../tests/interpreter/InterpreterTests.java | 20 ++++---------------- 4 files changed, 35 insertions(+), 24 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/zwobble/couscous/tests/BackendTests.java b/src/test/java/org/zwobble/couscous/tests/BackendTests.java index 7e7c3bd..0f3956d 100644 --- a/src/test/java/org/zwobble/couscous/tests/BackendTests.java +++ b/src/test/java/org/zwobble/couscous/tests/BackendTests.java @@ -1,7 +1,10 @@ package org.zwobble.couscous.tests; import org.junit.Test; +import org.zwobble.couscous.ast.AssignmentNode; import org.zwobble.couscous.ast.ClassNode; +import org.zwobble.couscous.ast.ExpressionStatementNode; +import org.zwobble.couscous.ast.LiteralNode; import org.zwobble.couscous.ast.MethodNode; import org.zwobble.couscous.ast.ReturnNode; import org.zwobble.couscous.values.PrimitiveValue; @@ -46,6 +49,18 @@ public abstract class BackendTests { assertEquals(value("hello, world!"), result); } + + @Test + public void canReassignValueToArgument() { + val arg = formalArg(var(42, "x", StringValue.REF)); + val method = staticMethod("hello") + .argument(arg) + .statement(new ExpressionStatementNode(new AssignmentNode(reference(arg), LiteralNode.literal("[updated value]")))) + .statement(new ReturnNode(reference(arg))); + val result = runMethod(method, value("[initial value]")); + + assertEquals(value("[updated value]"), result); + } protected PrimitiveValue runMethod(MethodNode.MethodNodeBuilder methodBuilder, PrimitiveValue... arguments) { val method = methodBuilder.build(); 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 944c2af..2835034 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,6 +7,7 @@ import org.zwobble.couscous.backends.python.ast.PythonFunctionDefinitionNode; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.zwobble.couscous.backends.python.PythonSerializer.serialize; +import static org.zwobble.couscous.backends.python.ast.PythonAssignmentNode.pythonAssignment; import static org.zwobble.couscous.backends.python.ast.PythonBooleanLiteralNode.pythonBooleanLiteral; import static org.zwobble.couscous.backends.python.ast.PythonIntegerLiteralNode.pythonIntegerLiteral; import static org.zwobble.couscous.backends.python.ast.PythonModuleNode.pythonModule; @@ -79,13 +80,6 @@ public class PythonSerializerTests { assertEquals("class Empty(object):\n pass\n", output); } - @Test - public void moduleIsSerializedStatements() { - val classNode = pythonModule(asList(PASS)); - val output = serialize(classNode); - assertEquals("pass\n", output); - } - @Test public void bodiesOfBlocksAreIndented() { val classNode = PythonClassNode.builder("Foo") @@ -101,4 +95,18 @@ public class PythonSerializerTests { " pass\n"; assertEquals(expectedOutput, output); } + + @Test + public void assignmentIsSerializedWithEqualsSymbolSeparatingTargetAndValue() { + val output = serialize(pythonAssignment( + pythonVariableReference("x"), pythonIntegerLiteral(42))); + assertEquals("x = 42\n", output); + } + + @Test + public void moduleIsSerializedStatements() { + val classNode = pythonModule(asList(PASS)); + val output = serialize(classNode); + assertEquals("pass\n", output); + } } diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java index 3ed1b6d..40cdf8f 100644 --- a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java +++ b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java @@ -22,7 +22,7 @@ import org.zwobble.couscous.values.StringValue; import com.google.common.collect.ImmutableMap; import static org.junit.Assert.assertEquals; -import static org.zwobble.couscous.ast.Assignment.assign; +import static org.zwobble.couscous.ast.AssignmentNode.assign; import static org.zwobble.couscous.ast.FormalArgumentNode.formalArg; import static org.zwobble.couscous.ast.LiteralNode.literal; import static org.zwobble.couscous.ast.MethodCallNode.methodCall; diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java index c6e6ce2..a54f150 100644 --- a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java +++ b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import org.junit.Test; import org.zwobble.couscous.MapBackedProject; -import org.zwobble.couscous.ast.Assignment; +import org.zwobble.couscous.ast.AssignmentNode; import org.zwobble.couscous.ast.ClassNode; import org.zwobble.couscous.ast.ExpressionStatementNode; import org.zwobble.couscous.ast.LiteralNode; @@ -48,24 +48,12 @@ public class InterpreterTests extends BackendTests { assertEquals(new WrongNumberOfArguments(0, 1), exception); } - @Test - public void canReassignValueToArgument() { - val arg = formalArg(var(42, "x", StringValue.REF)); - val method = staticMethod("hello") - .argument(arg) - .statement(new ExpressionStatementNode(new Assignment(reference(arg), LiteralNode.literal("[updated value]")))) - .statement(new ReturnNode(reference(arg))); - val result = runMethod(method, value("[initial value]")); - - assertEquals(value("[updated value]"), result); - } - @Test public void errorIfTryingToAssignValueOfWrongTypeToVariable() { val arg = formalArg(var(42, "x", StringValue.REF)); val method = staticMethod("hello") .argument(arg) - .statement(new ExpressionStatementNode(new Assignment(reference(arg), literal(0)))); + .statement(new ExpressionStatementNode(new AssignmentNode(reference(arg), literal(0)))); val exception = assertThrows(UnexpectedValueType.class, () -> runMethod(method, value(""))); @@ -91,7 +79,7 @@ public class InterpreterTests extends BackendTests { 42, "x", StringValue.REF, LiteralNode.literal("[initial value]")); val method = staticMethod("hello") .statement(localVariableDeclaration) - .statement(new ExpressionStatementNode(new Assignment(reference(localVariableDeclaration), LiteralNode.literal("[updated value]")))) + .statement(new ExpressionStatementNode(new AssignmentNode(reference(localVariableDeclaration), LiteralNode.literal("[updated value]")))) .statement(new ReturnNode(reference(localVariableDeclaration))); val result = runMethod(method); @@ -103,7 +91,7 @@ public class InterpreterTests extends BackendTests { val localVariableDeclaration = localVariableDeclaration( 42, "x", StringValue.REF, literal("")); val method = staticMethod("hello") - .statement(new ExpressionStatementNode(new Assignment(reference(localVariableDeclaration), LiteralNode.literal("[updated value]")))); + .statement(new ExpressionStatementNode(new AssignmentNode(reference(localVariableDeclaration), LiteralNode.literal("[updated value]")))); val exception = assertThrows(VariableNotInScope.class, () -> runMethod(method)); -- cgit v1.2.3