- Re-named "lux/tool/compiler/phase/generation/js/expression" to "lux/tool/compiler/phase/generation/js".

- Did same thing for Scheme.

3 files changed, 11 insertions, 12 deletions

diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux
index 1bc5f64f4..07e0b601a 100644
--- a/lux-js/source/program.lux
+++ b/lux-js/source/program.lux
@@ -28,10 +28,9 @@
      ["/" program]
      [phase
       [macro (#+ Expander)]
-      ["." translation
-       [js
+      ["." generation
+       ["." js
         ["." runtime]
-        ["." expression]
         ["." extension]]]]
      [default
       ["." platform (#+ Platform)]]]]])
@@ -460,7 +459,7 @@
       (wrap [global value]))))
 
 (type: Host
-  (translation.Host _.Expression _.Statement))
+  (generation.Host _.Expression _.Statement))
 
 (def: host
   (IO Host)
@@ -480,8 +479,8 @@
     (wrap {#platform.&monad io.monad
            #platform.&file-system file.system
            #platform.host host
-           #platform.phase expression.translate
-           #platform.runtime runtime.translate})))
+           #platform.phase js.generate
+           #platform.runtime runtime.generate})))
 
 (program: [{service cli.service}]
   (/.compiler ..expander ..platform extension.bundle service))
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/js/expression.lux b/stdlib/source/lux/tool/compiler/phase/generation/js.lux
index e1d6dbbdb..df0db4c79 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/js/expression.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/js.lux
@@ -2,11 +2,11 @@
   [lux #*
    [control
     [monad (#+ do)]]]
-  [//
+  [/
    [runtime (#+ Phase)]
    ["." primitive]
    ["." structure]
-   ["." reference]
+   ["." reference ("#/." system)]
    ["." function]
    ["." case]
    ["." loop]
@@ -33,7 +33,7 @@
     (structure.tuple generate members)
 
     (#synthesis.Reference value)
-    (:: reference.system reference value)
+    (reference/reference value)
 
     (^ (synthesis.branch/case case))
     (case.case generate case)
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/expression.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme.lux
index 9b26ba7ab..5e1947d20 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/expression.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme.lux
@@ -2,11 +2,11 @@
   [lux #*
    [control
     [monad (#+ do)]]]
-  [//
+  [/
    [runtime (#+ Phase)]
    ["." primitive]
    ["." structure]
-   ["." reference]
+   ["." reference ("#/." system)]
    ["." function]
    ["." case]
    ["." loop]
@@ -32,7 +32,7 @@
     (structure.tuple generate members)
 
     (#synthesis.Reference value)
-    (:: reference.system reference value)
+    (reference/reference value)
 
     (^ (synthesis.branch/case case))
     (case.case generate case)