Minor naming & syntax improvements.

6 files changed, 13 insertions, 12 deletions

diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux
index dee8675be..501ca50ad 100644
--- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -10,6 +10,7 @@
     ["[0]" exception (.only Exception)]]
    [data
     ["[0]" text (.only)
+     [char (.only Char)]
      ["%" \\format (.only format)]]
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]
@@ -102,7 +103,7 @@
     (list ["Text" (%.text text)])))
  
  (def text_char
-   (Parser text.Char)
+   (Parser Char)
    (do <>.monad
      [raw <code>.text]
      (when (text.size raw)
@@ -119,7 +120,7 @@
           <code>.any)
      (function (_ extension_name phase archive [input conditionals else])
        (do [! phase.monad]
-         [input (<| (typeA.expecting text.Char)
+         [input (<| (typeA.expecting Char)
                     (phase archive input))
           expectedT meta.expected_type
           conditionals (monad.each ! (function (_ [cases branch])
@@ -215,7 +216,7 @@
 
 (def with_io_extensions
   (-> Bundle Bundle)
-  (|>> (install "log#" (unary Text Any))
+  (|>> (install "log!#" (unary Text Any))
        (install "error#" (unary Text Nothing))))
 
 (def I64*
diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/generation/jvm/common.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/generation/jvm/common.lux
index a776e83e6..5f17ba7cc 100644
--- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/generation/jvm/common.lux
+++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/generation/jvm/common.lux
@@ -395,7 +395,7 @@
 
 (def with_io_extensions
   (-> Bundle Bundle)
-  (|>> (dictionary.has "log#|generation" (unary ..io::log))
+  (|>> (dictionary.has "log!#|generation" (unary ..io::log))
        (dictionary.has "error#|generation" (unary ..io::error))))
 
 (def .public bundle
diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive.lux b/stdlib/source/library/lux/meta/compiler/meta/archive.lux
index fd16fb8f3..ca3dd65b4 100644
--- a/stdlib/source/library/lux/meta/compiler/meta/archive.lux
+++ b/stdlib/source/library/lux/meta/compiler/meta/archive.lux
@@ -28,7 +28,7 @@
    [meta
     ["[0]" configuration (.only Configuration)]
     [type
-     [primitive (.except)]]]]]
+     ["[0]" primitive (.except def)]]]]]
  [/
   ["[0]" artifact]
   ["[0]" registry (.only Registry)]
@@ -73,7 +73,7 @@
     #output Output
     #registry Registry]))
 
-(primitive .public Archive
+(primitive.def .public Archive
   (Record
    [#next module.ID
     #resolver (Dictionary descriptor.Module [module.ID (Maybe (Entry Any))])])
diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/key.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/key.lux
index 24db1094f..09a246977 100644
--- a/stdlib/source/library/lux/meta/compiler/meta/archive/key.lux
+++ b/stdlib/source/library/lux/meta/compiler/meta/archive/key.lux
@@ -3,11 +3,11 @@
   [lux (.except)
    [meta
     [type
-     [primitive (.except)]]]]]
+     ["[0]" primitive (.except def)]]]]]
  [//
   [signature (.only Signature)]])
 
-(primitive .public (Key k)
+(primitive.def .public (Key k)
   Signature
 
   (def .public signature
diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux
index 3c0df9cbc..3068bb35a 100644
--- a/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux
+++ b/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux
@@ -15,7 +15,7 @@
      ["[1]" \\format (.only Format)]]]
    [meta
     [type (.only sharing)
-     [primitive (.except)]]]]]
+     ["[0]" primitive (.except def)]]]]]
  [///
   ["[0]" signature (.only Signature) (.use "[1]#[0]" equivalence)]
   ["[0]" key (.only Key)]])
@@ -26,7 +26,7 @@
    (list ["Expected" (signature.description expected)]
          ["Actual" (signature.description actual)])))
 
-(primitive .public (Document d)
+(primitive.def .public (Document d)
   (Record
    [#signature Signature
     #content d])
diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux
index e3d675ec0..2bdb6c8d4 100644
--- a/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux
+++ b/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux
@@ -24,13 +24,13 @@
     [macro
      ["^" pattern]]
     [type
-     [primitive (.except)]]]]]
+     ["[0]" primitive (.except def)]]]]]
  ["[0]" //
   ["[0]" unit]
   ["[1]" artifact (.only Artifact ID)
    ["[2][0]" category (.only Category)]]])
 
-(primitive .public Registry
+(primitive.def .public Registry
   (Record
    [#artifacts (Sequence [Artifact (Set unit.ID)])
     #resolver (Dictionary Text [ID (Maybe //category.Definition)])])