Last bug fixes to get the new JVM compiler to fully process the standard library and its tests.

4 files changed, 8 insertions, 8 deletions

diff --git a/stdlib/source/lux/tool/compiler/default/init.lux b/stdlib/source/lux/tool/compiler/default/init.lux
index ee51cd684..091d8e4a4 100644
--- a/stdlib/source/lux/tool/compiler/default/init.lux
+++ b/stdlib/source/lux/tool/compiler/default/init.lux
@@ -66,8 +66,8 @@
         eval (///analysis/evaluation.evaluator expander synthesis-state generation-state generate)
         analysis-state [(analysisE.bundle eval host-analysis)
                         (///analysis.state (///analysis.info ///version.version target))]]
-    [(dictionary.merge (luxD.bundle expander host-analysis program extender)
-                       host-directive-bundle)
+    [(dictionary.merge host-directive-bundle
+                       (luxD.bundle expander host-analysis program extender))
      {#///directive.analysis {#///directive.state analysis-state
                               #///directive.phase (analysisP.phase expander)}
       #///directive.synthesis {#///directive.state synthesis-state
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index 91d6a6447..77b9e0b8a 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -213,12 +213,12 @@
              (///bundle.install "and" (//lux.binary <type> <type> <type>))
              (///bundle.install "or" (//lux.binary <type> <type> <type>))
              (///bundle.install "xor" (//lux.binary <type> <type> <type>))
-             (///bundle.install "shl" (//lux.binary <type> Integer <type>))
-             (///bundle.install "shr" (//lux.binary <type> Integer <type>))
-             (///bundle.install "ushr" (//lux.binary <type> Integer <type>))
+             (///bundle.install "shl" (//lux.binary <type> ..int <type>))
+             (///bundle.install "shr" (//lux.binary <type> ..int <type>))
+             (///bundle.install "ushr" (//lux.binary <type> ..int <type>))
              )))]
 
-  [bundle::int  reflection.int  ..long]
+  [bundle::int  reflection.int  ..int]
   [bundle::long reflection.long ..long]
   )
 
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
index b9ae14372..91de84cd1 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
@@ -159,7 +159,7 @@
            _ (/////generation.save! false [(%.nat module-id) (%.nat id)] directive)]
           (wrap [codeG value])))))
 
-   (def: (<full> archive extension codeT codeC)
+   (def: #export (<full> archive extension codeT codeC)
      (All [anchor expression directive]
        (-> Archive Text Type Code
            (Operation anchor expression directive [expression Any])))
diff --git a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
index 0f110b906..889ac0265 100644
--- a/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
+++ b/stdlib/source/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
@@ -251,7 +251,7 @@
                                      (..right-projection lefts))]
                          (_.compose so-far next)))
                      recordG
-                     path))))
+                     (list.reverse path)))))
 
 (def: #export (case phase archive [valueS path])
   (Generator [Synthesis Path])