De-sigil-ification: ^

13 files changed, 116 insertions, 109 deletions

diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux
index a92340ce3..191a46ec5 100644
--- a/stdlib/source/program/aedifex.lux
+++ b/stdlib/source/program/aedifex.lux
@@ -83,7 +83,7 @@
                                    profile)
      [exit_code output] ((command console program (file.async file.default) (shell.async shell.default) resolution) profile)
      _ (case exit_code
-         (^ (static shell.normal))
+         (pattern (static shell.normal))
          (in [])
 
          _
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index d84234cb5..f17f27680 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -1,20 +1,20 @@
 (.using
-  [library
-   [lux "*"
-    [abstract
-     [equivalence {"+" Equivalence}]
-     [monad {"+" do}]]
-    [control
-     ["<>" parser
-      ["<[0]>" xml {"+" Parser}]
-      ["<[0]>" text]]]
-    [data
-     ["[0]" product]
-     [format
-      ["[0]" xml {"+" XML}]]]]]
-  ["[0]" // "_"
-   ["[1][0]" time {"+" Time}]
-   ["[1][0]" build {"+" Build}]])
+ [library
+  [lux "*"
+   [abstract
+    [equivalence {"+" Equivalence}]
+    [monad {"+" do}]]
+   [control
+    ["<>" parser
+     ["<[0]>" xml {"+" Parser}]
+     ["<[0]>" text]]]
+   [data
+    ["[0]" product]
+    [format
+     ["[0]" xml {"+" XML}]]]]]
+ ["[0]" // "_"
+  ["[1][0]" time {"+" Time}]
+  ["[1][0]" build {"+" Build}]])
 
 (type: .public Stamp
   (Record
@@ -39,7 +39,7 @@
        list
        {xml.#Node ..<timestamp> xml.attributes}))
 
-(def: .public (format (^open "_[0]"))
+(def: .public (format (open "_[0]"))
   (-> Stamp (List XML))
   (list (..time_format _#time)
         (//build.format _#build)))
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index d23e166c8..66923459c 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -1,21 +1,21 @@
 (.using
-  [library
-   [lux {"-" Type}
-    [abstract
-     [equivalence {"+" Equivalence}]
-     [monad {"+" do}]]
-    [control
-     ["<>" parser
-      ["<[0]>" xml {"+" Parser}]
-      ["<[0]>" text]]]
-    [data
-     ["[0]" product]
-     ["[0]" text]
-     [format
-      ["[0]" xml {"+" XML}]]]]]
-  ["[0]" /// "_"
-   ["[1][0]" type {"+" Type}]
-   ["[1][0]" time {"+" Time}]])
+ [library
+  [lux {"-" Type}
+   [abstract
+    [equivalence {"+" Equivalence}]
+    [monad {"+" do}]]
+   [control
+    ["<>" parser
+     ["<[0]>" xml {"+" Parser}]
+     ["<[0]>" text]]]
+   [data
+    ["[0]" product]
+    ["[0]" text]
+    [format
+     ["[0]" xml {"+" XML}]]]]]
+ ["[0]" /// "_"
+  ["[1][0]" type {"+" Type}]
+  ["[1][0]" time {"+" Time}]])
 
 (type: .public Version
   (Record
@@ -45,7 +45,7 @@
   (-> xml.Tag Text XML)
   (|> value {xml.#Text} list {xml.#Node tag xml.attributes}))
 
-(def: .public (format (^open "_[0]"))
+(def: .public (format (open "_[0]"))
   (-> Version XML)
   (<| {xml.#Node ..<snapshot_version> xml.attributes}
       (list (..text_format ..<extension> _#extension)
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
index f01c01522..65d30acdf 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
@@ -1,15 +1,15 @@
 (.using
-  [library
-   [lux "*"
-    [abstract
-     [equivalence {"+" Equivalence}]]
-    [data
-     ["[0]" product]
-     ["[0]" text
-      ["%" format]]]]]
-  ["[0]" /// {"+" Snapshot}
-   ["[1][0]" time]
-   ["[1][0]" stamp]])
+ [library
+  [lux "*"
+   [abstract
+    [equivalence {"+" Equivalence}]]
+   [data
+    ["[0]" product]
+    ["[0]" text
+     ["%" format]]]]]
+ ["[0]" /// {"+" Snapshot}
+  ["[1][0]" time]
+  ["[1][0]" stamp]])
 
 (type: .public Value
   (Record
@@ -29,14 +29,14 @@
 (def: .public snapshot
   "SNAPSHOT")
 
-(def: .public (format (^open "/[0]"))
+(def: .public (format (open "/[0]"))
   (%.Format Value)
   (case /#snapshot
     {///.#Local}
     /#version
     
     {///.#Remote stamp}
-    (let [(^open "/[0]") stamp]
+    (let [(open "/[0]") stamp]
       (%.format (text.replaced ..snapshot
                                (///time.format /#time)
                                /#version)
diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux
index ed66ebff2..15ce0e183 100644
--- a/stdlib/source/program/aedifex/artifact/time/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time/time.lux
@@ -1,27 +1,27 @@
 (.using
-  [library
-   [lux "*"
-    ["[0]" time]
-    [abstract
-     [monad {"+" do}]]
-    [control
-     ["<>" parser
-      ["<[0]>" text {"+" Parser}]]]
-    [data
-     [text
-      ["%" format]]]
-    [math
-     [number
-      ["n" nat]]]]]
-  ["[0]" // "_"
-   ["[1]" date]])
+ [library
+  [lux "*"
+   ["[0]" time]
+   [abstract
+    [monad {"+" do}]]
+   [control
+    ["<>" parser
+     ["<[0]>" text {"+" Parser}]]]
+   [data
+    [text
+     ["%" format]]]
+   [math
+    [number
+     ["n" nat]]]]]
+ ["[0]" // "_"
+  ["[1]" date]])
 
 (type: .public Time
   time.Time)
 
 (def: .public (format value)
   (%.Format Time)
-  (let [(^open "_[0]") (time.clock value)]
+  (let [(open "_[0]") (time.clock value)]
     (%.format (//.pad _#hour)
               (//.pad _#minute)
               (//.pad _#second))))
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 381087a49..377e33a67 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -1,33 +1,33 @@
 (.using
-  [library
-   [lux "*"
-    [abstract
-     [equivalence {"+" Equivalence}]
-     [monad {"+" do}]]
-    [control
-     ["[0]" exception {"+" exception:}]
-     ["<>" parser
-      ["<[0]>" xml {"+" Parser}]
-      ["<[0]>" text]]]
-    [data
-     ["[0]" product]
-     ["[0]" text
-      ["%" format]]
-     [format
-      ["[0]" xml {"+" XML}]]
-     [collection
-      ["[0]" list ("[1]#[0]" functor)]]]
-    [math
-     [number
-      ["n" nat]]]
-    ["[0]" time {"+" Time}
-     ["[0]" date {"+" Date}]
-     ["[0]" year]
-     ["[0]" month]]]]
-  ["[0]" // "_"
-   ["[1][0]" time]
-   ["[1][0]" snapshot {"+" Snapshot}
-    ["[1]/[0]" version {"+" Version}]]])
+ [library
+  [lux "*"
+   [abstract
+    [equivalence {"+" Equivalence}]
+    [monad {"+" do}]]
+   [control
+    ["[0]" exception {"+" exception:}]
+    ["<>" parser
+     ["<[0]>" xml {"+" Parser}]
+     ["<[0]>" text]]]
+   [data
+    ["[0]" product]
+    ["[0]" text
+     ["%" format]]
+    [format
+     ["[0]" xml {"+" XML}]]
+    [collection
+     ["[0]" list ("[1]#[0]" functor)]]]
+   [math
+    [number
+     ["n" nat]]]
+   ["[0]" time {"+" Time}
+    ["[0]" date {"+" Date}]
+    ["[0]" year]
+    ["[0]" month]]]]
+ ["[0]" // "_"
+  ["[1][0]" time]
+  ["[1][0]" snapshot {"+" Snapshot}
+   ["[1]/[0]" version {"+" Version}]]])
 
 (type: .public Versioning
   (Record
@@ -61,7 +61,7 @@
   (-> //time.Time XML)
   (|>> //time.format {xml.#Text} list {xml.#Node ..<last_updated> xml.attributes}))
 
-(def: .public (format (^open "_[0]"))
+(def: .public (format (open "_[0]"))
   (-> Versioning XML)
   (<| {xml.#Node ..<versioning> xml.attributes}
       (list (//snapshot.format _#snapshot)
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index ecbcb703f..a8a5ffbc1 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -19,6 +19,8 @@
      ["[0]" list ("[1]#[0]" functor mix)]
      ["[0]" dictionary {"+" Dictionary}]
      ["[0]" set]]]
+   [macro
+    ["^" pattern]]
    [math
     [number {"+" hex}
      ["n" nat]
@@ -102,8 +104,8 @@
     (case (..dependency_finder lux_group lux_name resolution)
       {.#Some dependency}
       (case lux_name
-        (^template [<tag> <name>]
-          [(^ (static <name>))
+        (^.template [<tag> <name>]
+          [(pattern (static <name>))
            {try.#Success [(..remove_dependency dependency resolution)
                           {<tag> dependency}]}])
         ([#JVM ..jvm_lux_name]
@@ -293,7 +295,7 @@
                                                         (with_jvm_class_path {.#Item (..path fs home dependency) host_dependencies}))
                                                     "program.jar"]
                                                    
-                                                   (^template [<tag> <runtime> <program>]
+                                                   (^.template [<tag> <runtime> <program>]
                                                      [{<tag> dependency}
                                                       [(|> dependency
                                                            (..path fs home)
diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux
index 649201465..3df3e0724 100644
--- a/stdlib/source/program/aedifex/command/test.lux
+++ b/stdlib/source/program/aedifex/command/test.lux
@@ -6,6 +6,8 @@
    [control
     [concurrency
      ["[0]" async {"+" Async} ("[1]#[0]" monad)]]]
+   [macro
+    ["^" pattern]]
    [math
     [number
      ["i" int]]]
@@ -47,7 +49,7 @@
                                                       (///runtime.for (the ///.#java profile))
                                                       (//build.with_jvm_class_path host_dependencies))
 
-                                                  (^template [<tag> <runtime>]
+                                                  (^.template [<tag> <runtime>]
                                                     [{<tag> artifact}
                                                      (///runtime.for (the <runtime> profile)
                                                                      program)])
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index 23421b264..6af53e362 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -14,6 +14,8 @@
     ["[0]" text
      ["%" format {"+" Format format}]
      ["[0]" encoding]]]
+   [macro
+    ["^" pattern]]
    [math
     [number
      ["n" nat]
@@ -135,7 +137,7 @@
               {.#None}
               (case (..hash_size input)
                 0 (constructor output)
-                (^template [<size> <write>]
+                (^.template [<size> <write>]
                   [<size>
                    (do try.monad
                      [head (# n.hex decoded input)
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index 7a2957ae0..b5aef41de 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -59,7 +59,7 @@
 
 (def: (time_format value)
   (%.Format Time)
-  (let [(^open "[0]") (time.clock value)]
+  (let [(open "[0]") (time.clock value)]
     (%.format (..pad #hour)
               (..pad #minute)
               (..pad #second))))
@@ -189,7 +189,7 @@
       
       {try.#Failure error}
       (in {try.#Success
-           (let [(^open "[0]") artifact]
+           (let [(open "[0]") artifact]
              [..#group #group
               ..#name #name
               ..#versions (list)
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 83ba59279..cc41be0b5 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -69,9 +69,9 @@
   [version_format Version ..<version> (|>)]
   )
 
-(def: .public (format (^open "/[0]"))
+(def: .public (format (open "/[0]"))
   (-> Metadata XML)
-  (let [(^open "//[0]") /#artifact]
+  (let [(open "//[0]") /#artifact]
     {xml.#Node ..<metadata>
                xml.attributes
                (list (..group_format //#group)
@@ -100,7 +100,7 @@
                                       (: (-> (List ///artifact/snapshot/version.Version)
                                              (List ///artifact/snapshot/version.Version))
                                          (|>> (pipe.case
-                                                (^ (list))
+                                                (pattern (list))
                                                 (list <default_version>)
 
                                                 versions
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index 048aabf27..56e79674b 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -16,6 +16,7 @@
      ["[0]" dictionary {"+" Dictionary}
       ["[0]" plist {"+" PList} ("[1]#[0]" monoid)]]]]
    [macro
+    ["^" pattern]
     ["[0]" template]]
    [meta
     ["[0]" symbol]]
@@ -53,7 +54,7 @@
 
   (def: (= reference subject)
     (case [reference subject]
-      (^template [<tag>]
+      (^.template [<tag>]
         [[{<tag>} {<tag>}]
          true])
       ([#Repo]
diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux
index 6252d75f2..85fe69b3c 100644
--- a/stdlib/source/program/aedifex/repository/remote.lux
+++ b/stdlib/source/program/aedifex/repository/remote.lux
@@ -67,7 +67,7 @@
                                      {.#None}
                                      http))]
       (case status
-        (^ (static http/status.ok))
+        (pattern (static http/status.ok))
         (# ! each product.right ((the @http.#body message) {.#None}))
         
         _
@@ -90,7 +90,7 @@
                                      http))
        _ ((the @http.#body message) {.#Some 0})]
       (case status
-        (^ (static http/status.created))
+        (pattern (static http/status.created))
         (in [])
         
         _