on master help sign in
Switch Validate.hs to Data.Name
commit69224e3fda99ef6c5f8aa4baedf9e5b34aeca959 authorEvan Czaplicki <evancz@users.noreply.github.com> dateMon 19 Nov 2018, 12:46 (8 years ago) parent0f9b048
1 file changed+5−5
compiler/src/Validate.hs+5−5
compiler/src/Validate.hs+5−5
@@ -9,11 +9,11 @@ module Validate
99import Control.Applicative (liftA2)
1010import Control.Monad (forM_)
1111import qualified Data.Map as Map
12+import qualified Data.Name as Name
1213import Data.Text (Text)
1314
1415import qualified AST.Source as Src
1516import qualified AST.Valid as Valid
16−import qualified Elm.Name as N
1717import qualified Reporting.Annotation as A
1818import qualified Reporting.Error.Syntax as Error
1919import qualified Reporting.Region as R
@@ -51,7 +51,7 @@ data Stuff =
5151 , _aliases :: [Valid.Alias]
5252 , _binops :: [Valid.Binop]
5353 , _ports :: [Valid.Port]
54− , _docs :: Map.Map N.Name Text
54+ , _docs :: Map.Map Name.Name Text
5555 }
5656
5757
@@ -111,7 +111,7 @@ validateDocs region docs decls stuff =
111111 vsdHelp decls $ stuff { _docs = Map.insert name docs (_docs stuff) }
112112
113113
114−getNameForDocs :: R.Region -> Src.Decl_ -> Result i w N.Name
114+getNameForDocs :: R.Region -> Src.Decl_ -> Result i w Name.Name
115115getNameForDocs region decl =
116116 case decl of
117117 Src.Union (A.At _ name) _ _ ->
@@ -140,7 +140,7 @@ getNameForDocs region decl =
140140-- VALIDATE ANNOTATION
141141
142142
143−validateAnnotation :: R.Region -> N.Name -> Src.Type -> [Src.Decl] -> Stuff -> Result i w Stuff
143+validateAnnotation :: R.Region -> Name.Name -> Src.Type -> [Src.Decl] -> Stuff -> Result i w Stuff
144144validateAnnotation annRegion annotationName tipe decls stuff =
145145 case decls of
146146 [] ->
@@ -289,7 +289,7 @@ definitions sourceDefs =
289289 Result.throw (Error.TypeWithoutDefinition annRegion annotationName)
290290
291291
292−validateDefinition :: R.Region -> A.Located N.Name -> [Src.Pattern] -> Src.Expr -> Maybe Src.Type -> Result i w Valid.Def
292+validateDefinition :: R.Region -> A.Located Name.Name -> [Src.Pattern] -> Src.Expr -> Maybe Src.Type -> Result i w Valid.Def
293293validateDefinition region name args expr maybeType =
294294 do validExpr <- expression expr
295295 return $ Valid.Define region name args validExpr maybeType