Add dictionary tests.

Author: Moderocky

src/main/java/org/byteskript/skript/compiler/Context.java

@@ -49,8 +49,6 @@ public void setStoredVariableName(String storedVariableName) {
 
     public abstract Map<String, Type> getTypeMap();
 
-    public abstract Type getType(String name);
-    
     public abstract void setIndentUnit(String string);
 
     public abstract ClassBuilder getBuilder();
@@ -269,4 +267,11 @@ public String expectedIndent() {
 
     public abstract int indent();
 
+    public Type findType(String internal) {
+        final Type type = this.getType(internal);
+        if (type != null) return type;
+        return new Type(internal);
+    }
+    
+    public abstract Type getType(String name);
 }

src/main/java/org/byteskript/skript/compiler/FileContext.java

@@ -143,11 +143,6 @@ public Map<String, Type> getTypeMap() {
         return types;
     }
 
-    @Override
-    public Type getType(String name) {
-        return types.get(name);
-    }
-    
     @Override
     public void setIndentUnit(String string) {
         this.indentUnit = string;
@@ -465,4 +460,9 @@ public String indentUnit() {
     public int indent() {
         return indent;
     }
+    
+    @Override
+    public Type getType(String name) {
+        return types.get(name);
+    }
 }

src/main/java/org/byteskript/skript/lang/syntax/function/ExternalFunctionExpression.java

@@ -114,7 +114,7 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
         final MethodBuilder method = context.getMethod();
         final FunctionDetails details = match.meta();
         assert details != null : "No details found, parsing errored.";
-        final Type location = new Type(details.location);
+        final Type location = context.findType(details.location);
         final Function function = new Function(details.name, location, CommonTypes.OBJECT, details.arguments);
         method.writeCode(function.invoke(context.getType().internalName()));
     }

src/main/java/org/byteskript/skript/lang/syntax/type/TypeExpression.java

@@ -17,7 +17,6 @@
 import org.byteskript.skript.compiler.SkriptLangSpec;
 import org.byteskript.skript.lang.element.StandardElements;
 
-import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 
@@ -82,7 +81,7 @@ public Type getReturnType() {
 
     public Type getType(String string, Context context) {
         for (final Map.Entry<String, Type> entry : context.getTypeMap().entrySet()) {
-            if (!entry.getKey().toLowerCase(Locale.ROOT).equals(string.toLowerCase(Locale.ROOT))) continue;
+            if (!entry.getKey().equalsIgnoreCase(string)) continue;
             return entry.getValue();
         }
         if (string.contains("/")) return new Type(string);

src/test/resources/dictionary.bsk

@@ -1,9 +1,13 @@
 dictionary:
     import type skript/generic
     import function "to_be_imported" from skript/generic
+    import type java/lang/System
+    import function "nanoTime" from System
 
 function test:
     trigger:
         set {var} to to_be_imported()
         assert {var} is "hello": "Imported function returned incorrectly."
+        set {var} to nanoTime() from System
+        assert {var} > 0
 

src/test/resources/tests/dictionary.bsk

@@ -0,0 +1,14 @@
+dictionary:
+    import type java/util/Objects
+    import type java/lang/System
+    import function "equals" from java/util/Objects
+
+function test:
+    trigger:
+        set {var} to nanoTime() from System
+        assert {var} > 0
+        set {var} to equals("hello", "there") from Objects
+        assert {var} is false
+        set {var} to equals("hello", "hello") from Objects
+        assert {var} is true
+        return true

src/test/resources/tests/importfunction.bsk

@@ -0,0 +1,15 @@
+dictionary:
+    import type java/util/Objects
+    import function "equals" from java/util/Objects
+    import type java/lang/System
+    import function "nanoTime" from System
+
+function test:
+    trigger:
+        set {var} to nanoTime()
+        assert {var} > 0
+        set {var} to equals("hello", "there")
+        assert {var} is false
+        set {var} to equals("hello", "hello")
+        assert {var} is true
+        return true

src/test/resources/tests/importtype.bsk

@@ -0,0 +1,14 @@
+dictionary:
+    import type java/util/Objects
+    import type java/lang/System
+    import function "equals" from java/util/Objects
+
+function test:
+    trigger:
+        set {var} to nanoTime() from System
+        assert {var} > 0
+        set {var} to equals("hello", "there") from Objects
+        assert {var} is false
+        set {var} to equals("hello", "hello") from Objects
+        assert {var} is true
+        return true

src/test/resources/tests/isequal.bsk

@@ -14,4 +14,5 @@ function test:
         assert {var} is "hello": "Equality check failed."
         assert ({var} is "there") is false: "Equality check failed."
         assert ({var} is {x}) is false: "Equality check failed."
+        assert 1 = 1
         return true