From 3eabc421e559e7e2f903e06eb6b47a2ee0cd25b9 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 20 Nov 2017 21:46:49 -0400
Subject: - Added parallel compilation. - Added aliasing. - Several bug fixes.
 - Some minor refactoring.

---
 new-luxc/source/luxc/lang/translation/eval.jvm.lux | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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

diff --git a/new-luxc/source/luxc/lang/translation/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/eval.jvm.lux
index 11baa3856..6b9ee9743 100644
--- a/new-luxc/source/luxc/lang/translation/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/eval.jvm.lux
@@ -1,7 +1,8 @@
 (;module:
   lux
   (lux (control monad)
-       (data text/format)
+       (data [text]
+             text/format)
        [macro]
        [host #+ do-to])
   (luxc ["&" lang]
@@ -56,8 +57,10 @@
 (def: #export (eval valueI)
   (-> $;Inst (Meta Top))
   (do macro;Monad<Meta>
-    [class-name (:: @ map %code (macro;gensym "eval"))
-     #let [writer (|> (do-to (ClassWriter.new ClassWriter.COMPUTE_MAXS)
+    [current-module macro;current-module-name
+     class-name (:: @ map %code (macro;gensym (format current-module "/eval")))
+     #let [store-name (text;replace-all "/" "." class-name)
+           writer (|> (do-to (ClassWriter.new ClassWriter.COMPUTE_MAXS)
                         (ClassWriter.visit [commonT;bytecode-version
                                             (i.+ Opcodes.ACC_PUBLIC Opcodes.ACC_SUPER)
                                             class-name
@@ -70,11 +73,11 @@
                                  "<clinit>"
                                  ($t;method (list) #;None (list))
                                  (|>. valueI
-                                      ($i;PUTSTATIC class-name commonT;value-field commonT;$Object)
+                                      ($i;PUTSTATIC store-name commonT;value-field commonT;$Object)
                                       $i;RETURN)))
            bytecode (ClassWriter.toByteArray [] (do-to writer (ClassWriter.visitEnd [])))]
-     _ (commonT;store-class class-name bytecode)
-     class (commonT;load-class class-name)]
+     _ (commonT;store-class store-name bytecode)
+     class (commonT;load-class store-name)]
     (wrap (|> class
               (Class.getField [commonT;value-field])
               (Field.get (host;null))))))
-- 
cgit v1.2.3