diff options
Diffstat (limited to '')
| -rw-r--r-- | new-luxc/source/luxc/lang/translation/jvm.lux | 7 | ||||
| -rw-r--r-- | new-luxc/source/program.lux | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/new-luxc/source/luxc/lang/translation/jvm.lux b/new-luxc/source/luxc/lang/translation/jvm.lux index 569da0bd9..f98438902 100644 --- a/new-luxc/source/luxc/lang/translation/jvm.lux +++ b/new-luxc/source/luxc/lang/translation/jvm.lux @@ -29,6 +29,7 @@ [lux ["." generation]]] [meta + [io (#+ lux-context)] [archive [descriptor (#+ Module)] ["." artifact]]]]]] @@ -97,13 +98,9 @@ (-> Text Text) (text.replace-all ..class-path-separator .module-separator)) -## TODO: This is a hackish solution to the issue I have. -## It should be cleaned up ASAP. -(def: prefix "lux.") - (def: #export (class-name [module-id artifact-id]) (-> generation.Context Text) - (format ..prefix (%.nat module-id) ..class-path-separator (%.nat artifact-id))) + (format lux-context "." (%.nat module-id) ..class-path-separator (%.nat artifact-id))) (def: (evaluate! library loader eval-class valueI) (-> Library ClassLoader Text Inst (Try [Any Definition])) diff --git a/new-luxc/source/program.lux b/new-luxc/source/program.lux index 5fbbd0537..dc293cf81 100644 --- a/new-luxc/source/program.lux +++ b/new-luxc/source/program.lux @@ -163,5 +163,6 @@ jvm/program.program ..extender service + ".class" [(packager.package jvm/program.class) jar-path]) (io.io [])))) |