From 3028cc4f45d2d7d66456467de506341800df14d8 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 16 Oct 2019 02:19:52 -0400
Subject: Now allowing types for methods.

---
 new-luxc/source/luxc/lang/host/jvm/inst.lux | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'new-luxc/source/luxc/lang/host/jvm/inst.lux')

diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index d5d7cb1fb..e52d11d9b 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -27,8 +27,7 @@
      ["." type (#+ Type) ("#@." equivalence)
       [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
       ["." box]
-      ["." signature (#+ Signature)]
-      ["." descriptor (#+ Descriptor)]
+      ["." descriptor]
       ["." reflection]]]]
    [tool
     [compiler
@@ -297,14 +296,14 @@
                                                                (undefined)))))))
 
 (template [<name> <inst> <interface?>]
-  [(def: #export (<name> class method-name [method-signature method-descriptor])
-     (-> (Type Class) Text [(Signature Method) (Descriptor Method)] Inst)
+  [(def: #export (<name> class method-name method)
+     (-> (Type Class) Text (Type Method) Inst)
      (function (_ visitor)
        (do-to visitor
          (org/objectweb/asm/MethodVisitor::visitMethodInsn (<inst>)
                                                            (..class-name class)
                                                            method-name
-                                                           (descriptor.descriptor method-descriptor)
+                                                           (|> method type.descriptor descriptor.descriptor)
                                                            <interface?>))))]
 
   [INVOKESTATIC    org/objectweb/asm/Opcodes::INVOKESTATIC false]
-- 
cgit v1.2.3