@@ -12,9 +12,8 @@ import Control.Monad (forM_)
1212import qualified Data.Map as Map
1313import Data.Text (Text)
1414
15−import qualified AST.Expression.Source as Src
16−import qualified AST.Expression.Valid as Valid
17−import qualified AST.Type as Type
15+import qualified AST.Source as Src
16+import qualified AST.Valid as Valid
1817import qualified Elm.Name as N
1918import qualified Reporting.Annotation as A
2019import qualified Reporting.Error.Syntax as Error
@@ -137,7 +136,7 @@ getNameForDocs decl =
137136-- VALIDATE ANNOTATION
138137
139138
140−validateAnnotation :: R.Region -> N.Name -> Type.Raw -> [Src.Decl] -> Stuff -> Result w Stuff
139+validateAnnotation :: R.Region -> N.Name -> Src.Type -> [Src.Decl] -> Stuff -> Result w Stuff
141140validateAnnotation annRegion annotationName tipe decls stuff =
142141 case decls of
143142 [] ->
@@ -283,7 +282,7 @@ definitions sourceDefs =
283282 Result.throw annRegion (Error.TypeWithoutDefinition annotationName)
284283
285284
286−validateDefinition :: R.Region -> A.Located Text -> [Src.Pattern] -> Src.Expr -> Maybe Type.Raw -> Result w Valid.Def
285+validateDefinition :: R.Region -> A.Located Text -> [Src.Pattern] -> Src.Expr -> Maybe Src.Type -> Result w Valid.Def
287286validateDefinition region name args expr maybeType =
288287 do validExpr <- expression expr
289288 return $ Valid.Define region name args validExpr maybeType