Post annotations clean-up.

5 files changed, 22 insertions, 29 deletions

diff --git a/stdlib/source/library/lux/tool/compiler/language/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux.lux
index 37ccff163..251a543a3 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux.lux
@@ -23,7 +23,7 @@
 (def: .public writer
   (Writer .Module)
   (let [definition (: (Writer Definition)
-                      ($_ _.and _.bit _.type _.code _.any))
+                      ($_ _.and _.bit _.type _.any))
         labels (: (Writer [Text (List Text)])
                   (_.and _.text (_.list _.text)))
         global_type (: (Writer [Bit Type (Either [Text (List Text)]
@@ -57,7 +57,7 @@
 (def: .public parser
   (Parser .Module)
   (let [definition (: (Parser Definition)
-                      ($_ <>.and <b>.bit <b>.type <b>.code <b>.any))
+                      ($_ <>.and <b>.bit <b>.type <b>.any))
         labels (: (Parser [Text (List Text)])
                   (<>.and <b>.text (<b>.list <b>.text)))
         global_type (: (Parser [Bit Type (Either [Text (List Text)]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
index b38712c22..33b1c7e32 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
@@ -42,7 +42,7 @@
         (#.Alias real_def_name)
         (definition real_def_name)
         
-        (#.Definition [exported? actualT def_anns _])
+        (#.Definition [exported? actualT _])
         (do !
           [_ (//type.infer actualT)
            (^@ def_name [::module ::name]) (///extension.lifted (meta.normal def_name))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index bf517b526..a8e9ae29f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -214,7 +214,7 @@
                       (do !
                         [input_type (///.lifted (meta.definition (name_of .Macro')))]
                         (case input_type
-                          (^or (#.Definition [exported? def_type def_data def_value])
+                          (^or (#.Definition [exported? def_type def_value])
                                (#.Type [exported? def_value labels]))
                           (in (:as Type def_value))
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
index c9a050c6d..1da688392 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
@@ -219,16 +219,15 @@
   (-> Expander /////analysis.Bundle Handler)
   (function (_ extension_name phase archive inputsC+)
     (case inputsC+
-      (^ (list [_ (#.Identifier ["" short_name])] valueC annotationsC exported?C))
+      (^ (list [_ (#.Identifier ["" short_name])] valueC exported?C))
       (do phase.monad
         [current_module (/////directive.lifted_analysis
                          (///.lifted meta.current_module_name))
          .let [full_name [current_module short_name]]
          [type valueT value] (..definition archive full_name #.None valueC)
          [_ _ exported?] (evaluate! archive Bit exported?C)
-         [_ _ annotations] (evaluate! archive Code annotationsC)
          _ (/////directive.lifted_analysis
-            (module.define short_name (#.Definition [(:as Bit exported?) type (:as Code annotations) value])))
+            (module.define short_name (#.Definition [(:as Bit exported?) type value])))
          _ (..refresh expander host_analysis)
          _ (..announce_definition! short_name type)]
         (in /////directive.no_requirements))
@@ -248,19 +247,17 @@
 (def: (def::type_tagged expander host_analysis)
   (-> Expander /////analysis.Bundle Handler)
   (..custom
-   [($_ <>.and <code>.local_identifier <code>.any <code>.any
+   [($_ <>.and <code>.local_identifier <code>.any
         (<>.or (<code>.form (<>.some <code>.text))
                (<code>.tuple (<>.some <code>.text)))
         <code>.any)
-    (function (_ extension_name phase archive [short_name valueC annotationsC labels exported?C])
+    (function (_ extension_name phase archive [short_name valueC labels exported?C])
       (do phase.monad
         [current_module (/////directive.lifted_analysis
                          (///.lifted meta.current_module_name))
          .let [full_name [current_module short_name]]
          [_ _ exported?] (evaluate! archive Bit exported?C)
-         [_ _ annotations] (evaluate! archive Code annotationsC)
-         .let [exported? (:as Bit exported?)
-               annotations (:as Code annotations)]
+         .let [exported? (:as Bit exported?)]
          [type valueT value] (..definition archive full_name (#.Some .Type) valueC)
          labels (/////directive.lifted_analysis
                  (do phase.monad
@@ -272,7 +269,7 @@
                                              [true slots])]
                     _ (case labels
                         #.End
-                        (module.define short_name (#.Definition [exported? type annotations value]))
+                        (module.define short_name (#.Definition [exported? type value]))
 
                         (#.Item labels)
                         (module.define short_name (#.Type [exported? (:as .Type value) (if record?
@@ -294,21 +291,17 @@
 (def: def::module
   Handler
   (..custom
-   [($_ <>.and <code>.any ..imports)
-    (function (_ extension_name phase archive [annotationsC imports])
+   [..imports
+    (function (_ extension_name phase archive imports)
       (do [! phase.monad]
-        [[_ _ annotationsV] (evaluate! archive Code annotationsC)
-         .let [annotationsV (:as Code annotationsV)]
-         _ (/////directive.lifted_analysis
-            (do !
-              [_ (monad.each ! (function (_ [module alias])
-                                 (do !
-                                   [_ (module.import module)]
-                                   (case alias
-                                     "" (in [])
-                                     _ (module.alias alias module))))
-                             imports)]
-              (module.set_annotations annotationsV)))]
+        [_ (/////directive.lifted_analysis
+            (monad.each ! (function (_ [module alias])
+                            (do !
+                              [_ (module.import module)]
+                              (case alias
+                                "" (in [])
+                                _ (module.alias alias module))))
+                        imports))]
         (in [#/////directive.imports imports
              #/////directive.referrals (list)])))]))
 
diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
index cdd999306..d6a427d0b 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
@@ -330,11 +330,11 @@
                                     [#.Label]
                                     [#.Slot])
                                    
-                                   (#.Definition [exported? type annotations _])
+                                   (#.Definition [exported? type _])
                                    (|> definitions
                                        (dictionary.value def_name)
                                        try.of_maybe
-                                       (\ ! each (|>> [exported? type annotations]
+                                       (\ ! each (|>> [exported? type]
                                                       #.Definition
                                                       [def_name])))