- Tested the compilation for "nat" procedures.

- Expanded the runtime.
- Some bug-fixes and refactorings.

1 files changed, 16 insertions, 10 deletions

diff --git a/new-luxc/source/luxc/generator/host/jvm/def.lux b/new-luxc/source/luxc/generator/host/jvm/def.lux
index 6f0f97d9b..42cfa2d68 100644
--- a/new-luxc/source/luxc/generator/host/jvm/def.lux
+++ b/new-luxc/source/luxc/generator/host/jvm/def.lux
@@ -2,6 +2,7 @@
   lux
   (lux (data [text]
              text/format
+             [product]
              (coll ["a" array]
                    [list "L/" Functor<List>]))
        [host #+ jvm-import do-to])
@@ -154,11 +155,11 @@
                                                 <flag>
                                                 (visibility-flag visibility)
                                                 (class-flag config))
-                                            name
+                                            ($t;binary-name name)
                                             (parameters-signature parameters super interfaces)
-                                            (|> super class-to-type $t;descriptor)
+                                            (|> super product;left $t;binary-name)
                                             (|> interfaces
-                                                (L/map (|>. class-to-type $t;descriptor))
+                                                (L/map (|>. product;left $t;binary-name))
                                                 string-array)]))
                       definitions)
            _ (ClassWriter.visitEnd [] writer)]
@@ -181,11 +182,11 @@
                                              Opcodes.ACC_INTERFACE
                                              (visibility-flag visibility)
                                              (class-flag config))
-                                         name
+                                         ($t;binary-name name)
                                          (parameters-signature parameters $Object interfaces)
-                                         (|> $Object class-to-type $t;descriptor)
+                                         (|> $Object product;left $t;binary-name)
                                          (|> interfaces
-                                             (L/map (|>. class-to-type $t;descriptor))
+                                             (L/map (|>. product;left $t;binary-name))
                                              string-array)]))
                    definitions)
         _ (ClassWriter.visitEnd [] writer)]
@@ -198,7 +199,7 @@
     (let [=method (ClassWriter.visitMethod [($_ i.+
                                                 (visibility-flag visibility)
                                                 (method-flag config))
-                                            name
+                                            ($t;binary-name name)
                                             ($t;method-descriptor type)
                                             ($t;method-signature type)
                                             (exceptions-array type)]
@@ -217,7 +218,7 @@
                                                 (visibility-flag visibility)
                                                 (method-flag config)
                                                 Opcodes.ACC_ABSTRACT)
-                                            name
+                                            ($t;binary-name name)
                                             ($t;method-descriptor type)
                                             ($t;method-signature type)
                                             (exceptions-array type)]
@@ -231,7 +232,10 @@
     (let [=field (do-to (ClassWriter.visitField [($_ i.+
                                                      (visibility-flag visibility)
                                                      (field-flag config))
-                                                 name ($t;descriptor type) ($t;signature type) (host;null)] writer)
+                                                 ($t;binary-name name)
+                                                 ($t;descriptor type)
+                                                 ($t;signature type)
+                                                 (host;null)] writer)
                    (FieldVisitor.visitEnd []))]
       writer)))
 
@@ -242,7 +246,9 @@
        (let [=field (do-to (ClassWriter.visitField [($_ i.+
                                                         (visibility-flag visibility)
                                                         (field-flag config))
-                                                    name ($t;descriptor <jvm-type>) ($t;signature <jvm-type>)
+                                                    ($t;binary-name name)
+                                                    ($t;descriptor <jvm-type>)
+                                                    ($t;signature <jvm-type>)
                                                     (<prepare> value)]
                                                    writer)
                       (FieldVisitor.visitEnd []))]