From fec7b703498ff1ed0b0d31ed602e0ba9459985f1 Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 29 Sep 2015 20:23:15 +0100
Subject: Extract Environment class

---
 .../java/org/zwobble/couscous/interpreter/Evaluator.java     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

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

diff --git a/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java b/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java
index 033bfb8..02acbe3 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/Evaluator.java
@@ -1,7 +1,5 @@
 package org.zwobble.couscous.interpreter;
 
-import java.util.Map;
-
 import org.zwobble.couscous.ast.Assignment;
 import org.zwobble.couscous.ast.ExpressionNode;
 import org.zwobble.couscous.ast.LiteralNode;
@@ -12,10 +10,10 @@ import org.zwobble.couscous.values.InterpreterValue;
 import lombok.val;
 
 public class Evaluator implements ExpressionNodeVisitor<InterpreterValue> {
-    private final Map<Integer, InterpreterValue> stackFrame;
+    private final Environment environment;
 
-    public Evaluator(Map<Integer, InterpreterValue> stackFrame) {
-        this.stackFrame = stackFrame;
+    public Evaluator(Environment environment) {
+        this.environment = environment;
     }
     
     public InterpreterValue eval(ExpressionNode expression) {
@@ -29,13 +27,13 @@ public class Evaluator implements ExpressionNodeVisitor<InterpreterValue> {
 
     @Override
     public InterpreterValue visit(VariableReferenceNode variableReference) {
-        return stackFrame.get(variableReference.getReferentId());
+        return environment.get(variableReference.getReferentId());
     }
 
     @Override
     public InterpreterValue visit(Assignment assignment) {
         val value = eval(assignment.getValue());
-        stackFrame.put(assignment.getTarget().getReferentId(), value);
+        environment.put(assignment.getTarget().getReferentId(), value);
         return value;
     }
 }
-- 
cgit v1.2.3