Clean up unboxing in bridge compiler.

Author: Moderocky

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

@@ -148,23 +148,14 @@ protected Class<?> getUnboxingType(Class<?> primitive) {
     }
 
     protected void unbox(MethodVisitor visitor, Class<?> parameter) {
+        if (!parameter.isPrimitive()) return;
         final String source = Type.getInternalName(OperatorHandler.class);
-        if (parameter == byte.class)
-            visitor.visitMethodInsn(184, source, "unboxB", "(Ljava/lang/Number;)B", false);
-        if (parameter == short.class)
-            visitor.visitMethodInsn(184, source, "unboxS", "(Ljava/lang/Number;)S", false);
-        if (parameter == int.class)
-            visitor.visitMethodInsn(184, source, "unboxI", "(Ljava/lang/Number;)I", false);
-        if (parameter == long.class)
-            visitor.visitMethodInsn(184, source, "unboxJ", "(Ljava/lang/Number;)J", false);
-        if (parameter == float.class)
-            visitor.visitMethodInsn(184, source, "unboxF", "(Ljava/lang/Number;)F", false);
-        if (parameter == double.class)
-            visitor.visitMethodInsn(184, source, "unboxD", "(Ljava/lang/Number;)D", false);
-        if (parameter == boolean.class)
-            visitor.visitMethodInsn(184, source, "unbox", "(Ljava/lang/Boolean;)Z", false);
-        if (parameter == char.class)
-            visitor.visitMethodInsn(184, source, "unbox", "(Ljava/lang/Character;)C", false);
+        final Class<?> wrapper, prescriptive;
+        prescriptive = this.getWrapperType(parameter);
+        if (Number.class.isAssignableFrom(prescriptive)) wrapper = Number.class;
+        else wrapper = prescriptive;
+        final String code = Type.getDescriptor(parameter);
+        visitor.visitMethodInsn(184, source, "unbox" + code, '(' + Type.getDescriptor(wrapper) + ')' + code, false);
     }
 
     //region Utilities
@@ -197,10 +188,8 @@ protected Class<?> getWrapperType(Class<?> primitive) {
 
     protected int wideIndexOffset(Class<?>[] params, Class<?> ret) {
         int i = 0;
-        for (Class<?> param : params) {
-            i += wideIndexOffset(param);
-        }
-        return Math.max(i, wideIndexOffset(ret));
+        for (Class<?> param : params) i += this.wideIndexOffset(param);
+        return Math.max(i, this.wideIndexOffset(ret));
     }
 
     protected int wideIndexOffset(Class<?> thing) {

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

@@ -59,12 +59,12 @@ public static double unboxD(Number value) {
         return value.doubleValue();
     }
 
-    public static char unbox(Character value) {
+    public static char unboxC(Character value) {
         if (value == null) return 0;
         return value;
     }
 
-    public static boolean unbox(Boolean value) {
+    public static boolean unboxZ(Boolean value) {
         if (value == null) return false;
         return value;
     }