Updated CodeAPI base to 3.1.4

JonathanxD · JonathanxD · commit c3a5ef56ce00 · 2017-02-26T16:25:15.000-03:00
diff --git a/CodeAPI b/CodeAPI
@@ -1 +1 @@
-Subproject commit 88eecefbef10bcdab7b141f1052116abc034528a
+Subproject commit e8317dd6b92ef1bda79d72816ea419c8d1712cbd
diff --git a/build.gradle b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
 }
 
 group 'com.github.jonathanxd'
-version '3.1.2-3.1.4'
+version '3.1.4-3.1.4'
 
 apply from: project(":CodeAPI").file("gradle/common.gradle")
 
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/common/Variable.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/common/Variable.kt
@@ -55,7 +55,7 @@ data class Variable @JvmOverloads constructor(val name: String, val type: CodeTy
     }
 
     override fun toString(): String {
-        return ToStringBuilder.builder(this.javaClass)
+        return ToStringBuilder.builder(this::class.java)
                 .add("name", this.name)
                 .add("type", this.type)
                 .add("isTemp", this.isTemp)
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/AccessVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/AccessVisitor.kt
@@ -50,7 +50,7 @@ object AccessVisitor : VoidVisitor<Access, BytecodeClass, MVData> {
                 val localization = t.localization ?: throw NullPointerException("Localization is required to OUTER Access.")
                 val part = Util.accessEnclosingClass(extraData, localization) ?: throw IllegalArgumentException("Cannot access \"outer class\" '$localization'.")
 
-                visitorGenerator.generateTo(part.javaClass, part, extraData, additional)
+                visitorGenerator.generateTo(part::class.java, part, extraData, additional)
             }
             else -> {
                 throw IllegalArgumentException("Cannot handle access of type '${t.type}'")
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/AnnotationDeclarationVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/AnnotationDeclarationVisitor.kt
@@ -61,7 +61,7 @@ object AnnotationDeclarationVisitor : Visitor<AnnotationDeclaration, BytecodeCla
                 .withBody(source)
                 .build()
 
-        return visitorGenerator.generateTo(typeDeclaration.javaClass, typeDeclaration, extraData, additional)
+        return visitorGenerator.generateTo(typeDeclaration::class.java, typeDeclaration, extraData, additional)
     }
 
 }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/AnnotationPropertyVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/AnnotationPropertyVisitor.kt
@@ -35,7 +35,7 @@ import com.github.jonathanxd.codeapi.bytecode.util.AnnotationUtil
 import com.github.jonathanxd.codeapi.common.Data
 import com.github.jonathanxd.codeapi.gen.visit.VisitorGenerator
 import com.github.jonathanxd.codeapi.gen.visit.VoidVisitor
-import com.github.jonathanxd.codeapi.util.CodeTypeUtil
+import com.github.jonathanxd.codeapi.util.codeTypeToFullAsm
 import org.objectweb.asm.ClassVisitor
 import org.objectweb.asm.Opcodes
 
@@ -46,7 +46,7 @@ object AnnotationPropertyVisitor : VoidVisitor<AnnotationProperty, BytecodeClass
 
         val asmModifiers = Opcodes.ACC_PUBLIC + Opcodes.ACC_ABSTRACT
 
-        val type = CodeTypeUtil.codeTypeToFullAsm(t.type)
+        val type = codeTypeToFullAsm(t.type)
         val name = t.name
         val value = t.value
 
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ArgumentHolderVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ArgumentHolderVisitor.kt
@@ -68,7 +68,7 @@ object ArgumentHolderVisitor : VoidVisitor<ArgumentHolder, BytecodeClass, MVData
         if (!t.array) {
 
             for (argument in arguments) {
-                visitorGenerator.generateTo(argument.javaClass, argument, extraData, null, additional)
+                visitorGenerator.generateTo(argument::class.java, argument, extraData, null, additional)
             }
         } else {
             for (i in arguments.indices) {
@@ -77,7 +77,7 @@ object ArgumentHolderVisitor : VoidVisitor<ArgumentHolder, BytecodeClass, MVData
 
                 val argument = arguments[i]
 
-                visitorGenerator.generateTo(argument.javaClass, argument, extraData, null, additional)
+                visitorGenerator.generateTo(argument::class.java, argument, extraData, null, additional)
 
             }
         }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ArrayAccessVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ArrayAccessVisitor.kt
