diff options
| author | Tom Smeding <tom.smeding@gmail.com> | 2020-07-23 20:16:39 +0200 |
|---|---|---|
| committer | Tom Smeding <tom.smeding@gmail.com> | 2020-07-23 20:16:39 +0200 |
| commit | a9134688a2132c8f9abfff206f6e30614bb9aeff (patch) | |
| tree | 7f5366329beb1857aa0a1d58781e830fd13ed7a8 /ast/CC | |
| parent | 39ea4ac3a4b7663882a83f2ada43c8238f087d9b (diff) | |
WIP lambdas
Diffstat (limited to 'ast/CC')
| -rw-r--r-- | ast/CC/Source.hs | 6 | ||||
| -rw-r--r-- | ast/CC/Typed.hs | 19 |
2 files changed, 12 insertions, 13 deletions
diff --git a/ast/CC/Source.hs b/ast/CC/Source.hs index 81e691b..080b850 100644 --- a/ast/CC/Source.hs +++ b/ast/CC/Source.hs @@ -20,9 +20,11 @@ data Type = TFun Type Type | TInt deriving (Show, Read) -data Expr = Call SourceRange Expr Expr +data Expr = Lam SourceRange [(Name, SourceRange)] Expr + | Call SourceRange Expr Expr | Int SourceRange Int | Var SourceRange Name + | Annot SourceRange Expr Type deriving (Show, Read) instance Pretty Type where @@ -31,6 +33,8 @@ instance Pretty Type where precParens p 2 (prettyPrec 3 a ++ " -> " ++ prettyPrec 2 b) instance HasRange Expr where + range (Lam sr _ _) = sr range (Call sr _ _) = sr range (Int sr _) = sr range (Var sr _) = sr + range (Annot sr _ _) = sr diff --git a/ast/CC/Typed.hs b/ast/CC/Typed.hs index 5b8ed38..535fd31 100644 --- a/ast/CC/Typed.hs +++ b/ast/CC/Typed.hs @@ -7,13 +7,10 @@ import CC.Pretty import CC.Types -data ProgramT = ProgramT [DeclT] +data ProgramT = ProgramT [DefT] deriving (Show, Read) -data DeclT = DefT DefT -- import? - deriving (Show, Read) - -data DefT = FunctionT TypeT Name [Name] ExprT +data DefT = DefT Name ExprT deriving (Show, Read) data TypeT = TFunT TypeT TypeT @@ -21,16 +18,17 @@ data TypeT = TFunT TypeT TypeT | TyVar Int deriving (Show, Read) -data ExprT = CallT TypeT ExprT ExprT +data ExprT = LamT TypeT Occ ExprT + | CallT TypeT ExprT ExprT | IntT Int | VarT Occ deriving (Show, Read) --- | Occurrence of a variable data Occ = Occ Name TypeT deriving (Show, Read) exprType :: ExprT -> TypeT +exprType (LamT typ _ _) = typ exprType (CallT typ _ _) = typ exprType (IntT _) = TIntT exprType (VarT (Occ _ typ)) = typ @@ -55,10 +53,7 @@ instance Pretty ExprT where show n ++ " :: " ++ pretty t instance Pretty DefT where - pretty (FunctionT n e) = n ++ " = " ++ pretty e - -instance Pretty DeclT where - pretty (DefT def) = pretty def + pretty (DefT n e) = n ++ " = " ++ pretty e instance Pretty ProgramT where - pretty (ProgramT decls) = concatMap ((++ "\n") . pretty) decls + pretty (ProgramT defs) = concatMap ((++ "\n") . pretty) defs |