From 86c04a4ce3be995edf14ae7f3bf1e137d478c40e Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 15 Sep 2021 01:52:03 -0400
Subject: Correctly analyzing records in the presence of local bindings.

---
 lux-jvm/source/luxc/lang/directive/jvm.lux                  | 4 ++--
 lux-jvm/source/luxc/lang/host/jvm/inst.lux                  | 2 +-
 lux-jvm/source/luxc/lang/translation/jvm/case.lux           | 2 +-
 lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux | 2 +-
 lux-jvm/source/luxc/lang/translation/jvm/function.lux       | 2 +-
 lux-jvm/source/luxc/lang/translation/jvm/runtime.lux        | 2 +-
 lux-jvm/source/luxc/lang/translation/jvm/structure.lux      | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'lux-jvm/source/luxc/lang')

diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index 1d1c4c278..e22d9c427 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" Type static local}
+   [lux {"-" Type Primitive static local}
     ["[0]" ffi {"+" Inheritance Privacy State import:}]
     [abstract
      ["[0]" monad {"+" do}]]
@@ -540,7 +540,7 @@
                   <type_vars> (as_is <anchor> <expression> <directive>)]
   (type: Handler'
     ... (generation.Handler jvm.Anchor (/.Bytecode Inst /.Label) jvm.Definition)
-    (-> extension.Symbol
+    (-> extension.Name
         (phase.Phase [(extension.Bundle <type_vars>)
                       (generation.State <type_vars>)]
                      Synthesis
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index 1384d1a73..597426143 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" Type int char try}
+   [lux {"-" Type Primitive int char try}
     ["[0]" ffi {"+" import: do_to}]
     [abstract
      [monad {"+" do}]]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/case.lux b/lux-jvm/source/luxc/lang/translation/jvm/case.lux
index 032b058df..1cded57dd 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/case.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/case.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" Type Label if let case}
+   [lux {"-" Type Label Primitive if let case}
     [abstract
      ["[0]" monad {"+" do}]]
     [control
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
index a8becd813..c31d9b90b 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" Type Label primitive int char type}
+   [lux {"-" Type Label Primitive int char type}
     [ffi {"+" import:}]
     [abstract
      ["[0]" monad {"+" do}]]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/function.lux b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
index 17a246833..441eac0f6 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/function.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" Type Label function}
+   [lux {"-" Type Label Primitive function}
     [abstract
      ["[0]" monad {"+" do}]
      ["[0]" enum]]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
index ae14639f0..58d07e663 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" Type Label try}
+   [lux {"-" Type Label Primitive try}
     [abstract
      [monad {"+" do}]
      ["[0]" enum]]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
index bccdf5ec0..81f3faaa8 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" Type}
+   [lux {"-" Type Primitive}
     ["[0]" ffi {"+" import:}]
     [abstract
      ["[0]" monad {"+" do}]]
-- 
cgit v1.2.3