From 1888b5c3288e4e7653a424e7314ea5c8277ab360 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Thu, 16 Apr 2020 00:22:24 -0400
Subject: Generating definition names in a new way.

---
 new-luxc/source/luxc/lang/translation/jvm.lux         | 5 ++++-
 new-luxc/source/luxc/lang/translation/jvm/runtime.lux | 4 +---
 new-luxc/source/program.lux                           | 1 -
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'new-luxc/source')

diff --git a/new-luxc/source/luxc/lang/translation/jvm.lux b/new-luxc/source/luxc/lang/translation/jvm.lux
index 8e2cd2af6..390b1497d 100644
--- a/new-luxc/source/luxc/lang/translation/jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm.lux
@@ -96,9 +96,12 @@
 
 ## TODO: This is a hackish solution to the issue I have.
 ## It should be cleaned up ASAP.
+(def: prefix "lux.")
+
 (def: #export class-name'
   (-> Text Text)
-  (text.replace-all .module-separator ..class-path-separator))
+  (|>> (text.replace-all .module-separator ..class-path-separator)
+       (format ..prefix)))
 
 (def: #export (class-name module id)
   (-> Module artifact.ID Text)
diff --git a/new-luxc/source/luxc/lang/translation/jvm/runtime.lux b/new-luxc/source/luxc/lang/translation/jvm/runtime.lux
index eb3ed9b7f..7d6c5427e 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/runtime.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/runtime.lux
@@ -29,11 +29,9 @@
       ["_" inst]]]]]
   ["." // (#+ ByteCode)])
 
-(def: prefix "lux/")
-
 (def: #export (class-name [module id])
   (-> generation.Context Text)
-  (format ..prefix module "/" (%.nat id)))
+  (//.class-name module id))
 
 (def: $Text (type.class "java.lang.String" (list)))
 (def: #export $Tag type.int)
diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux
index 61840abf0..5fbbd0537 100644
--- a/new-luxc/source/program.lux
+++ b/new-luxc/source/program.lux
@@ -157,7 +157,6 @@
                       analysis.bundle
                       ..platform
                       @.jvm
-                      module
                       ## generation.bundle
                       translation.bundle
                       (directive.bundle extender)
-- 
cgit v1.2.3