From cdf51cdb9b3f8cef5896315496f348d9f7220903 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Sun, 4 Oct 2015 20:57:00 +0100
Subject: Add separate notion of VariableDeclaration

---
 src/main/java/org/zwobble/couscous/interpreter/Environment.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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

diff --git a/src/main/java/org/zwobble/couscous/interpreter/Environment.java b/src/main/java/org/zwobble/couscous/interpreter/Environment.java
index 21cfe04..6838ba5 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.Map;
 import java.util.Optional;
 
 import org.zwobble.couscous.Project;
+import org.zwobble.couscous.ast.VariableDeclaration;
 import org.zwobble.couscous.ast.VariableNode;
 import org.zwobble.couscous.values.ConcreteType;
 import org.zwobble.couscous.values.InterpreterValue;
@@ -20,7 +21,7 @@ public class Environment {
     private final Project project;
     private final Map<Integer, VariableEntry> stackFrame;
 
-    public Environment(Project project, Map<VariableNode, Optional<InterpreterValue>> stackFrame) {
+    public Environment(Project project, Map<VariableDeclaration, Optional<InterpreterValue>> stackFrame) {
         this.project = project;
         this.stackFrame = stackFrame.entrySet()
             .stream()
@@ -42,7 +43,7 @@ public class Environment {
     }
 
     public void put(VariableNode variable, InterpreterValue value) {
-        put(variable.getId(), value);
+        put(variable.getDeclaration().getId(), value);
     }
 
     public ConcreteType<?> findClass(String className) {
@@ -50,7 +51,7 @@ public class Environment {
         return project.findClass(className);
     }
 
-    public Environment withStackFrame(Map<VariableNode, Optional<InterpreterValue>> stackFrame) {
+    public Environment withStackFrame(Map<VariableDeclaration, Optional<InterpreterValue>> stackFrame) {
         return new Environment(project, stackFrame);
     }
 
-- 
cgit v1.2.3