Generate variable IDs without Eclipse keys

3 files changed, 16 insertions, 11 deletions

diff --git a/src/main/java/org/zwobble/couscous/interpreter/Environment.java b/src/main/java/org/zwobble/couscous/interpreter/Environment.java
index b1d59e2..23e2fdf 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/Environment.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/Environment.java
@@ -5,6 +5,7 @@ import java.util.Optional;
 import org.zwobble.couscous.ast.TypeName;
 import org.zwobble.couscous.ast.VariableDeclaration;
 import org.zwobble.couscous.ast.VariableNode;
+import org.zwobble.couscous.ast.identifiers.Identifier;
 import org.zwobble.couscous.interpreter.values.ConcreteType;
 import org.zwobble.couscous.interpreter.values.InterpreterValue;
 import static java.util.stream.Collectors.toMap;
@@ -12,7 +13,7 @@ import static java.util.stream.Collectors.toMap;
 public class Environment {
     private final Project project;
     private final Optional<InterpreterValue> thisValue;
-    private final Map<String, VariableEntry> stackFrame;
+    private final Map<Identifier, VariableEntry> stackFrame;
     
     public Environment(Project project, Optional<InterpreterValue> thisValue, Map<VariableDeclaration, Optional<InterpreterValue>> stackFrame) {
         this.project = project;
@@ -27,13 +28,13 @@ public class Environment {
         return thisValue;
     }
     
-    public InterpreterValue get(String variableId) {
+    public InterpreterValue get(Identifier variableId) {
         checkVariableIsInScope(variableId);
         final org.zwobble.couscous.interpreter.Environment.VariableEntry entry = stackFrame.get(variableId);
         return entry.getValue().orElseThrow(() -> new UnboundVariable(variableId));
     }
     
-    public void put(String variableId, InterpreterValue value) {
+    public void put(Identifier variableId, InterpreterValue value) {
         checkVariableIsInScope(variableId);
         checkVariableType(variableId, value);
         stackFrame.get(variableId).setValue(Optional.of(value));
@@ -51,13 +52,13 @@ public class Environment {
         return new Environment(project, thisValue, stackFrame);
     }
     
-    private void checkVariableIsInScope(String variableId) {
+    private void checkVariableIsInScope(Identifier variableId) {
         if (!stackFrame.containsKey(variableId)) {
             throw new VariableNotInScope(variableId);
         }
     }
     
-    private void checkVariableType(String variableId, InterpreterValue value) {
+    private void checkVariableType(Identifier variableId, InterpreterValue value) {
         TypeName variableType = stackFrame.get(variableId).getType();
         InterpreterTypes.checkIsInstance(variableType, value);
     }
diff --git a/src/main/java/org/zwobble/couscous/interpreter/UnboundVariable.java b/src/main/java/org/zwobble/couscous/interpreter/UnboundVariable.java
index e0131f0..1dba54b 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/UnboundVariable.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/UnboundVariable.java
@@ -1,14 +1,16 @@
 package org.zwobble.couscous.interpreter;
 
+import org.zwobble.couscous.ast.identifiers.Identifier;
+
 public final class UnboundVariable extends InterpreterException {
     private static final long serialVersionUID = 1L;
-    private final String variableId;
+    private final Identifier variableId;
     
-    public UnboundVariable(final String variableId) {
+    public UnboundVariable(final Identifier variableId) {
         this.variableId = variableId;
     }
     
-    public String getVariableId() {
+    public Identifier getVariableId() {
         return this.variableId;
     }
     
diff --git a/src/main/java/org/zwobble/couscous/interpreter/VariableNotInScope.java b/src/main/java/org/zwobble/couscous/interpreter/VariableNotInScope.java
index 54b66bd..c5a425e 100644
--- a/src/main/java/org/zwobble/couscous/interpreter/VariableNotInScope.java
+++ b/src/main/java/org/zwobble/couscous/interpreter/VariableNotInScope.java
@@ -1,14 +1,16 @@
 package org.zwobble.couscous.interpreter;
 
+import org.zwobble.couscous.ast.identifiers.Identifier;
+
 public final class VariableNotInScope extends InterpreterException {
     private static final long serialVersionUID = 1L;
-    private final String variableId;
+    private final Identifier variableId;
     
-    public VariableNotInScope(final String variableId) {
+    public VariableNotInScope(final Identifier variableId) {
         this.variableId = variableId;
     }
     
-    public String getVariableId() {
+    public Identifier getVariableId() {
         return this.variableId;
     }