Correct type converters.

Author: Moderocky

src/main/java/org/byteskript/skript/lang/syntax/generic/ConverterExpression.java

@@ -22,12 +22,12 @@
 public class ConverterExpression extends SimpleExpression {
 
     public ConverterExpression() {
-        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% [parsed] as %Type%");
+        super(SkriptLangSpec.LIBRARY, StandardElements.EXPRESSION, "%Object% [parsed] as a[n] %Type%");
     }
 
     @Override
     public Pattern.Match match(String thing, Context context) {
-        if (!thing.contains(" as ")) return null;
+        if (!thing.contains(" as a")) return null;
         return super.match(thing, context);
     }
 

src/main/java/org/byteskript/skript/runtime/Skript.java

@@ -293,8 +293,8 @@ public <From, To> Converter<From, To> getConverter(Class<From> from, Class<To> t
         final Converter.Data data = new Converter.Data(from, to);
         if (converters.containsKey(data)) return (Converter<From, To>) converters.get(data);
         for (final Converter.Data found : converters.keySet()) {
-            if (from.isAssignableFrom(found.from()) && to.isAssignableFrom(found.to()))
-                return (Converter<From, To>) converters.get(data);
+            if (found.from().isAssignableFrom(from) && found.to().isAssignableFrom(to))
+                return (Converter<From, To>) converters.get(found);
         }
         return null;
     }

src/main/java/org/byteskript/skript/runtime/internal/ExtractedSyntaxCalls.java

@@ -39,7 +39,7 @@ private static Skript findInstance() {
 
     public static Object convert(Object from, Object object) {
         if (!(object instanceof Class<?> to)) throw new ScriptRuntimeError("Object must be converted to a type.");
-        if (from.getClass().isAssignableFrom(to)) return from;
+        if (to.isAssignableFrom(from.getClass())) return to.cast(from);
         final Converter converter = findInstance().getConverter(from.getClass(), to);
         if (converter == null) return from;
         return converter.convert(from);

src/test/resources/conversion.bsk

@@ -2,5 +2,13 @@
 function test:
     trigger:
         set {thing} to "10"
-        set {number} to {thing} as integer
+        set {number} to {thing} as an integer
         assert {number} is a number
+        set {number} to {thing} as a number
+        assert {number} is a number
+        set {thing} to {number} as a string
+        assert {thing} is a string
+        set {thing} to "java.lang.Object" as a class
+        assert {thing} is a class
+        set {thing} to {thing} as a string
+        assert {thing} is a string