@@ -20,7 +20,7 @@ tipe
2020 :: Env.Environment
2121 -> T.Raw
2222 -> Result.ResultErr T.Canonical
23−tipe env typ@(A.A region typ') =
23+tipe env annType@(A.A _ typ) =
2424 let
2525 go =
2626 tipe env
@@ -28,15 +28,15 @@ tipe env typ@(A.A region typ') =
2828 goSnd (name,t) =
2929 (,) name <$> go t
3030 in
31− case typ' of
31+ case typ of
3232 T.RVar x ->
3333 Result.ok (T.Var x)
3434
3535 T.RType _ ->
36− canonicalizeApp region env typ []
36+ canonicalizeApp env annType []
3737
3838 T.RApp t ts ->
39− canonicalizeApp region env t ts
39+ canonicalizeApp env t ts
4040
4141 T.RLambda a b ->
4242 T.Lambda <$> go a <*> go b
@@ -49,20 +49,19 @@ tipe env typ@(A.A region typ') =
4949
5050
5151canonicalizeApp
52− :: R.Region
53− -> Env.Environment
52+ :: Env.Environment
5453 -> T.Raw
5554 -> [T.Raw]
5655 -> Result.ResultErr T.Canonical
57−canonicalizeApp region env f args =
58− case f of
59− A.A _ (T.RType (Var.Raw rawName)) ->
56+canonicalizeApp env annFunc@(A.A region func) args =
57+ case func of
58+ T.RType (Var.Raw rawName) ->
6059 Canonicalize.tvar region env rawName
6160 `Result.andThen` canonicalizeWithTvar
6261
6362 _ ->
6463 T.App
65− <$> tipe env f
64+ <$> tipe env annFunc
6665 <*> Trav.traverse (tipe env) args
6766
6867 where