Improvements and method access fixed

Author: jhrldev

build.gradle

@@ -17,7 +17,7 @@ plugins {
 }
 
 group 'com.github.jonathanxd'
-version '2.0-a'
+version '2.0.1'
 
 apply plugin: 'java'
 apply plugin: 'kotlin'

src/main/kotlin/com/github/jonathanxd/bytecodedisassembler/ClassNodeParser.kt

@@ -37,8 +37,8 @@ object ClassNodeParser {
     fun parse(classNode: ClassNode, appender: Appender, appendFrames: Boolean) {
         appender.append("")
 
-        appender.append("version: ${Util.parseVersion(classNode.version)}")
-        appender.append("access: ${Util.parseAccess(Util.CLASS, classNode.access)}")
+        appender.append("version: ${Util.parseVersion(classNode.version)} (${classNode.version})")
+        appender.append("access: ${Util.parseAccess(Util.CLASS, classNode.access)} (${classNode.access})")
 
         appender.append("")
 
@@ -174,7 +174,7 @@ object ClassNodeParser {
     }
 
     fun parseInnerClassNode(innerClassNode: InnerClassNode): String {
-        return "!access: ${Util.parseAccess(Util.CLASS, innerClassNode.access)}\n" +
+        return "!access: ${Util.parseAccess(Util.CLASS, innerClassNode.access)} (${innerClassNode.access})\n" +
                 "${Util.parseAsModifiersStr(Util.CLASS, innerClassNode.access)} ${Util.parseType(innerClassNode.outerName)}.${innerClassNode.innerName} -> ${Util.parseType(innerClassNode.name)}"
     }
 
@@ -183,7 +183,7 @@ object ClassNodeParser {
         val buffer = StringBuilder()
 
 
-        buffer.append("!access: ${Util.parseAccess(Util.FIELD, fieldNode.access)}\n")
+        buffer.append("!access: ${Util.parseAccess(Util.FIELD, fieldNode.access)} (${fieldNode.access})\n")
 
         fieldNode.signature?.let {
             buffer.append("!signature: $it\n")
@@ -209,7 +209,7 @@ object ClassNodeParser {
     fun parseMethodNode(methodNode: MethodNode, appendFrames: Boolean): String {
         val appender = Appender.Joiner(StringJoiner("\n"))
 
-        appender.append("!access: ${Util.parseAccess(Util.FIELD, methodNode.access)}")
+        appender.append("!access: ${Util.parseAccess(Util.METHOD, methodNode.access)} (${methodNode.access})")
 
         methodNode.signature?.let {
             appender.append("!signature: $it")
@@ -230,7 +230,7 @@ object ClassNodeParser {
         val parameterList = methodNode.parameters.orEmpty() as List<ParameterNode>
 
         parameterList.forEach {
-            appender.append("!parameter[name: ${it.name}, access: ${it.access} (${Util.parseAccess(Util.PARAMETER, it.access)})]")
+            appender.append("!parameter[name: ${it.name}, access: ${Util.parseAccess(Util.PARAMETER, it.access)} (${it.access})]")
         }
 
         val parameterAnnotations = ((methodNode.visibleParameterAnnotations.orEmpty() as Array<List<*>>) + (methodNode.invisibleParameterAnnotations.orEmpty() as Array<List<*>>)) as Array<List<AnnotationNode>>

src/main/kotlin/com/github/jonathanxd/bytecodedisassembler/MethodInstructionsParser.kt

@@ -29,6 +29,7 @@ package com.github.jonathanxd.bytecodedisassembler
 
 import org.objectweb.asm.Handle
 import org.objectweb.asm.Opcodes
+import org.objectweb.asm.Type
 import org.objectweb.asm.tree.*
 
 object MethodInstructionsParser {
@@ -85,7 +86,12 @@ object MethodInstructionsParser {
                         else it
                     }
 
-                    normalAppender.append("ldc $cst              // type: ${cst.javaClass.canonicalName}")
+                    val type = if (cst is Type)
+                        Class::class.java.canonicalName
+                    else
+                        cst.javaClass.canonicalName
+
+                    normalAppender.append("ldc $cst              // type: $type")
                 }
                 is IntInsnNode -> {
                     if (it.operand == Opcodes.NEWARRAY) {
@@ -115,7 +121,7 @@ object MethodInstructionsParser {
                 is InsnNode -> it.apply { normalAppender.append(Util.getOpcodeName(opcode)) }
                 is IincInsnNode -> it.apply { normalAppender.append("iinc $`var` $incr") }
                 is LineNumberNode -> it.apply {
-                    val ext = if(start != null) " -> ${labelMapper.getLabelName(start)}" else ""
+                    val ext = if (start != null) " -> ${labelMapper.getLabelName(start)}" else ""
                     shortAppender.append(" LINE $line$ext")
                 }
                 is FieldInsnNode -> it.apply {