@@ -38,7 +38,7 @@ object ArrayAccessVisitor : VoidVisitor<ArrayAccess, BytecodeClass, Any?> {
     override fun voidVisit(t: ArrayAccess, extraData: Data, visitorGenerator: VisitorGenerator<BytecodeClass>, additional: Any?) {
         val target = t.target
 
-        visitorGenerator.generateTo(target.javaClass, target, extraData, null, additional)
+        visitorGenerator.generateTo(target::class.java, target, extraData, null, additional)
     }
 
 }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ArrayConstructVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ArrayConstructVisitor.kt
@@ -36,7 +36,7 @@ import com.github.jonathanxd.codeapi.common.Data
 import com.github.jonathanxd.codeapi.gen.visit.VisitorGenerator
 import com.github.jonathanxd.codeapi.gen.visit.VoidVisitor
 import com.github.jonathanxd.codeapi.literal.Literals
-import com.github.jonathanxd.codeapi.util.CodeTypeUtil
+import com.github.jonathanxd.codeapi.util.codeTypeToTypeDesc
 import org.objectweb.asm.Opcodes
 
 object ArrayConstructVisitor : VoidVisitor<ArrayConstructor, BytecodeClass, MVData> {
@@ -55,14 +55,14 @@ object ArrayConstructVisitor : VoidVisitor<ArrayConstructor, BytecodeClass, MVDa
 
         if (multi && !initialize) {
             dimensions.forEach {
-                visitorGenerator.generateTo(it.javaClass, it, extraData, null, additional)
+                visitorGenerator.generateTo(it::class.java, it, extraData, null, additional)
             }
 
-            mv.visitMultiANewArrayInsn(CodeTypeUtil.codeTypeToTypeDesc(component), dimensions.size)
+            mv.visitMultiANewArrayInsn(codeTypeToTypeDesc(component), dimensions.size)
         } else {
             val dimensionX = if (dimensions.isNotEmpty()) dimensions[0] else Literals.INT(0)
 
-            visitorGenerator.generateTo(dimensionX.javaClass, dimensionX, extraData, null, additional)
+            visitorGenerator.generateTo(dimensionX::class.java, dimensionX, extraData, null, additional)
 
             ArrayUtil.visitArrayStore(component, mv) // ANEWARRAY, ANEWARRAY T_INT, etc...
         }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ArrayLoadVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ArrayLoadVisitor.kt
@@ -46,7 +46,7 @@ object ArrayLoadVisitor : VoidVisitor<ArrayLoad, BytecodeClass, MVData> {
 
         val index = t.index
 
-        visitorGenerator.generateTo(index.javaClass, index, extraData, null, additional)
+        visitorGenerator.generateTo(index::class.java, index, extraData, null, additional)
 
         val valueType = t.valueType
 
@@ -58,7 +58,7 @@ object ArrayLoadVisitor : VoidVisitor<ArrayLoad, BytecodeClass, MVData> {
 
         if (!arrayComponentType.`is`(valueType)) {
             val cast = CodeAPI.cast(valueType, arrayComponentType, Stack)
-            visitorGenerator.generateTo(cast.javaClass, cast, extraData, additional)
+            visitorGenerator.generateTo(cast::class.java, cast, extraData, additional)
         }
     }
 
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ArrayStoreVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ArrayStoreVisitor.kt
@@ -45,7 +45,7 @@ object ArrayStoreVisitor : VoidVisitor<ArrayStore, BytecodeClass, MVData> {
 
         val index = t.index
 
-        visitorGenerator.generateTo(index.javaClass, index, extraData, null, additional)
+        visitorGenerator.generateTo(index::class.java, index, extraData, null, additional)
 
         var value = t.valueToStore
         val valueType = t.valueType
@@ -56,7 +56,7 @@ object ArrayStoreVisitor : VoidVisitor<ArrayStore, BytecodeClass, MVData> {
             value = CodeAPI.cast(valueType, arrayComponentType, value)
         }
 
-        visitorGenerator.generateTo(value.javaClass, value, extraData, null, additional)
+        visitorGenerator.generateTo(value::class.java, value, extraData, null, additional)
 
         val opcode = CodeTypeUtil.getOpcodeForType(arrayComponentType, Opcodes.IASTORE)
 
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/BytecodeIfStatementVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/BytecodeIfStatementVisitor.kt
@@ -111,10 +111,10 @@ fun visit(ifStatement: IfStatement,
                     opcode = IfUtil.invertIfNeEqOpcode(opcode)
 
                 if (firstIsBoolean) {
-                    visitorGenerator.generateTo(expr2.javaClass, expr2, extraData, null, mvData)
+                    visitorGenerator.generateTo(expr2::class.java, expr2, extraData, null, mvData)
                     visitor.visitJumpInsn(opcode, lbl)
                 } else {
-                    visitorGenerator.generateTo(expr1.javaClass, expr1, extraData, null, mvData)
+                    visitorGenerator.generateTo(expr1::class.java, expr1, extraData, null, mvData)
                     visitor.visitJumpInsn(opcode, lbl)
                 }
 
@@ -131,12 +131,12 @@ fun visit(ifStatement: IfStatement,
                     }
                 }
 
-                visitorGenerator.generateTo(expr1.javaClass, expr1, extraData, null, mvData)
+                visitorGenerator.generateTo(expr1::class.java, expr1, extraData, null, mvData)
 
                 if (expr2 === Literals.NULL) {
                     visitor.visitJumpInsn(OperatorUtil.nullCheckToAsm(operation, isInverse), lbl)
                 } else if (CodePartUtil.isPrimitive(expr1) && CodePartUtil.isPrimitive(expr2)) {
-                    visitorGenerator.generateTo(expr2.javaClass, expr2, extraData, null, mvData)
+                    visitorGenerator.generateTo(expr2::class.java, expr2, extraData, null, mvData)
 
                     val firstType = CodePartUtil.getType(expr1)
                     val secondType = CodePartUtil.getType(expr2)
@@ -165,7 +165,7 @@ fun visit(ifStatement: IfStatement,
 
                     visitor.visitJumpInsn(check, lbl)
                 } else {
-                    visitorGenerator.generateTo(expr2.javaClass, expr2, extraData, null, mvData)
+                    visitorGenerator.generateTo(expr2::class.java, expr2, extraData, null, mvData)
 
                     visitor.visitJumpInsn(OperatorUtil.referenceToAsm(operation, isInverse), lbl)
                 }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/CastVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/CastVisitor.kt
@@ -53,21 +53,21 @@ object CastVisitor : VoidVisitor<Cast, BytecodeClass, MVData> {
 
         // No cast of void types.
         if(from != null && !from.`is`(to) && from.`is`(Types.VOID) || to.`is`(Types.VOID)) {
-            visitorGenerator.generateTo(castedPart.javaClass, castedPart, extraData, null, additional)
+            visitorGenerator.generateTo(castedPart::class.java, castedPart, extraData, null, additional)
             return
         }
 
         val autoboxing = if (from != null) autoboxing(from, to, castedPart) else null
 
         if (autoboxing != null && from != null) {
-            visitorGenerator.generateTo(autoboxing.javaClass, autoboxing, extraData, null, additional)
+            visitorGenerator.generateTo(autoboxing::class.java, autoboxing, extraData, null, additional)
 
             if (from.isPrimitive && !to.isPrimitive && from.wrapperType!!.canonicalName != to.canonicalName) {
                 mv.visitTypeInsn(Opcodes.CHECKCAST, CodeTypeUtil.codeTypeToBinaryName(to))
             }
 
         } else {
-            visitorGenerator.generateTo(castedPart.javaClass, castedPart, extraData, null, additional)
+            visitorGenerator.generateTo(castedPart::class.java, castedPart, extraData, null, additional)
 
             if (from != null && from != to) {
                 if (to.isPrimitive) {
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/CodeSourceVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/CodeSourceVisitor.kt
@@ -67,7 +67,7 @@ object CodeSourceVisitor : Visitor<CodeSource, BytecodeClass, Any?> {
 
             val codePart = t[i]
 
-            val aClass = codePart.javaClass
+            val aClass = codePart::class.java
 
             visitorGenerator.generateTo(aClass, codePart, extraData, Consumer {
                 appender.add(it)
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ConcatVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ConcatVisitor.kt
@@ -49,7 +49,7 @@ object ConcatVisitor : VoidVisitor<Concat, BytecodeClass, MVData> {
 
             if (concatenations.size == 1) {
 
-                visitorGenerator.generateTo(first.javaClass, first, extraData, additional)
+                visitorGenerator.generateTo(first::class.java, first, extraData, additional)
 
             } else if (concatenations.size == 2) {
 
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/EnumVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/EnumVisitor.kt
@@ -51,7 +51,7 @@ object EnumVisitor : Visitor<EnumDeclaration, BytecodeClass, Any?> {
                 .withBody(source)
                 .build()
 
-        return visitorGenerator.generateTo(typeDeclaration.javaClass, typeDeclaration, extraData, additional)
+        return visitorGenerator.generateTo(typeDeclaration::class.java, typeDeclaration, extraData, additional)
     }
 
 }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/FieldAccessVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/FieldAccessVisitor.kt
@@ -61,7 +61,7 @@ object FieldAccessVisitor : VoidVisitor<FieldAccess, BytecodeClass, MVData> {
         localization = of.get()
 
         if (at !is Access || at.type != Access.Type.STATIC) {
-            visitorGenerator.generateTo(at.javaClass, at, extraData, null, additional)
+            visitorGenerator.generateTo(at::class.java, at, extraData, null, additional)
         }
 
         if (at is Access && at.type == Access.Type.STATIC) {
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/FieldDefinitionVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/FieldDefinitionVisitor.kt
@@ -47,9 +47,9 @@ object FieldDefinitionVisitor : VoidVisitor<FieldDefinition, BytecodeClass, MVDa
         val variableType = t.type
         val opcode = if (target is Access && target.type == Access.Type.STATIC) Opcodes.PUTSTATIC else Opcodes.PUTFIELD
 
-        visitorGenerator.generateTo(target.javaClass, target, extraData, additional)
+        visitorGenerator.generateTo(target::class.java, target, extraData, additional)
 
-        visitorGenerator.generateTo(t.value.javaClass, t.value, extraData, additional)
+        visitorGenerator.generateTo(t.value::class.java, t.value, extraData, additional)
 
         additional.methodVisitor.visitFieldInsn(opcode, CodeTypeUtil.codeTypeToBinaryName(localization), variableName, CodeTypeUtil.toTypeDesc(variableType))
 
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ForIVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ForIVisitor.kt
@@ -56,7 +56,7 @@ object ForIVisitor : VoidVisitor<ForStatement, BytecodeClass, MVData> {
         val init = t.forInit
 
         if (init != null) {
-            visitorGenerator.generateTo(init.javaClass, init, extraData, null, additional)
+            visitorGenerator.generateTo(init::class.java, init, extraData, null, additional)
         }
 
 
@@ -77,7 +77,7 @@ object ForIVisitor : VoidVisitor<ForStatement, BytecodeClass, MVData> {
             val update = t.forUpdate
 
             if (update != null) {
-                visitorGenerator.generateTo(update.javaClass, update, extraData, null, additional)
+                visitorGenerator.generateTo(update::class.java, update, extraData, null, additional)
             }
 
             mv.visitJumpInsn(Opcodes.GOTO, whileStart)
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/InstanceOfVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/InstanceOfVisitor.kt
@@ -44,7 +44,7 @@ object InstanceOfVisitor : VoidVisitor<InstanceOfCheck, BytecodeClass, MVData> {
         val part = t.part
         val codeType = t.checkType
 
-        visitorGenerator.generateTo(part.javaClass, part, extraData, null, additional)
+        visitorGenerator.generateTo(part::class.java, part, extraData, null, additional)
 
         visitor.visitTypeInsn(Opcodes.INSTANCEOF, CodeTypeUtil.codeTypeToBinaryName(codeType))
     }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/MethodDeclarationVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/MethodDeclarationVisitor.kt
@@ -75,7 +75,7 @@ object MethodDeclarationVisitor : VoidVisitor<MethodDeclaration, BytecodeClass,
                         .inspect(typeDeclaration.body).isEmpty()
 
                 if (!any) {
-                    visitorGenerator.generateTo(bridgeMethod.javaClass, bridgeMethod, extraData, additional)
+                    visitorGenerator.generateTo(bridgeMethod::class.java, bridgeMethod, extraData, additional)
                 }
             }
         }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/MethodInvocationVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/MethodInvocationVisitor.kt
@@ -137,7 +137,7 @@ object MethodInvocationVisitor : Visitor<MethodInvocation, BytecodeClass, MVData
         }
 
         if (target !is CodeType) {
-            visitorGenerator.generateTo(target.javaClass, target, extraData, null, additional)
+            visitorGenerator.generateTo(target::class.java, target, extraData, null, additional)
         }
 
         visitorGenerator.generateTo(ArgumentHolder::class.java, methodInvocation, extraData, null, additional)
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/OperateVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/OperateVisitor.kt
@@ -62,15 +62,15 @@ object OperateVisitor : VoidVisitor<Operate, BytecodeClass, MVData> {
                     )
                     .build()
 
-            visitorGenerator.generateTo(desugar.javaClass, desugar, extraData, additional)
+            visitorGenerator.generateTo(desugar::class.java, desugar, extraData, additional)
 
             return
         }
 
-        visitorGenerator.generateTo(target.javaClass, target, extraData, additional)
+        visitorGenerator.generateTo(target::class.java, target, extraData, additional)
 
         if (value != null) {
-            visitorGenerator.generateTo(value.javaClass, value, extraData, additional)
+            visitorGenerator.generateTo(value::class.java, value, extraData, additional)
         }
 
         when (operation) {
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/SwitchVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/SwitchVisitor.kt
@@ -73,7 +73,7 @@ object SwitchVisitor : VoidVisitor<SwitchStatement, BytecodeClass, MVData> {
             val mv = additional.methodVisitor
             val value = aSwitch.value
 
-            visitorGenerator.generateTo(value.javaClass, value, extraData, additional)
+            visitorGenerator.generateTo(value::class.java, value, extraData, additional)
 
             val originCaseList = aSwitch.cases
             var filteredCaseList = originCaseList
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ThrowExceptionVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/ThrowExceptionVisitor.kt
@@ -42,7 +42,7 @@ object ThrowExceptionVisitor : VoidVisitor<ThrowException, BytecodeClass, MVData
 
         val partToThrow = t.partToThrow
 
-        visitorGenerator.generateTo(partToThrow.javaClass, partToThrow, extraData, null, additional)
+        visitorGenerator.generateTo(partToThrow::class.java, partToThrow, extraData, null, additional)
 
         mv.visitInsn(Opcodes.ATHROW)
     }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/TryStatementVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/TryStatementVisitor.kt
@@ -128,7 +128,7 @@ object TryStatementVisitor : VoidVisitor<TryStatement, BytecodeClass, MVData> {
             mv.visitVarInsn(Opcodes.ASTORE, stackPos)
 
             if (fieldValue != null) {
-                visitorGenerator.generateTo(fieldValue.javaClass, fieldValue, extraData, null, additional)
+                visitorGenerator.generateTo(fieldValue::class.java, fieldValue, extraData, null, additional)
 
                 mv.visitVarInsn(Opcodes.ASTORE, stackPos)
             }
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/VariableDeclarationVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/VariableDeclarationVisitor.kt
@@ -48,7 +48,7 @@ object VariableDeclarationVisitor : VoidVisitor<VariableDeclaration, BytecodeCla
         val value = t.value
 
         if (value != null) {
-            visitorGenerator.generateTo(value.javaClass, value, extraData, null, additional)
+            visitorGenerator.generateTo(value::class.java, value, extraData, null, additional)
         }
 
         val `var` = additional.getVar(t.name, t.variableType)
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/VariableDefinitionVisitor.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/gen/visitor/VariableDefinitionVisitor.kt
@@ -56,7 +56,7 @@ object VariableDefinitionVisitor : VoidVisitor<VariableDefinition, BytecodeClass
         if (value is Operate && VariableOperateVisitor.visit(t, value, varPos, additional))
             return
 
-        visitorGenerator.generateTo(value.javaClass, value, extraData, additional)
+        visitorGenerator.generateTo(value::class.java, value, extraData, additional)
 
         val type = Type.getType(variableType.javaSpecName)
 
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/util/AnnotationUtil.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/util/AnnotationUtil.kt
@@ -50,7 +50,7 @@ object AnnotationUtil {
         @Suppress("NAME_SHADOWING")
         var value = value
 
-        if (value.javaClass.isArray) {
+        if (value::class.java.isArray) {
             val values = ArrayUtil.toObjectArray(value)
 
             val annotationVisitor1 = annotationVisitor.visitArray(key)
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/util/CodeTypeUtil.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/util/CodeTypeUtil.kt
diff --git a/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/util/ConstructorUtil.kt b/src/main/kotlin/com/github/jonathanxd/codeapi/bytecode/util/ConstructorUtil.kt

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ buildscript {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`group 'com.github.jonathanxd'`
`21`		`-version '3.1.2-3.1.4'`
	`21`	`+version '3.1.4-3.1.4'`
`22`	`22`
`23`	`23`	`apply from: project(":CodeAPI").file("gradle/common.gradle")`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ data class Variable @JvmOverloads constructor(val name: String, val type: CodeTy`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`override fun toString(): String {`
`58`		`- return ToStringBuilder.builder(this.javaClass)`
	`58`	`+ return ToStringBuilder.builder(this::class.java)`
`59`	`59`	`.add("name", this.name)`
`60`	`60`	`.add("type", this.type)`
`61`	`61`	`.add("isTemp", this.isTemp)`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ object AccessVisitor : VoidVisitor<Access, BytecodeClass, MVData> {`
`50`	`50`	`val localization = t.localization ?: throw NullPointerException("Localization is required to OUTER Access.")`
`51`	`51`	`val part = Util.accessEnclosingClass(extraData, localization) ?: throw IllegalArgumentException("Cannot access \"outer class\" '$localization'.")`
`52`	`52`
`53`		`- visitorGenerator.generateTo(part.javaClass, part, extraData, additional)`
	`53`	`+ visitorGenerator.generateTo(part::class.java, part, extraData, additional)`
`54`	`54`	`}`
`55`	`55`	`else -> {`
`56`	`56`	`throw IllegalArgumentException("Cannot handle access of type '${t.type}'")`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ object AnnotationDeclarationVisitor : Visitor<AnnotationDeclaration, BytecodeCla`
`61`	`61`	`.withBody(source)`
`62`	`62`	`.build()`
`63`	`63`
`64`		`- return visitorGenerator.generateTo(typeDeclaration.javaClass, typeDeclaration, extraData, additional)`
	`64`	`+ return visitorGenerator.generateTo(typeDeclaration::class.java, typeDeclaration, extraData, additional)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ object ArgumentHolderVisitor : VoidVisitor<ArgumentHolder, BytecodeClass, MVData`
`68`	`68`	`if (!t.array) {`
`69`	`69`
`70`	`70`	`for (argument in arguments) {`
`71`		`- visitorGenerator.generateTo(argument.javaClass, argument, extraData, null, additional)`
	`71`	`+ visitorGenerator.generateTo(argument::class.java, argument, extraData, null, additional)`
`72`	`72`	`}`
`73`	`73`	`} else {`
`74`	`74`	`for (i in arguments.indices) {`
`@@ -77,7 +77,7 @@ object ArgumentHolderVisitor : VoidVisitor<ArgumentHolder, BytecodeClass, MVData`
`77`	`77`
`78`	`78`	`val argument = arguments[i]`
`79`	`79`
`80`		`- visitorGenerator.generateTo(argument.javaClass, argument, extraData, null, additional)`
	`80`	`+ visitorGenerator.generateTo(argument::class.java, argument, extraData, null, additional)`
`81`	`81`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ object ArrayAccessVisitor : VoidVisitor<ArrayAccess, BytecodeClass, Any?> {`
`38`	`38`	`override fun voidVisit(t: ArrayAccess, extraData: Data, visitorGenerator: VisitorGenerator<BytecodeClass>, additional: Any?) {`
`39`	`39`	`val target = t.target`
`40`	`40`
`41`		`- visitorGenerator.generateTo(target.javaClass, target, extraData, null, additional)`
	`41`	`+ visitorGenerator.generateTo(target::class.java, target, extraData, null, additional)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ object ArrayLoadVisitor : VoidVisitor<ArrayLoad, BytecodeClass, MVData> {`
`46`	`46`
`47`	`47`	`val index = t.index`
`48`	`48`
`49`		`- visitorGenerator.generateTo(index.javaClass, index, extraData, null, additional)`
	`49`	`+ visitorGenerator.generateTo(index::class.java, index, extraData, null, additional)`
`50`	`50`
`51`	`51`	`val valueType = t.valueType`
`52`	`52`
`@@ -58,7 +58,7 @@ object ArrayLoadVisitor : VoidVisitor<ArrayLoad, BytecodeClass, MVData> {`
`58`	`58`
`59`	`59`	if (!arrayComponentType.`is`(valueType)) {
`60`	`60`	`val cast = CodeAPI.cast(valueType, arrayComponentType, Stack)`
`61`		`- visitorGenerator.generateTo(cast.javaClass, cast, extraData, additional)`
	`61`	`+ visitorGenerator.generateTo(cast::class.java, cast, extraData, additional)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`