From 5e45337f2829376a552d4ff26121125c135aa2b7 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 5 Jul 2020 18:55:19 -0400
Subject: Got the JS compiler code to build again.

---
 lux-jvm/source/program.lux | 50 +++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 29 deletions(-)

(limited to 'lux-jvm/source/program.lux')

diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux
index d5f9ecb0b..2dcbd5471 100644
--- a/lux-jvm/source/program.lux
+++ b/lux-jvm/source/program.lux
@@ -33,13 +33,13 @@
      [language
       [lux
        [analysis
-        ["." macro (#+ Expander)]]
+        [macro (#+ Expander)]]
        [phase
         [extension (#+ Phase Bundle Operation Handler Extender)
          ["." analysis #_
           ["#" jvm]]
-         ["." generation #_
-          ["#" jvm]]
+         ## ["." generation #_
+         ##  ["#" jvm]]
          ## ["." directive #_
          ##  ["#" jvm]]
          ]
@@ -151,34 +151,26 @@
              (host.array-write 4 (:coerce java/lang/Object state)))
          method))))
 
-(def: (target service)
-  (-> /cli.Service /cli.Target)
-  (case service
-    (^or (#/cli.Compilation [sources libraries target module])
-         (#/cli.Interpretation [sources libraries target module])
-         (#/cli.Export [sources target]))
-    target))
-
 (def: (declare-success! _)
   (-> Any (Promise Any))
   (promise.future (io.exit +0)))
 
 (program: [{service /cli.service}]
-  (let [jar-path (format (..target service) (:: file.system separator) "program.jar")]
-    (exec (do promise.monad
-            [_ (/.compiler {#/static.host @.jvm
-                            #/static.host-module-extension ".jvm"
-                            #/static.target (..target service)
-                            #/static.artifact-extension ".class"}
-                           ..expander
-                           analysis.bundle
-                           ..platform
-                           ## generation.bundle
-                           translation.bundle
-                           (directive.bundle ..extender)
-                           (jvm/program.program jvm/runtime.class-name)
-                           ..extender
-                           service
-                           [packager.package jar-path])]
-            (..declare-success! []))
-      (io.io []))))
+  (exec (do promise.monad
+          [_ (/.compiler {#/static.host @.jvm
+                          #/static.host-module-extension ".jvm"
+                          #/static.target (/cli.target service)
+                          #/static.artifact-extension ".class"}
+                         ..expander
+                         analysis.bundle
+                         ..platform
+                         ## generation.bundle
+                         translation.bundle
+                         (directive.bundle ..extender)
+                         (jvm/program.program jvm/runtime.class-name)
+                         ..extender
+                         service
+                         [packager.package
+                          (format (/cli.target service) (:: file.system separator) "program.jar")])]
+          (..declare-success! []))
+    (io.io [])))
-- 
cgit v1.2.3