Fail when reading uninitialized variables

OlegSmelov · Mar 3, 2018 · 0eabe0f · 0eabe0f
1 parent 87042cb
commit 0eabe0f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/omgrofl/interpreter/Variable.java b/src/omgrofl/interpreter/Variable.java
@@ -1,5 +1,7 @@
 package omgrofl.interpreter;
 
+import omgrofl.interpreter.exceptions.ScriptRuntimeException;
+
 public class Variable {
 
     protected Memory memory;
@@ -11,7 +13,12 @@ public Variable(Memory memory, String name) {
     }
 
     public Object getValue() {
-        return memory.getVariable(name.toLowerCase());
+        Object value = memory.getVariable(name.toLowerCase());
+        if (value == null) {
+            throw new ScriptRuntimeException(
+                    "Attempt to read uninitialized variable " + name);
+        }
+        return value;
     }
 
     public String getName() {