De-taggification | part 0

9 files changed, 22 insertions, 31 deletions

diff --git a/stdlib/source/test/lux/documentation.lux b/stdlib/source/test/lux/documentation.lux
index b35ff1fb7..3e75d2454 100644
--- a/stdlib/source/test/lux/documentation.lux
+++ b/stdlib/source/test/lux/documentation.lux
@@ -22,12 +22,12 @@
 
 (syntax: (macro_error [macro <code>.any])
   (function (_ compiler)
-    (case ((macro.expansion macro) compiler)
-      (#try.Failure error)
-      (#try.Success [compiler (list (code.text error))])
-      
-      (#try.Success _)
-      (#try.Failure "OOPS!"))))
+    (#try.Success [compiler (list (code.bit (case ((macro.expansion macro) compiler)
+                                              (#try.Failure error)
+                                              true
+                                              
+                                              (#try.Success _)
+                                              false)))])))
 
 (syntax: (description [])
   (\ meta.monad each
@@ -38,7 +38,7 @@
   (with_expansions ['definition_description' (..description)
                     'sub_description' (..description)
                     'super_description' (..description)]
-    (as_is (def: g!default
+    (as_is (def: .public g!default
              Nat
              123)
 
@@ -106,10 +106,8 @@
                                 ))
                      (_.cover [/.unqualified_identifier]
                               (`` (and (~~ (template [<example>]
-                                             [(<| (text.contains? (value@ #exception.label /.unqualified_identifier))
-                                                  macro_error
-                                                  <example>)]
-
+                                             [(macro_error <example>)]
+                                             
                                              [(/.default g!default)]
                                              [(/.documentation: g!default
                                                 (~~ (template.text ['definition_description'])))]
diff --git a/stdlib/source/test/lux/ffi.js.lux b/stdlib/source/test/lux/ffi.js.lux
index 7a3a1b3b1..2d3de761e 100644
--- a/stdlib/source/test/lux/ffi.js.lux
+++ b/stdlib/source/test/lux/ffi.js.lux
@@ -28,7 +28,7 @@
 ... On Node
 (/.import: Buffer
   ["#::."
-   (#static from [/.String /.String] Buffer)
+   ("static" from [/.String /.String] Buffer)
    (toString [/.String] /.String)])
 
 ... On the browser
diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux
index e130626de..97ecdb7a4 100644
--- a/stdlib/source/test/lux/ffi.jvm.lux
+++ b/stdlib/source/test/lux/ffi.jvm.lux
@@ -235,7 +235,7 @@
 
 (/.import: test/TestInterface1
   ["#::."
-   (actual1 [java/lang/Boolean] #try java/lang/Long)])
+   (actual1 [java/lang/Boolean] "try" java/lang/Long)])
 
 (/.interface: test/TestInterface2
   ([a] actual2 [a] a))
@@ -418,13 +418,13 @@
   (#public [] (new self) []
            [])
   ... Methods
-  (#public #static (actual5 {value java/lang/Long})
+  (#public "static" (actual5 {value java/lang/Long})
            java/lang/Long
            value))
 
 (/.import: test/TestClass5
   ["#::."
-   (#static actual5 [java/lang/Long] java/lang/Long)])
+   ("static" actual5 [java/lang/Long] java/lang/Long)])
 
 (/.class: #abstract test/TestClass6 []
   ... Constructors
diff --git a/stdlib/source/test/lux/ffi.lua.lux b/stdlib/source/test/lux/ffi.lua.lux
index 9f78a75b4..7db49a416 100644
--- a/stdlib/source/test/lux/ffi.lua.lux
+++ b/stdlib/source/test/lux/ffi.lua.lux
@@ -11,7 +11,7 @@
   [\\library
    ["." /]])
 
-(/.import: (os/getenv [/.String] #io #? /.String))
+(/.import: (os/getenv [/.String] "io" "?" /.String))
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/ffi.py.lux b/stdlib/source/test/lux/ffi.py.lux
index 2e5e89d5e..42a80a7ec 100644
--- a/stdlib/source/test/lux/ffi.py.lux
+++ b/stdlib/source/test/lux/ffi.py.lux
@@ -13,8 +13,8 @@
 
 (/.import: os
   ["#::."
-   (#static R_OK /.Integer)
-   (#static W_OK /.Integer)])
+   ("static" R_OK /.Integer)
+   ("static" W_OK /.Integer)])
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/ffi.rb.lux b/stdlib/source/test/lux/ffi.rb.lux
index 6e10fcce1..b9a302b50 100644
--- a/stdlib/source/test/lux/ffi.rb.lux
+++ b/stdlib/source/test/lux/ffi.rb.lux
@@ -11,7 +11,7 @@
 
 (/.import: File
   ["#::."
-   (#static SEPARATOR /.String)])
+   ("static" SEPARATOR /.String)])
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/math/infix.lux b/stdlib/source/test/lux/math/infix.lux
index 9c8298346..f9f9475a9 100644
--- a/stdlib/source/test/lux/math/infix.lux
+++ b/stdlib/source/test/lux/math/infix.lux
@@ -47,18 +47,11 @@
 
                        non_numeric!
                        (bit\= (and (n.< parameter subject) (n.< extra parameter))
-                              (/.infix [[subject n.< parameter] and [parameter n.< extra]]))
-
-                       and_composition!
-                       (and (bit\= (and (n.< parameter subject) (n.< extra parameter))
-                                   (/.infix [#and subject n.< parameter n.< extra]))
-                            (bit\= (and (n.< parameter subject) (n.> extra parameter))
-                                   (/.infix [#and subject n.< parameter n.> extra])))]
+                              (/.infix [[subject n.< parameter] and [parameter n.< extra]]))]
                    (and constant_values!
                         unary_functions!
                         binary_functions!
                         multiple_binary_functions!
                         function_call!
                         non_numeric!
-                        and_composition!
                         ))))))
diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux
index cb8d4abaa..09993f033 100644
--- a/stdlib/source/test/lux/math/number/frac.lux
+++ b/stdlib/source/test/lux/math/number/frac.lux
@@ -120,8 +120,8 @@
 
 (with_expansions [<jvm> (as_is (ffi.import: java/lang/Double
                                  ["#::."
-                                  (#static doubleToRawLongBits [double] long)
-                                  (#static longBitsToDouble [long] double)]))]
+                                  ("static" doubleToRawLongBits [double] long)
+                                  ("static" longBitsToDouble [long] double)]))]
   (for {@.old (as_is <jvm>)
         @.jvm (as_is <jvm>)}
        (as_is)))
diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux
index 6dd299f2c..2a9161c8c 100644
--- a/stdlib/source/test/lux/target/jvm.lux
+++ b/stdlib/source/test/lux/target/jvm.lux
@@ -67,13 +67,13 @@
 (import: java/lang/Float)
 (import: java/lang/Double
   ["#::."
-   (#static compare [double double] int)])
+   ("static" compare [double double] int)])
 (import: java/lang/Character)
 (import: java/lang/String)
 
 (import: java/lang/reflect/Method
   ["#::."
-   (invoke [java/lang/Object [java/lang/Object]] #try java/lang/Object)])
+   (invoke [java/lang/Object [java/lang/Object]] "try" java/lang/Object)])
 
 (import: (java/lang/Class c)
   ["#::."