Support external types in expression.

Author: Moderocky

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

@@ -37,6 +37,13 @@ public Pattern(String[] patterns, Library provider) {
         }
     }
 
+    public static Matcher fakeMatcher(String thing) {
+        final String solid = java.util.regex.Pattern.quote(thing);
+        final Matcher matcher = java.util.regex.Pattern.compile(solid).matcher(thing);
+        matcher.find();
+        return matcher;
+    }
+    
     protected void handle(final String string) {
         final StringBuilder builder = new StringBuilder().append("^");
         final List<String> types = new ArrayList<>();

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

@@ -54,10 +54,7 @@
 import org.byteskript.skript.lang.syntax.map.MapCreator;
 import org.byteskript.skript.lang.syntax.maths.*;
 import org.byteskript.skript.lang.syntax.timing.*;
-import org.byteskript.skript.lang.syntax.type.TemplateTypeMember;
-import org.byteskript.skript.lang.syntax.type.ThisThingExpression;
-import org.byteskript.skript.lang.syntax.type.TypeCreator;
-import org.byteskript.skript.lang.syntax.type.TypeMember;
+import org.byteskript.skript.lang.syntax.type.*;
 import org.byteskript.skript.lang.syntax.variable.AtomicVariableExpression;
 import org.byteskript.skript.lang.syntax.variable.GlobalVariableExpression;
 import org.byteskript.skript.lang.syntax.variable.ThreadVariableExpression;

src/main/java/org/byteskript/skript/lang/syntax/comparison/IsArray.java

@@ -14,7 +14,7 @@
 import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.lang.element.StandardElements;
 import org.byteskript.skript.lang.handler.StandardHandlers;
-import org.byteskript.skript.lang.syntax.generic.TypeExpression;
+import org.byteskript.skript.lang.syntax.type.TypeExpression;
 
 import java.lang.reflect.Method;
 

src/main/java/org/byteskript/skript/lang/syntax/comparison/IsOfType.java

@@ -14,7 +14,7 @@
 import org.byteskript.skript.compiler.*;
 import org.byteskript.skript.lang.element.StandardElements;
 import org.byteskript.skript.lang.handler.StandardHandlers;
-import org.byteskript.skript.lang.syntax.generic.TypeExpression;
+import org.byteskript.skript.lang.syntax.type.TypeExpression;
 
 import java.lang.reflect.Method;
 

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

@@ -4,7 +4,7 @@
  * https://github.com/Moderocky/ByteSkript/blob/master/LICENSE
  */
 
-package org.byteskript.skript.lang.syntax.generic;
+package org.byteskript.skript.lang.syntax.type;
 
 import mx.kenzie.foundation.MethodBuilder;
 import mx.kenzie.foundation.Type;
@@ -41,18 +41,16 @@ public Type getType(String string, Context context) {
             if (!entry.getKey().toLowerCase(Locale.ROOT).equals(string.toLowerCase(Locale.ROOT))) continue;
             return entry.getValue();
         }
+        if (string.contains("/")) return new Type(string);
         return null;
     }
 
     @Override
     public Pattern.Match match(String thing, Context context) {
-        for (final Map.Entry<String, Type> entry : context.getTypeMap().entrySet()) {
-            if (!entry.getKey().toLowerCase(Locale.ROOT).equals(thing.toLowerCase(Locale.ROOT))) continue;
-            final Matcher matcher = java.util.regex.Pattern.compile(thing).matcher(thing);
-            matcher.find();
-            return new Pattern.Match(matcher, entry.getValue(), new Type[0]);
-        }
-        return null;
+        final Type type = this.getType(thing, context);
+        if (type == null) return null;
+        final Matcher matcher = Pattern.fakeMatcher(thing);
+        return new Pattern.Match(matcher, type, new Type[0]);
     }
 
     @Override

src/test/resources/types.bsk

@@ -83,7 +83,7 @@ function java_implement:
     trigger:
         set {getter} to a new Getter
         assert {getter} is a Getter: "Type self-comparison failed."
-        set {class} to get_class("java.util.function.Supplier")
+        set {class} to java/util/function/Supplier
         assert {getter} is a {class}: "Type java super-comparison failed."
         set {var} to get() from {getter}
         assert {var} is "hello": "Supplier get method failed."