- Removed "T" suffix from Type's tags.

3 files changed, 28 insertions, 28 deletions

diff --git a/new-luxc/source/luxc/analyser/common.lux b/new-luxc/source/luxc/analyser/common.lux
index 0deceaa39..e77819779 100644
--- a/new-luxc/source/luxc/analyser/common.lux
+++ b/new-luxc/source/luxc/analyser/common.lux
@@ -27,13 +27,13 @@
 (def: #export (clean type analysis)
   (-> Type Analysis (Lux Analysis))
   (case type
-    (#;VarT id)
+    (#;Var id)
     (do Monad<Lux>
       [=type (&;within-type-env
               (TC;clean id type))]
       (wrap (replace-type =type analysis)))
     
-    (#;ExT id)
+    (#;Ex id)
     (undefined)
     
     _
@@ -55,7 +55,7 @@
 (def: #export (realize expected)
   (-> Type (TC;Check [(List Type) Type]))
   (case expected
-    (#;NamedT [module name] _expected)
+    (#;Named [module name] _expected)
     (realize _expected)
 
     (#;UnivQ env body)
diff --git a/new-luxc/source/luxc/analyser/lux.lux b/new-luxc/source/luxc/analyser/lux.lux
index 24ac1e093..86f9839dc 100644
--- a/new-luxc/source/luxc/analyser/lux.lux
+++ b/new-luxc/source/luxc/analyser/lux.lux
@@ -180,10 +180,10 @@
   (do Monad<Lux>
     [expected macro;expected-type]
     (case expected
-      (#;ProdT _)
+      (#;Product _)
       (analyse-typed-tuple analyse cursor members)
 
-      (#;VarT id)
+      (#;Var id)
       (do @
         [bound? (&;within-type-env
                  (TC;bound? id))]
@@ -224,7 +224,7 @@
   (do Monad<Lux>
     [expected macro;expected-type]
     (case expected
-      (#;SumT _)
+      (#;Sum _)
       (let [flat (type;flatten-variant expected)
             type-size (list;size flat)]
         (if (n.< type-size tag)
diff --git a/new-luxc/source/luxc/module/descriptor/type.lux b/new-luxc/source/luxc/module/descriptor/type.lux
index c4078ec0e..d9079e893 100644
--- a/new-luxc/source/luxc/module/descriptor/type.lux
+++ b/new-luxc/source/luxc/module/descriptor/type.lux
@@ -37,22 +37,22 @@
           (Type/= Type type))
     type-signal
     (case type
-      (#;HostT name params)
+      (#;Host name params)
       (format host-signal name &;stop-signal (&;encode-list encode-type params))
 
-      #;VoidT
+      #;Void
       void-signal
 
-      #;UnitT
+      #;Unit
       unit-signal
 
       (^template [<tag> <prefix>]
         (<tag> left right)
         (format <prefix> (encode-type left) (encode-type right)))
-      ([#;ProdT     product-signal]
-       [#;SumT      sum-signal]
-       [#;FunctionT function-signal]
-       [#;AppT      application-signal])
+      ([#;Product      product-signal]
+       [#;Sum      sum-signal]
+       [#;Function function-signal]
+       [#;App      application-signal])
 
 
       (^template [<tag> <prefix>]
@@ -64,11 +64,11 @@
       (^template [<tag> <prefix>]
         (<tag> idx)
         (format <prefix> (%i (nat-to-int idx)) &;stop-signal))
-      ([#;BoundT bound-signal]
-       [#;ExT ex-signal]
-       [#;VarT var-signal])
+      ([#;Bound bound-signal]
+       [#;Ex ex-signal]
+       [#;Var var-signal])
 
-      (#;NamedT [module name] type*)
+      (#;Named [module name] type*)
       (format named-signal module &;ident-separator name &;stop-signal (encode-type type*))
       )))
 
@@ -80,8 +80,8 @@
                        [(|> (l/wrap <type>) (l;after (l;text <signal>)))]
 
                        [Type    type-signal]
-                       [#;VoidT void-signal]
-                       [#;UnitT unit-signal])
+                       [#;Void void-signal]
+                       [#;Unit unit-signal])
             <combinators> (do-template [<tag> <prefix>]
                             [(do l;Monad<Lexer>
                                [_ (l;text <prefix>)
@@ -89,10 +89,10 @@
                                 right type-decoder]
                                (wrap (<tag> left right)))]
 
-                            [#;ProdT     product-signal]
-                            [#;SumT      sum-signal]
-                            [#;FunctionT function-signal]
-                            [#;AppT      application-signal])
+                            [#;Product     product-signal]
+                            [#;Sum      sum-signal]
+                            [#;Function function-signal]
+                            [#;App      application-signal])
             <abstractions> (do-template [<tag> <prefix>]
                              [(do l;Monad<Lexer>
                                 [_ (l;text <prefix>)
@@ -110,16 +110,16 @@
                               _ (l;text &;stop-signal)]
                              (wrap (<tag> (int-to-nat id))))]
 
-                          [#;BoundT bound-signal]
-                          [#;ExT    ex-signal]
-                          [#;VarT   var-signal])]
+                          [#;Bound bound-signal]
+                          [#;Ex    ex-signal]
+                          [#;Var   var-signal])]
        ($_ l;either
            (do l;Monad<Lexer>
              [_ (l;text host-signal)
               name (l;many' (l;none-of &;stop-signal))
               _ (l;text &;stop-signal)
               params (&;decode-list type-decoder)]
-             (wrap (#;HostT name params)))
+             (wrap (#;Host name params)))
            <simple>
            <combinators>
            <abstractions>
@@ -131,7 +131,7 @@
               name (l;many' (l;none-of &;stop-signal))
               _ (l;text &;stop-signal)
               unnamed type-decoder]
-             (wrap (#;NamedT [module name] unnamed)))
+             (wrap (#;Named [module name] unnamed)))
            )))))
 
 (def: (decode-type input)