De-taggification | part 1

13 files changed, 62 insertions, 82 deletions

diff --git a/stdlib/source/library/lux/data/text/encoding/utf8.lux b/stdlib/source/library/lux/data/text/encoding/utf8.lux
index dd0881732..b8c821afd 100644
--- a/stdlib/source/library/lux/data/text/encoding/utf8.lux
+++ b/stdlib/source/library/lux/data/text/encoding/utf8.lux
@@ -24,8 +24,8 @@
                ... On Node
                (ffi.import: Buffer
                  ["#::."
-                  ("static" from #as from|encoded [ffi.String ffi.String] Buffer)
-                  ("static" from #as from|decoded [Uint8Array] Buffer)
+                  ("static" from "as" from|encoded [ffi.String ffi.String] Buffer)
+                  ("static" from "as" from|decoded [Uint8Array] Buffer)
                   (toString [ffi.String] ffi.String)])
 
                ... On the browser
@@ -40,13 +40,13 @@
                   (decode [Uint8Array] ffi.String)]))
 
         @.ruby
-        (as_is (ffi.import: String #as RubyString
+        (as_is (ffi.import: String "as" RubyString
                  ["#::."
                   (encode [Text] RubyString)
                   (force_encoding [Text] Text)
                   (bytes [] Binary)])
 
-               (ffi.import: Array #as RubyArray
+               (ffi.import: Array "as" RubyArray
                  ["#::."
                   (pack [Text] RubyString)]))
 
diff --git a/stdlib/source/library/lux/ffi.js.lux b/stdlib/source/library/lux/ffi.js.lux
index 6a130d4a1..466807a53 100644
--- a/stdlib/source/library/lux/ffi.js.lux
+++ b/stdlib/source/library/lux/ffi.js.lux
@@ -105,7 +105,7 @@
   (Parser Common_Method)
   ($_ <>.and
       <code>.local_identifier
-      (<>.maybe (<>.after (<code>.this! (' #as)) <code>.local_identifier))
+      (<>.maybe (<>.after (<code>.this! (' "as")) <code>.local_identifier))
       (<code>.tuple (<>.some ..nullable))
       (<>.parses? (<code>.this! (' "io")))
       (<>.parses? (<code>.this! (' "try")))
diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux
index 412f5c0d6..da46af60c 100644
--- a/stdlib/source/library/lux/ffi.jvm.lux
+++ b/stdlib/source/library/lux/ffi.jvm.lux
@@ -537,17 +537,17 @@
   (Parser Privacy)
   (let [(^open ".") <>.monad]
     ($_ <>.or
-        (<code>.this! (' #public))
-        (<code>.this! (' #private))
-        (<code>.this! (' #protected))
+        (<code>.this! (' "public"))
+        (<code>.this! (' "private"))
+        (<code>.this! (' "protected"))
         (in []))))
 
 (def: inheritance_modifier^
   (Parser Inheritance)
   (let [(^open ".") <>.monad]
     ($_ <>.or
-        (<code>.this! (' #final))
-        (<code>.this! (' #abstract))
+        (<code>.this! (' "final"))
+        (<code>.this! (' "abstract"))
         (in []))))
 
 (exception: .public (class_names_cannot_contain_periods {name Text})
@@ -719,14 +719,14 @@
   (Parser (List Annotation))
   (<| (<>.else (list))
       (do <>.monad
-        [_ (<code>.this! (' #ann))]
+        [_ (<code>.this! (' "ann"))]
         (<code>.tuple (<>.some ..annotation^)))))
 
 (def: (throws_decl^ type_vars)
   (-> (List (Type Var)) (Parser (List (Type Class))))
   (<| (<>.else (list))
       (do <>.monad
-        [_ (<code>.this! (' #throws))]
+        [_ (<code>.this! (' "throws"))]
         (<code>.tuple (<>.some (..class^ type_vars))))))
 
 (def: (method_decl^ type_vars)
@@ -747,14 +747,14 @@
 (def: state_modifier^
   (Parser State)
   ($_ <>.or
-      (<code>.this! (' #volatile))
-      (<code>.this! (' #final))
+      (<code>.this! (' "volatile"))
+      (<code>.this! (' "final"))
       (\ <>.monad in [])))
 
 (def: (field_decl^ type_vars)
   (-> (List (Type Var)) (Parser [Member_Declaration FieldDecl]))
   (<>.either (<code>.form (do <>.monad
-                            [_ (<code>.this! (' #const))
+                            [_ (<code>.this! (' "const"))
                              name <code>.local_identifier
                              anns ..annotations^
                              type (..type^ type_vars)
@@ -789,7 +789,7 @@
   (-> (List (Type Var)) (Parser [Member_Declaration Method_Definition]))
   (<code>.form (do <>.monad
                  [pm privacy_modifier^
-                  strict_fp? (<>.parses? (<code>.this! (' #strict)))
+                  strict_fp? (<>.parses? (<code>.this! (' "strict")))
                   method_vars (<>.else (list) ..vars^)
                   .let [total_vars (list\composite class_vars method_vars)]
                   [_ self_name arguments] (<code>.form ($_ <>.and
@@ -809,8 +809,8 @@
   (-> (List (Type Var)) (Parser [Member_Declaration Method_Definition]))
   (<code>.form (do <>.monad
                  [pm privacy_modifier^
-                  strict_fp? (<>.parses? (<code>.this! (' #strict)))
-                  final? (<>.parses? (<code>.this! (' #final)))
+                  strict_fp? (<>.parses? (<code>.this! (' "strict")))
+                  final? (<>.parses? (<code>.this! (' "final")))
                   method_vars (<>.else (list) ..vars^)
                   .let [total_vars (list\composite class_vars method_vars)]
                   [name self_name arguments] (<code>.form ($_ <>.and
@@ -829,7 +829,7 @@
 (def: overriden_method_def^
   (Parser [Member_Declaration Method_Definition])
   (<code>.form (do <>.monad
-                 [strict_fp? (<>.parses? (<code>.this! (' #strict)))
+                 [strict_fp? (<>.parses? (<code>.this! (' "strict")))
                   owner_class ..declaration^
                   method_vars (<>.else (list) ..vars^)
                   .let [total_vars (list\composite (product.right (parser.declaration owner_class))
@@ -851,7 +851,7 @@
   (Parser [Member_Declaration Method_Definition])
   (<code>.form (do <>.monad
                  [pm privacy_modifier^
-                  strict_fp? (<>.parses? (<code>.this! (' #strict)))
+                  strict_fp? (<>.parses? (<code>.this! (' "strict")))
                   _ (<code>.this! (' "static"))
                   method_vars (<>.else (list) ..vars^)
                   .let [total_vars method_vars]
@@ -870,7 +870,7 @@
   (Parser [Member_Declaration Method_Definition])
   (<code>.form (do <>.monad
                  [pm privacy_modifier^
-                  _ (<code>.this! (' #abstract))
+                  _ (<code>.this! (' "abstract"))
                   method_vars (<>.else (list) ..vars^)
                   .let [total_vars method_vars]
                   [name arguments] (<code>.form (<>.and <code>.local_identifier
@@ -887,7 +887,7 @@
   (Parser [Member_Declaration Method_Definition])
   (<code>.form (do <>.monad
                  [pm privacy_modifier^
-                  _ (<code>.this! (' #native))
+                  _ (<code>.this! (' "native"))
                   method_vars (<>.else (list) ..vars^)
                   .let [total_vars method_vars]
                   [name arguments] (<code>.form (<>.and <code>.local_identifier
@@ -914,20 +914,10 @@
   (Parser Partial_Call)
   (<code>.form (<>.and <code>.identifier (<>.some <code>.any))))
 
-(def: class_kind^
-  (Parser Class_Kind)
-  (<>.either (do <>.monad
-               [_ (<code>.this! (' #class))]
-               (in #Class))
-             (do <>.monad
-               [_ (<code>.this! (' #interface))]
-               (in #Interface))
-             ))
-
 (def: import_member_alias^
   (Parser (Maybe Text))
   (<>.maybe (do <>.monad
-              [_ (<code>.this! (' #as))]
+              [_ (<code>.this! (' "as"))]
               <code>.local_identifier)))
 
 (def: (import_member_args^ type_vars)
diff --git a/stdlib/source/library/lux/ffi.lua.lux b/stdlib/source/library/lux/ffi.lua.lux
index 4d9fcf6a1..b14c2ebe3 100644
--- a/stdlib/source/library/lux/ffi.lua.lux
+++ b/stdlib/source/library/lux/ffi.lua.lux
@@ -100,7 +100,7 @@
   (Parser Common_Method)
   ($_ <>.and
       <code>.local_identifier
-      (<>.maybe (<>.after (<code>.this! (' #as)) <code>.local_identifier))
+      (<>.maybe (<>.after (<code>.this! (' "as")) <code>.local_identifier))
       (<code>.tuple (<>.some ..nilable))
       (<>.parses? (<code>.this! (' "io")))
       (<>.parses? (<code>.this! (' "try")))
diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux
index a6dd4c4bf..9140ddab8 100644
--- a/stdlib/source/library/lux/ffi.old.lux
+++ b/stdlib/source/library/lux/ffi.old.lux
@@ -530,17 +530,17 @@
   (Parser Privacy)
   (let [(^open ".") <>.monad]
     ($_ <>.or
-        (<code>.this! (' #public))
-        (<code>.this! (' #private))
-        (<code>.this! (' #protected))
+        (<code>.this! (' "public"))
+        (<code>.this! (' "private"))
+        (<code>.this! (' "protected"))
         (in []))))
 
 (def: inheritance_modifier^
   (Parser Inheritance)
   (let [(^open ".") <>.monad]
     ($_ <>.or
-        (<code>.this! (' #final))
-        (<code>.this! (' #abstract))
+        (<code>.this! (' "final"))
+        (<code>.this! (' "abstract"))
         (in []))))
 
 (def: bound_kind^
@@ -656,7 +656,7 @@
 (def: annotations^'
   (Parser (List Annotation))
   (do <>.monad
-    [_ (<code>.this! (' #ann))]
+    [_ (<code>.this! (' "ann"))]
     (<code>.tuple (<>.some ..annotation^))))
 
 (def: annotations^
@@ -668,7 +668,7 @@
 (def: (throws_decl'^ type_vars)
   (-> (List Type_Parameter) (Parser (List GenericType)))
   (do <>.monad
-    [_ (<code>.this! (' #throws))]
+    [_ (<code>.this! (' "throws"))]
     (<code>.tuple (<>.some (..generic_type^ type_vars)))))
 
 (def: (throws_decl^ type_vars)
@@ -694,14 +694,14 @@
 (def: state_modifier^
   (Parser State)
   ($_ <>.or
-      (<code>.this! (' #volatile))
-      (<code>.this! (' #final))
+      (<code>.this! (' "volatile"))
+      (<code>.this! (' "final"))
       (\ <>.monad in [])))
 
 (def: (field_decl^ type_vars)
   (-> (List Type_Parameter) (Parser [Member_Declaration FieldDecl]))
   (<>.either (<code>.form (do <>.monad
-                            [_ (<code>.this! (' #const))
+                            [_ (<code>.this! (' "const"))
                              name <code>.local_identifier
                              anns ..annotations^
                              type (..generic_type^ type_vars)
@@ -736,7 +736,7 @@
   (-> (List Type_Parameter) (Parser [Member_Declaration Method_Definition]))
   (<code>.form (do <>.monad
                  [pm privacy_modifier^
-                  strict_fp? (<>.parses? (<code>.this! (' #strict)))
+                  strict_fp? (<>.parses? (<code>.this! (' "strict")))
                   method_vars ..type_params^
                   .let [total_vars (list\composite class_vars method_vars)]
                   [_ arg_decls] (<code>.form (<>.and (<code>.this! (' new))
@@ -754,8 +754,8 @@
   (-> (List Type_Parameter) (Parser [Member_Declaration Method_Definition]))
   (<code>.form (do <>.monad
                  [pm privacy_modifier^
-                  strict_fp? (<>.parses? (<code>.this! (' #strict)))
-                  final? (<>.parses? (<code>.this! (' #final)))
+                  strict_fp? (<>.parses? (<code>.this! (' "strict")))
+                  final? (<>.parses? (<code>.this! (' "final")))
                   method_vars ..type_params^
                   .let [total_vars (list\composite class_vars method_vars)]
                   [name this_name arg_decls] (<code>.form ($_ <>.and
@@ -777,7 +777,7 @@
 (def: overriden_method_def^
   (Parser [Member_Declaration Method_Definition])
   (<code>.form (do <>.monad
-                 [strict_fp? (<>.parses? (<code>.this! (' #strict)))
+                 [strict_fp? (<>.parses? (<code>.this! (' "strict")))
                   owner_class ..class_decl^
                   method_vars ..type_params^
                   .let [total_vars (list\composite (product.right owner_class) method_vars)]
@@ -801,7 +801,7 @@
   (Parser [Member_Declaration Method_Definition])
   (<code>.form (do <>.monad
                  [pm privacy_modifier^
-                  strict_fp? (<>.parses? (<code>.this! (' #strict)))
+                  strict_fp? (<>.parses? (<code>.this! (' "strict")))
                   _ (<code>.this! (' "static"))
                   method_vars ..type_params^
                   .let [total_vars method_vars]
@@ -820,7 +820,7 @@
   (Parser [Member_Declaration Method_Definition])
   (<code>.form (do <>.monad
                  [pm privacy_modifier^
-                  _ (<code>.this! (' #abstract))
+                  _ (<code>.this! (' "abstract"))
                   method_vars ..type_params^
                   .let [total_vars method_vars]
                   [name arg_decls] (<code>.form (<>.and <code>.local_identifier
@@ -837,7 +837,7 @@
   (Parser [Member_Declaration Method_Definition])
   (<code>.form (do <>.monad
                  [pm privacy_modifier^
-                  _ (<code>.this! (' #native))
+                  _ (<code>.this! (' "native"))
                   method_vars ..type_params^
                   .let [total_vars method_vars]
                   [name arg_decls] (<code>.form (<>.and <code>.local_identifier
@@ -864,20 +864,10 @@
   (Parser Partial_Call)
   (<code>.form (<>.and <code>.identifier (<>.some <code>.any))))
 
-(def: class_kind^
-  (Parser Class_Kind)
-  (<>.either (do <>.monad
-               [_ (<code>.this! (' #class))]
-               (in #Class))
-             (do <>.monad
-               [_ (<code>.this! (' #interface))]
-               (in #Interface))
-             ))
-
 (def: import_member_alias^
   (Parser (Maybe Text))
   (<>.maybe (do <>.monad
-              [_ (<code>.this! (' #as))]
+              [_ (<code>.this! (' "as"))]
               <code>.local_identifier)))
 
 (def: (import_member_args^ type_vars)
diff --git a/stdlib/source/library/lux/ffi.php.lux b/stdlib/source/library/lux/ffi.php.lux
index 1e7f61563..7320bb059 100644
--- a/stdlib/source/library/lux/ffi.php.lux
+++ b/stdlib/source/library/lux/ffi.php.lux
@@ -60,7 +60,7 @@
 
 (def: alias
   (Parser Alias)
-  (<>.after (<code>.this! (' #as)) <code>.local_identifier))
+  (<>.after (<code>.this! (' "as")) <code>.local_identifier))
 
 (type: Field
   [Bit Text (Maybe Alias) Nullable])
diff --git a/stdlib/source/library/lux/ffi.py.lux b/stdlib/source/library/lux/ffi.py.lux
index b523ce1e4..b49d7ddf4 100644
--- a/stdlib/source/library/lux/ffi.py.lux
+++ b/stdlib/source/library/lux/ffi.py.lux
@@ -101,7 +101,7 @@
   (Parser Common_Method)
   ($_ <>.and
       <code>.local_identifier
-      (<>.maybe (<>.after (<code>.this! (' #as)) <code>.local_identifier))
+      (<>.maybe (<>.after (<code>.this! (' "as")) <code>.local_identifier))
       (<code>.tuple (<>.some ..noneable))
       (<>.parses? (<code>.this! (' "io")))
       (<>.parses? (<code>.this! (' "try")))
diff --git a/stdlib/source/library/lux/ffi.rb.lux b/stdlib/source/library/lux/ffi.rb.lux
index 62bafd5e5..e9a5869af 100644
--- a/stdlib/source/library/lux/ffi.rb.lux
+++ b/stdlib/source/library/lux/ffi.rb.lux
@@ -62,7 +62,7 @@
 
 (def: alias
   (Parser Alias)
-  (<>.after (<code>.this! (' #as)) <code>.local_identifier))
+  (<>.after (<code>.this! (' "as")) <code>.local_identifier))
 
 (type: Field
   [Bit Text (Maybe Alias) Nilable])
diff --git a/stdlib/source/library/lux/ffi.scm.lux b/stdlib/source/library/lux/ffi.scm.lux
index 58603cef7..fb270b39c 100644
--- a/stdlib/source/library/lux/ffi.scm.lux
+++ b/stdlib/source/library/lux/ffi.scm.lux
@@ -60,7 +60,7 @@
 
 (def: alias
   (Parser Alias)
-  (<>.after (<code>.this! (' #as)) <code>.local_identifier))
+  (<>.after (<code>.this! (' "as")) <code>.local_identifier))
 
 (type: Field
   [Bit Text (Maybe Alias) Nilable])
diff --git a/stdlib/source/library/lux/macro.lux b/stdlib/source/library/lux/macro.lux
index f98f8c452..a5be7a729 100644
--- a/stdlib/source/library/lux/macro.lux
+++ b/stdlib/source/library/lux/macro.lux
@@ -158,7 +158,7 @@
            macro_name [module short]]
        (case (: (Maybe [Bit Code])
                 (case tokens
-                  (^ (list [_ (#.Tag ["" "omit"])]
+                  (^ (list [_ (#.Text "omit")]
                            token))
                   (#.Some [#1 token])
 
diff --git a/stdlib/source/library/lux/target/jvm/loader.lux b/stdlib/source/library/lux/target/jvm/loader.lux
index 796e8f0f8..daae8ca9a 100644
--- a/stdlib/source/library/lux/target/jvm/loader.lux
+++ b/stdlib/source/library/lux/target/jvm/loader.lux
@@ -111,7 +111,7 @@
           []
           (java/lang/ClassLoader (findClass self {class_name java/lang/String})
                                  (java/lang/Class [? < java/lang/Object])
-                                 #throws [java/lang/ClassNotFoundException]
+                                 "throws" [java/lang/ClassNotFoundException]
                                  (let [class_name (:as Text class_name)
                                        classes (|> library atom.read! io.run!)]
                                    (case (dictionary.value class_name classes)
diff --git a/stdlib/source/library/lux/world/file.lux b/stdlib/source/library/lux/world/file.lux
index 6e7a2e1ed..c66e0d4f9 100644
--- a/stdlib/source/library/lux/world/file.lux
+++ b/stdlib/source/library/lux/world/file.lux
@@ -657,18 +657,18 @@
                      )))
 
         @.ruby
-        (as_is (ffi.import: Time #as RubyTime
+        (as_is (ffi.import: Time "as" RubyTime
                  ["#::."
                   ("static" at [Frac] RubyTime)
                   (to_f [] Frac)])
 
-               (ffi.import: Stat #as RubyStat
+               (ffi.import: Stat "as" RubyStat
                  ["#::."
                   (executable? [] Bit)
                   (size Int)
                   (mtime [] RubyTime)])
 
-               (ffi.import: File #as RubyFile
+               (ffi.import: File "as" RubyFile
                  ["#::."
                   ("static" SEPARATOR ffi.String)
                   ("static" open [Path ffi.String] "io" "try" RubyFile)
@@ -683,14 +683,14 @@
                   (flush [] "io" "try" "?" Any)
                   (close [] "io" "try" "?" Any)])
 
-               (ffi.import: Dir #as RubyDir
+               (ffi.import: Dir "as" RubyDir
                  ["#::."
                   ("static" open [Path] "io" "try" RubyDir)
                   
                   (children [] "io" "try" (Array Path))
                   (close [] "io" "try" "?" Any)])
 
-               (ffi.import: "fileutils" FileUtils #as RubyFileUtils
+               (ffi.import: "fileutils" FileUtils "as" RubyFileUtils
                  ["#::."
                   ("static" move [Path Path] "io" "try" "?" Any)
                   ("static" rmdir [Path] "io" "try" "?" Any)
diff --git a/stdlib/source/library/lux/world/program.lux b/stdlib/source/library/lux/world/program.lux
index 9b0733ec5..1a8304c8a 100644
--- a/stdlib/source/library/lux/world/program.lux
+++ b/stdlib/source/library/lux/world/program.lux
@@ -130,7 +130,7 @@
                                (import: java/lang/System
                                  ["#::."
                                   ("static" getenv [] (java/util/Map java/lang/String java/lang/String))
-                                  ("static" getenv #as resolveEnv [java/lang/String] "io" "?" java/lang/String)
+                                  ("static" getenv "as" resolveEnv [java/lang/String] "io" "?" java/lang/String)
                                   ("static" getProperty [java/lang/String] "?" java/lang/String)
                                   ("static" exit [int] "io" void)])
 
@@ -260,20 +260,20 @@
                            
                            (#try.Failure _)
                            (in default)))))
-        @.ruby (as_is (ffi.import: Env #as RubyEnv
+        @.ruby (as_is (ffi.import: Env "as" RubyEnv
                         ["#::."
                          ("static" keys [] (Array Text))
                          ("static" fetch [Text] "io" "?" Text)])
 
-                      (ffi.import: "fileutils" FileUtils #as RubyFileUtils
+                      (ffi.import: "fileutils" FileUtils "as" RubyFileUtils
                         ["#::."
                          ("static" pwd Path)])
                       
-                      (ffi.import: Dir #as RubyDir
+                      (ffi.import: Dir "as" RubyDir
                         ["#::."
                          ("static" home Path)])
 
-                      (ffi.import: Kernel #as RubyKernel
+                      (ffi.import: Kernel "as" RubyKernel
                         ["#::."
                          ("static" exit [Int] "io" Nothing)]))
 
@@ -282,8 +282,8 @@
         ...        ... https://www.php.net/manual/en/function.exit.php
         ...        (ffi.import: (getcwd [] "io" ffi.String))
         ...        ... https://www.php.net/manual/en/function.getcwd.php
-        ...        (ffi.import: (getenv #as getenv/1 [ffi.String] "io" ffi.String))
-        ...        (ffi.import: (getenv #as getenv/0 [] "io" (Array ffi.String)))
+        ...        (ffi.import: (getenv "as" getenv/1 [ffi.String] "io" ffi.String))
+        ...        (ffi.import: (getenv "as" getenv/0 [] "io" (Array ffi.String)))
         ...        ... https://www.php.net/manual/en/function.getenv.php
         ...        ... https://www.php.net/manual/en/function.array-keys.php
         ...        (ffi.import: (array_keys [(Array ffi.String)] (Array ffi.String)))
@@ -297,8 +297,8 @@
         ...        (ffi.import: (get-environment-variables [] "io" PList))
         ...        (ffi.import: (car [Pair] Text))
         ...        (ffi.import: (cdr [Pair] Text))
-        ...        (ffi.import: (car #as head [PList] Pair))
-        ...        (ffi.import: (cdr #as tail [PList] PList)))
+        ...        (ffi.import: (car "as" head [PList] Pair))
+        ...        (ffi.import: (cdr "as" tail [PList] PList)))
         }
        (as_is)))