Merge pull request #5 from msydneyslaga/dev

towards stabilising main branch

src/Core/Lex.x

@@ -68,6 +68,7 @@ rlp :-
     "{"                     { constTok TokenLBrace }
     "}"                     { constTok TokenRBrace }
     ";"                     { constTok TokenSemicolon }
+    "@"                     { constTok TokenTypeApp }
     "{-#"                   { constTok TokenLPragma `andBegin` pragma }
 
     "let"                   { constTok TokenLet }
@@ -133,6 +134,7 @@ data CoreToken = TokenLet
                | TokenLBrace
                | TokenRBrace
                | TokenSemicolon
+               | TokenTypeApp
                | TokenLPragma
                | TokenRPragma
                | TokenWord String

src/Core/Parse.y

@@ -47,6 +47,7 @@ import Data.Default.Class   (def)
       'λ'             { Located _ _ _ TokenLambda }
       '->'            { Located _ _ _ TokenArrow }
       '='             { Located _ _ _ TokenEquals }
+      '@'             { Located _ _ _ TokenTypeApp }
       '('             { Located _ _ _ TokenLParen }
       ')'             { Located _ _ _ TokenRParen }
       '{'             { Located _ _ _ TokenLBrace }
@@ -106,7 +107,6 @@ Binders         : Var Binders                  { $1 : $2 }
 Application     :: { Expr Name }
 Application     : Expr1 AppArgs                { foldl' App $1 $2 }
 
--- TODO: Application can probably be written as a single rule, without AppArgs
 AppArgs         :: { [Expr Name] }
 AppArgs         : Expr1 AppArgs                 { $1 : $2 }
                 | Expr1                         { [$1] }

src/Core/Syntax.hs

@@ -6,6 +6,7 @@ Description : Core ASTs and the like
 {-# LANGUAGE FunctionalDependencies #-}
 module Core.Syntax
     ( Expr(..)
+    , Type(..)
     , Literal(..)
     , pattern (:$)
     , Binding(..)
@@ -36,8 +37,8 @@ import Data.List                    (intersperse)
 import Data.Function                ((&))
 import Data.String
 -- Lift instances for the Core quasiquoters
-import Lens.Micro
 import Language.Haskell.TH.Syntax   (Lift)
+import Lens.Micro
 ----------------------------------------------------------------------------------
 
 data Expr b = Var Name
@@ -47,10 +48,20 @@ data Expr b = Var Name
             | Let Rec [Binding b] (Expr b)
             | App (Expr b) (Expr b)
             | LitE Literal
+            | Type Type
             deriving (Show, Read, Lift)
 
 deriving instance (Eq b) => Eq (Expr b)
 
+data Type = TyInt
+          | TyFun
+          | TyVar Name
+          | TyApp Type Type
+          | TyConApp TyCon [Type]
+          deriving (Show, Read, Lift, Eq)
+
+type TyCon = Name
+
 infixl 2 :$
 pattern (:$) :: Expr b  -> Expr b  -> Expr b 
 pattern f :$ x = App f x

src/Core2Core.hs

@@ -57,6 +57,7 @@ floatNonStrictCases g = goE
         goE :: Expr' -> Floater Expr'
         goE (Var k)             = pure (Var k)
         goE (LitE l)            = pure (LitE l)
+        goE (Case e as)         = pure (Case e as)
         goE (Let Rec bs e)      = Let Rec <$> bs' <*> goE e
             where bs' = travBs goE bs
         goE e                   = goC e