De-sigil-ification: prefix :

3 files changed, 35 insertions, 35 deletions

diff --git a/stdlib/source/library/lux/locale.lux b/stdlib/source/library/lux/locale.lux
index 89d77b0e7..59b9e26e6 100644
--- a/stdlib/source/library/lux/locale.lux
+++ b/stdlib/source/library/lux/locale.lux
@@ -1,20 +1,20 @@
 (.using
-  [library
-   [lux "*"
-    [abstract
-     [equivalence {"+" Equivalence}]
-     ["[0]" hash {"+" Hash}]]
-    [control
-     ["[0]" maybe ("[1]#[0]" functor)]]
-    [data
-     ["[0]" text
-      ["%" format {"+" format}]
-      ["[0]" encoding {"+" Encoding}]]]
-    [type
-     abstract]]]
-  [/
-   ["[0]" language {"+" Language}]
-   ["[0]" territory {"+" Territory}]])
+ [library
+  [lux "*"
+   [abstract
+    [equivalence {"+" Equivalence}]
+    ["[0]" hash {"+" Hash}]]
+   [control
+    ["[0]" maybe ("[1]#[0]" functor)]]
+   [data
+    ["[0]" text
+     ["%" format {"+" format}]
+     ["[0]" encoding {"+" Encoding}]]]
+   [type
+    [abstract {"-" pattern}]]]]
+ [/
+  ["[0]" language {"+" Language}]
+  ["[0]" territory {"+" Territory}]])
 
 (abstract: .public Locale
   Text
@@ -24,17 +24,17 @@
 
   (def: .public (locale language territory encoding)
     (-> Language (Maybe Territory) (Maybe Encoding) Locale)
-    (:abstraction (format (language.code language)
-                          (|> territory
-                              (maybe#each (|>> territory.long_code (format ..territory_separator)))
-                              (maybe.else ""))
-                          (|> encoding
-                              (maybe#each (|>> encoding.name (format ..encoding_separator)))
-                              (maybe.else "")))))
+    (abstraction (format (language.code language)
+                         (|> territory
+                             (maybe#each (|>> territory.long_code (format ..territory_separator)))
+                             (maybe.else ""))
+                         (|> encoding
+                             (maybe#each (|>> encoding.name (format ..encoding_separator)))
+                             (maybe.else "")))))
 
   (def: .public code
     (-> Locale Text)
-    (|>> :representation))
+    (|>> representation))
 
   (def: .public hash
     (Hash Locale)
diff --git a/stdlib/source/library/lux/locale/language.lux b/stdlib/source/library/lux/locale/language.lux
index 50604e065..3685740da 100644
--- a/stdlib/source/library/lux/locale/language.lux
+++ b/stdlib/source/library/lux/locale/language.lux
@@ -7,7 +7,7 @@
    [data
     ["[0]" text]]
    [type
-    abstract]
+    [abstract {"-" pattern}]]
    [macro
     ["[0]" template]]]])
 
@@ -20,7 +20,7 @@
   (template [<name> <tag>]
     [(def: .public <name>
        (-> Language Text)
-       (|>> :representation (the <tag>)))]
+       (|>> representation (the <tag>)))]
 
     [name #name]
     [code #code]
@@ -31,8 +31,8 @@
        (template [<code> <name> <definition> <alias>+]
          [(def: .public <definition>
             Language
-            (:abstraction [#name <name>
-                           #code <code>]))
+            (abstraction [#name <name>
+                          #code <code>]))
           (`` (template [<alias>]
                 [(def: .public <alias>
                    Language
diff --git a/stdlib/source/library/lux/locale/territory.lux b/stdlib/source/library/lux/locale/territory.lux
index 8df6f861d..dcbf207e7 100644
--- a/stdlib/source/library/lux/locale/territory.lux
+++ b/stdlib/source/library/lux/locale/territory.lux
@@ -7,7 +7,7 @@
    [data
     ["[0]" text]]
    [type
-    abstract]
+    [abstract {"-" pattern}]]
    [macro
     ["[0]" template]]]])
 
@@ -22,7 +22,7 @@
   (template [<name> <field> <type>]
     [(def: .public <name>
        (-> Territory <type>)
-       (|>> :representation
+       (|>> representation
             (the <field>)))]
 
     [name         #name  Text]
@@ -34,10 +34,10 @@
   (template [<short> <long> <number> <name> <main> <neighbor>+]
     [(def: .public <main>
        Territory
-       (:abstraction [#name <name>
-                      #short <short>
-                      #long <long>
-                      #code <number>]))
+       (abstraction [#name <name>
+                     #short <short>
+                     #long <long>
+                     #code <number>]))
 
      (`` (template [<neighbor>]
            [(def: .public <neighbor> Territory <main>)]
@@ -307,7 +307,7 @@
     (def: &equivalence ..equivalence)
     
     (def: hash
-      (|>> :representation
+      (|>> representation
            (the #long)
            (# text.hash hash))))
   )