diff options
Diffstat (limited to 'src')
5 files changed, 49 insertions, 2 deletions
diff --git a/src/main/java/org/zwobble/couscous/ast/LocalVariableDeclarationNode.java b/src/main/java/org/zwobble/couscous/ast/LocalVariableDeclarationNode.java new file mode 100644 index 0000000..880a7fd --- /dev/null +++ b/src/main/java/org/zwobble/couscous/ast/LocalVariableDeclarationNode.java @@ -0,0 +1,19 @@ +package org.zwobble.couscous.ast; + +import org.zwobble.couscous.ast.visitors.StatementNodeVisitor; +import org.zwobble.couscous.values.TypeReference; + +import lombok.Value; + +@Value(staticConstructor="localVariableDeclaration") +public class LocalVariableDeclarationNode implements VariableNode, StatementNode { + int id; + TypeReference type; + String name; + ExpressionNode initialValue; + + @Override + public <T> T accept(StatementNodeVisitor<T> visitor) { + return visitor.visit(this); + } +} diff --git a/src/main/java/org/zwobble/couscous/ast/visitors/StatementNodeVisitor.java b/src/main/java/org/zwobble/couscous/ast/visitors/StatementNodeVisitor.java index 6cec404..620f6f8 100644 --- a/src/main/java/org/zwobble/couscous/ast/visitors/StatementNodeVisitor.java +++ b/src/main/java/org/zwobble/couscous/ast/visitors/StatementNodeVisitor.java @@ -1,9 +1,11 @@ package org.zwobble.couscous.ast.visitors; import org.zwobble.couscous.ast.ExpressionStatementNode; +import org.zwobble.couscous.ast.LocalVariableDeclarationNode; import org.zwobble.couscous.ast.ReturnNode; public interface StatementNodeVisitor<T> { T visit(ReturnNode returnNode); T visit(ExpressionStatementNode expressionStatement); + T visit(LocalVariableDeclarationNode localVariableDeclaration); } diff --git a/src/main/java/org/zwobble/couscous/interpreter/Environment.java b/src/main/java/org/zwobble/couscous/interpreter/Environment.java index b4decd8..ced87c8 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Environment.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Environment.java @@ -4,6 +4,7 @@ import java.util.HashMap; import java.util.Map; import org.zwobble.couscous.Project; +import org.zwobble.couscous.ast.VariableNode; import org.zwobble.couscous.values.ConcreteType; import org.zwobble.couscous.values.InterpreterValue; @@ -20,8 +21,12 @@ public class Environment { return stackFrame.get(referentId); } - public void put(int referentId, InterpreterValue value) { - stackFrame.put(referentId, value); + public void put(int variableId, InterpreterValue value) { + stackFrame.put(variableId, value); + } + + public void put(VariableNode variable, InterpreterValue value) { + stackFrame.put(variable.getId(), value); } public ConcreteType<?> findClass(String className) { diff --git a/src/main/java/org/zwobble/couscous/interpreter/Executor.java b/src/main/java/org/zwobble/couscous/interpreter/Executor.java index 4002238..49eca3f 100644 --- a/src/main/java/org/zwobble/couscous/interpreter/Executor.java +++ b/src/main/java/org/zwobble/couscous/interpreter/Executor.java @@ -4,6 +4,7 @@ import java.util.Optional; import java.util.stream.IntStream; import org.zwobble.couscous.ast.ExpressionStatementNode; +import org.zwobble.couscous.ast.LocalVariableDeclarationNode; import org.zwobble.couscous.ast.MethodNode; import org.zwobble.couscous.ast.ReturnNode; import org.zwobble.couscous.ast.StatementNode; @@ -62,4 +63,11 @@ public class Executor implements StatementNodeVisitor<Optional<InterpreterValue> eval(environment, expressionStatement.getExpression()); return Optional.empty(); } + + @Override + public Optional<InterpreterValue> visit(LocalVariableDeclarationNode localVariableDeclaration) { + val value = eval(environment, localVariableDeclaration.getInitialValue()); + environment.put(localVariableDeclaration, value); + return Optional.empty(); + } } 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 87659b8..4078b3f 100644 --- a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java +++ b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java @@ -19,6 +19,7 @@ import com.google.common.collect.ImmutableMap; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; +import static org.zwobble.couscous.ast.LocalVariableDeclarationNode.localVariableDeclaration; import static org.zwobble.couscous.ast.MethodNode.staticMethod; import static org.zwobble.couscous.ast.VariableReferenceNode.reference; import static org.zwobble.couscous.tests.util.ExtraAsserts.assertThrows; @@ -76,6 +77,18 @@ public class InterpreterTests { assertEquals(new StringValue("[updated value]"), result); } + + @Test + public void canDeclareVariable() { + val localVariableDeclaration = localVariableDeclaration( + 42, StringValue.REF, "x", LiteralNode.literal("[initial value]")); + val method = staticMethod("hello") + .statement(localVariableDeclaration) + .statement(new ReturnNode(reference(localVariableDeclaration))); + val result = runMethod(method); + + assertEquals(new StringValue("[initial value]"), result); + } private InterpreterValue runMethod(MethodNode.MethodNodeBuilder methodBuilder, InterpreterValue... arguments) { val method = methodBuilder.build(); |