~jojo/Carth

a3fdbeac0a71a3c65da10982a1e98ddd167b5de1 — JoJo 1 year, 6 months ago b1a3114
Remove remnants of AnnotAst.Fun
4 files changed, 0 insertions(+), 7 deletions(-)

M src/AnnotAst.hs
M src/Check.hs
M src/Desugar.hs
M src/Subst.hs
M src/AnnotAst.hs => src/AnnotAst.hs +0 -1
@@ 60,7 60,6 @@ data Expr'
    | Var TypedVar
    | App Expr Expr Type
    | If Expr Expr Expr
    | Fun (String, Type) (Expr, Type)
    | Let Defs Expr
    | Match Expr DecisionTree Type
    | FunMatch DecisionTree Type Type

M src/Check.hs => src/Check.hs +0 -4
@@ 161,10 161,6 @@ checkTypeVarsBound ds = runReaderT (boundInDefs ds) Set.empty
            boundInExpr p
            boundInExpr c
            boundInExpr a
        An.Fun (_, pt) (b, bt) -> do
            boundInType pos pt
            boundInExpr b
            boundInType pos bt
        An.Let lds b -> do
            boundInDefs lds
            boundInExpr b

M src/Desugar.hs => src/Desugar.hs +0 -1
@@ 21,7 21,6 @@ desugarExpr (WithPos _ e) = case e of
    An.Var v -> Var (desugarTypedVar v)
    An.App f a rt -> App (desugarExpr f) (desugarExpr a) rt
    An.If p c a -> If (desugarExpr p) (desugarExpr c) (desugarExpr a)
    An.Fun p b -> Fun p (first desugarExpr b)
    An.Let ds b -> Let (desugarDefs ds) (desugarExpr b)
    An.Match m dt t -> Match (desugarExpr m) (desugarDecTree dt) t
    An.FunMatch dt pt bt ->

M src/Subst.hs => src/Subst.hs +0 -1
@@ 25,7 25,6 @@ substExpr s (WithPos p e) = WithPos p $ case e of
    Var v -> Var (substTypedVar s v)
    App f a rt -> App (substExpr s f) (substExpr s a) (subst s rt)
    If p c a -> If (substExpr s p) (substExpr s c) (substExpr s a)
    Fun (p, tp) (b, bt) -> Fun (p, subst s tp) (substExpr s b, subst s bt)
    Let defs body -> Let (fmap (substDef s) defs) (substExpr s body)
    Match e dt tbody ->
        Match (substExpr s e) (substDecisionTree s dt) (subst s tbody)