improve jvdasm output

Author: huettenhain

refinery/lib/java.py

@@ -115,9 +115,11 @@ def __init__(self, reader: StructReader, **kwargs):
         super().__init__(reader, **kwargs)
         self.value = reader.u16()
 
-    def __repr__(self): return repr(self.value)
+    def __repr__(self):
+        return repr(self.value)
 
-    def __str__(self): return self.value
+    def __str__(self):
+        return self.value
 
 
 class JvClassProperty(_HasPoolAndTag):
@@ -129,7 +131,10 @@ def __init__(self, reader: StructReader, **kwargs):
         self.name = reader.u16()
         self.info = reader.u16()
 
-    def __repr__(self): return F'{self.name}::{self.info}'
+    def __repr__(self):
+        name: str = str(self.name)
+        name = '.'.join(name.split('/'))
+        return F'{name}::{self.info}'
 
 
 class JvMethodHandle(_HasPoolAndTag):

refinery/units/formats/java/jvdasm.py

@@ -10,6 +10,36 @@
 from refinery.lib.java import JvClassFile, JvCode, opc
 
 
+def _parse_descriptor(descriptor: str):
+    def parse_type_list(args: str):
+        while args:
+            suffix = ''
+            while args.startswith('['):
+                args = args[1:]
+                suffix += '[]'
+            code, args = args[0], args[1:]
+            if code == 'L':
+                spec, _, args = args.partition(';')
+                spec = spec.replace('/', '.')
+            else:
+                spec = {
+                    'Z': 'boolean',
+                    'B': 'byte',
+                    'S': 'short',
+                    'I': 'int',
+                    'J': 'long',
+                    'F': 'float',
+                    'D': 'double',
+                    'C': 'char',
+                    'V': 'void',
+                }[code]
+            yield spec + suffix
+
+    args, retval = re.match(R'^\((.*?)\)(.*?)$', descriptor).groups()
+    retval, = parse_type_list(retval)
+    return retval, tuple(parse_type_list(args))
+
+
 class jvdasm(PathExtractorUnit):
     """
     Disassembles the JVM bytecode instructions of methods of classes defined in Java class
@@ -33,8 +63,9 @@ def unpack(self, data):
                 continue
             code: JvCode = attribute.parse(JvCode)
             with io.StringIO() as display:
-                args, retval = re.match(R'^\((.*?)\)(.*?)$', method.descriptor).groups()
-                print(F'{jc.this!s}::{method!s}{method.descriptor}', file=display)
+                rv, args = _parse_descriptor(method.descriptor)
+                args = ', '.join(args)
+                print(F'{rv} {jc.this!s}::{method!s}({args})', file=display)
                 for op in code.disassembly:
                     olen = len(op.raw)
                     if op.table is None: