TTGing the lambda lifter

language.cabal

@@ -31,7 +31,6 @@ executable language
       Grammar.Print
       Grammar.Skel
       LambdaLifter
-      Auxiliary
       -- Interpreter
 
     hs-source-dirs:   src

src/Abs.hs

@@ -0,0 +1,28 @@
+{-# LANGUAGE TypeFamilies, PatternSynonyms, StandaloneDeriving #-}
+
+module Abs where
+
+import Data.String
+
+data Program a = Program [Bind a]
+
+data Bind a = Bind Ident [Ident] (Exp a)
+
+newtype Ident = Ident String
+    deriving (Eq, Ord, Show, Data.String.IsString)
+
+data Exp a = EId  (IdFamily  a)  Ident
+           | EInt (IntFamily a) Integer
+           | EAdd (AddFamily a) (Exp a) (Exp a)
+           | EApp (AppFamily a) (Exp a) (Exp a)
+           | EAbs (AbsFamily a) Ident (Exp a)
+           | ELet (LetFamily a) [Bind a] (Exp a)
+           | EExp (ExpFamily a) (Exp a)
+
+type family IdFamily  a
+type family IntFamily a
+type family AddFamily a
+type family AppFamily a
+type family AbsFamily a
+type family LetFamily a
+type family ExpFamily a

src/Auxiliary.hs

@@ -1,5 +0,0 @@
-
-module Auxiliary (module Auxiliary) where
-
-snoc :: a -> [a] -> [a]
-snoc x xs = xs ++ [x]

src/LambdaLifter.hs

@@ -1,5 +1,4 @@
-{-# LANGUAGE LambdaCase        #-}
+{-# LANGUAGE LambdaCase, OverloadedStrings, TypeFamilies, PatternSynonyms #-}
-{-# LANGUAGE OverloadedStrings #-}
 
 
 module LambdaLifter (lambdaLift, freeVars, abstract, rename, collectScs) where
@@ -13,6 +12,8 @@ import qualified Data.Set         as Set
 import           Data.Tuple.Extra (uncurry3)
 import           Grammar.Abs
 import           Prelude          hiding (exp)
+import qualified Abs              as A
+import           Data.Void
 
 
 
@@ -74,10 +75,10 @@ data ABind = ABind Ident [Ident] AnnExp deriving Show
 
 data AnnExp' = AId Ident
              | AInt Integer
-             | AApp AnnExp  AnnExp
+             | AApp (Set Ident, AnnExp') (Set Ident, AnnExp')
-             | AAdd AnnExp  AnnExp
+             | AAdd (Set Ident, AnnExp') (Set Ident, AnnExp') 
-             | AAbs Ident   AnnExp
+             | AAbs Ident   (Set Ident, AnnExp') 
-             | ALet [ABind] AnnExp
+             | ALet [ABind] (Set Ident, AnnExp') 
              deriving Show
 
 -- | Lift lambdas to let expression of the form @let sc = \x -> rhs@
@@ -219,3 +220,34 @@ mkEAbs [] e = e
 mkEAbs bs e = ELet bs e
 
 
+{----------- BOILERPLATE -----------}
+
+data LL 
+
+type instance A.IdFamily  LL = ()
+type instance A.IntFamily LL = ()
+type instance A.AddFamily LL = (Set Ident, Set Ident)
+type instance A.AppFamily LL = (Set Ident, Set Ident)
+type instance A.AbsFamily LL = Set Ident
+type instance A.LetFamily LL = Set Ident
+type instance A.ExpFamily LL = Void
+
+pattern LLId ident = A.EId () ident
+pattern LLInt int = A.EInt () int
+pattern LLAdd s1 s2 e1 e2 = A.EAdd (s1,s2) e1 e2
+pattern LLApp s1 s2 e1 e2 = A.EApp (s1,s2) e1 e2
+pattern LLAbs s i e = A.EAbs s i e
+pattern LLLet s binds e = A.ELet s binds e
+pattern LLExp v e = A.EExp v e
+
+{-
+
+data AnnExp' = AId Ident
+             | AInt Integer
+             | AApp (Set Ident, AnnExp') (Set Ident, AnnExp')
+             | AAdd (Set Ident, AnnExp') (Set Ident, AnnExp') 
+             | AAbs Ident   (Set Ident, AnnExp') 
+             | ALet [ABind] (Set Ident, AnnExp') 
+             deriving Show
+
+-}

src/Main.hs

@@ -3,7 +3,7 @@ module Main where
 
 import           Grammar.Par        (myLexer, pProgram)
 import           Grammar.Print      (printTree)
-import           LambdaLifter       (abstract, freeVars, lambdaLift, rename)
+import           LambdaLifter       (lambdaLift)
 import           System.Environment (getArgs)
 import           System.Exit        (exitFailure, exitSuccess)