@@ -12,9 +12,8 @@ import Control.Monad (forM_)
12import qualified Data.Map as Map
12import qualified Data.Map as Map
13import Data.Text (Text)
13import Data.Text (Text)
15−import qualified AST.Expression.Source as Src
15+import qualified AST.Source as Src
16−import qualified AST.Expression.Valid as Valid
16+import qualified AST.Valid as Valid
17−import qualified AST.Type as Type
18import qualified Elm.Name as N
17import qualified Elm.Name as N
19import qualified Reporting.Annotation as A
18import qualified Reporting.Annotation as A
20import qualified Reporting.Error.Syntax as Error
19import qualified Reporting.Error.Syntax as Error
@@ -137,7 +136,7 @@ getNameForDocs decl =
137-- VALIDATE ANNOTATION
136-- VALIDATE ANNOTATION
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
141validateAnnotation annRegion annotationName tipe decls stuff =
140validateAnnotation annRegion annotationName tipe decls stuff =
142 case decls of
141 case decls of
@@ -283,7 +282,7 @@ definitions sourceDefs =
283 Result.throw annRegion (Error.TypeWithoutDefinition annotationName)
282 Result.throw annRegion (Error.TypeWithoutDefinition annotationName)
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
287validateDefinition region name args expr maybeType =
286validateDefinition region name args expr maybeType =
288 do validExpr <- expression expr
287 do validExpr <- expression expr
289 return $ Valid.Define region name args validExpr maybeType
288 return $ Valid.Define region name args validExpr maybeType