From b63ac226cc2ea843f08f7c72b18d22602462c624 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 7 Sep 2019 01:50:37 -0400
Subject: Modified compiler's machinery to use the new abstractions for
 descriptors and signatures.

---
 new-luxc/source/luxc/lang/translation/jvm/structure.lux | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'new-luxc/source/luxc/lang/translation/jvm/structure.lux')

diff --git a/new-luxc/source/luxc/lang/translation/jvm/structure.lux b/new-luxc/source/luxc/lang/translation/jvm/structure.lux
index e224f1f2f..81730e6bf 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/structure.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/structure.lux
@@ -13,8 +13,10 @@
      ["." list]]]
    [target
     [jvm
-     [type
-      ["." descriptor]]]]
+     ["." type (#+ Type)
+      ["." category (#+ Void Value Return Primitive Object Class Array Var Parameter Method)]
+      ["." descriptor (#+ Descriptor)]
+      ["." signature (#+ Signature)]]]]
    [tool
     [compiler
      [synthesis (#+ Synthesis)]
@@ -66,8 +68,9 @@
                               lefts)))
                (flagI right?)
                memberI
-               (_.INVOKESTATIC (descriptor.class //.runtime-class)
+               (_.INVOKESTATIC (type.class //.runtime-class (list))
                                "variant_make"
-                               (descriptor.method [(list //runtime.$Tag //runtime.$Flag //runtime.$Value)
-                                                   //.$Variant])
+                               (type.method [(list //runtime.$Tag //runtime.$Flag //runtime.$Value)
+                                             //.$Variant
+                                             (list)])
                                #0)))))
-- 
cgit v1.2.3