From c6fd2a9cac5a5b164c32a04d84543d3d1bd5d51c Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 4 Oct 2015 17:04:22 +0100
Subject: Add local variable declarations

---
 src/main/java/org/zwobble/couscous/interpreter/Environment.java | 9 +++++++--
 src/main/java/org/zwobble/couscous/interpreter/Executor.java    | 8 ++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'src/main/java/org/zwobble/couscous/interpreter')

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();
+    }
 }
-- 
cgit v1.2.3