Rename +T to Sum and *T to Prod

Author: tomaz1502

src/Lam/Parser/Lexer.x

@@ -30,6 +30,8 @@ tokens :-
 <0> "DEFINE"  { tok Define          }
 <0> "LOAD"    { tok Load            }
 <0> "READ"    { tok Read            }
+<0> "Sum"     { tok SumT            }
+<0> "Prod"    { tok ProdT           }
 <0> ":"       { tok Colon           }
 <0> "::"      { tok TypeColon       }
 <0> ":="      { tok ColonEq         }
@@ -57,8 +59,6 @@ tokens :-
 <0> "of"      { tok Of              }
 <0> "|"       { tok Pipe            }
 <0> "as"      { tok As              }
-<0> "+T"      { tok PlusT           }
-<0> "*T"      { tok ProdT           }
 <0> @id       { tok (Var "")        }
 <0> @path     { tok (Path "")       }
 <0> @digits   { tok (NumVal 0)      }
@@ -112,7 +112,7 @@ data Token =
   | Pipe
   | As
   | ProdT
-  | PlusT
+  | SumT
   | EOF
   deriving Show
 

src/Lam/Parser/Parser.y

@@ -27,9 +27,7 @@ import Lam.Parser.Lexer qualified as L
 %left "<" ">"
 %left "&&" "||"
 %left "+" "-"
-%right "+T"
 %left "*"
-%right "*T"
 %left "!"
 %left "proj1"
 %left "proj2"
@@ -82,8 +80,8 @@ import Lam.Parser.Lexer qualified as L
   "of"      { L.Of         }
   "|"       { L.Pipe       }
   "as"      { L.As         }
-  "+T"      { L.PlusT      }
-  "*T"      { L.ProdT      }
+  "Sum"     { L.SumT       }
+  "Prod"    { L.ProdT      }
 %%
 
 
@@ -202,8 +200,8 @@ RawTypeL :: { RawTypeL }
   | "Int" { RawIntT }
   | "Bool" { RawBoolT }
   | var { FreeType $1 }
-  | RawTypeL "*T" RawTypeL { RawProd $1 $3 }
-  | RawTypeL "+T" RawTypeL { RawSum $1 $3 }
+  | "Prod" RawTypeL RawTypeL { RawProd $2 $3 }
+  | "Sum" RawTypeL RawTypeL { RawSum $2 $3 }
   | ParType { $1 }
 
 ParType : "(" RawTypeL ")" { $2 }

src/Lam/Utils.hs

@@ -26,9 +26,9 @@ prettyPrintType BoolT = "Bool"
 prettyPrintType IntT = "Int"
 prettyPrintType U = "U"
 prettyPrintType (Prod t1 t2) =
-  unwords [ "(", prettyPrintType t1, "*T", prettyPrintType t2, ")" ]
+  unwords [ "( Prod", prettyPrintType t1, prettyPrintType t2, ")" ]
 prettyPrintType (Sum t1 t2) =
-  unwords [ "(", prettyPrintType t1, "+T", prettyPrintType t2, ")" ]
+  unwords [ "( Sum", prettyPrintType t1, prettyPrintType t2, ")" ]
 prettyPrintType (Arrow t1 t2) =
   unwords [ "(", prettyPrintType t1, "=>", prettyPrintType t2, ")" ]