Fix bug where 'cast' module was not included correctly

2 files changed, 7 insertions, 4 deletions

diff --git a/src/main/com/jantuomi/tunkki/core/runtime/State.java b/src/main/com/jantuomi/tunkki/core/runtime/State.java
index 3bf214c..fee53f8 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/State.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/State.java
@@ -66,10 +66,13 @@ public class State {
         return scopes.get(0);
     }
 
-    public void addSymbolToScope(String symbol) {
-        scopes.peek().addVariable(symbol);
+    public Scope getTopmostScope() {
+        return scopes.peek();
     }
 
+    public void addSymbolToScope(String symbol) {
+        getTopmostScope().addVariable(symbol);
+    }
 
     public void setSymbolValueToScope(String symbol, Datatype value) {
         scopes.peek().setVariableValue(symbol, value);
diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java
index 6758b25..3a974c7 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/BuiltinManager.java
@@ -57,8 +57,8 @@ public class BuiltinManager {
 
     private Map<String, CallableDatatype> getFunctionsFromCastModule() {
         Map<String, CallableDatatype> map = new HashMap<>();
-        builtins.put("as_int", new AsIntBuiltinFunction().makeCallable());
-        builtins.put("as_bool", new AsBooleanBuiltinFunction().makeCallable());
+        map.put("as_int", new AsIntBuiltinFunction().makeCallable());
+        map.put("as_bool", new AsBooleanBuiltinFunction().makeCallable());
         return map;
     }