git.iko.soy/elk
on master help sign in
cosmetic: add vertical whitespace
a5b80f3Evan Czaplicki
src/Validate.hs+16
compare with master
unifiedsplit
@@ -20,8 +20,10 @@ import qualified Reporting.Region as R
20import qualified Reporting.Result as Result
20import qualified Reporting.Result as Result
21
21
22
22
23+
23-- VALIDATE DECLARATIONS
24-- VALIDATE DECLARATIONS
24
25
26+
25declarations
27declarations
26 :: Bool
28 :: Bool
27 -> [D.SourceDecl]
29 -> [D.SourceDecl]
@@ -78,8 +80,10 @@ validateDeclsHelp comment (A.A region decl) decls =
78 portHelp comment region port decls
80 portHelp comment region port decls
79
81
80
82
83+
81-- VALIDATE DEFINITIONS IN DECLARATIONS
84-- VALIDATE DEFINITIONS IN DECLARATIONS
82
85
86+
83defHelp
87defHelp
84 :: Maybe String
88 :: Maybe String
85 -> Source.Def
89 -> Source.Def
@@ -111,8 +115,10 @@ defHelp comment (A.A region def) decls =
111 Result.throw region (Error.TypeWithoutDefinition name)
115 Result.throw region (Error.TypeWithoutDefinition name)
112
116
113
117
118+
114-- VALIDATE PORTS IN DECLARATIONS
119-- VALIDATE PORTS IN DECLARATIONS
115
120
121+
116portHelp
122portHelp
117 :: Maybe String
123 :: Maybe String
118 -> R.Region
124 -> R.Region
@@ -140,8 +146,10 @@ portHelp comment region port decls =
140 addRest (D.In name tipe) decls
146 addRest (D.In name tipe) decls
141
147
142
148
149+
143-- VALIDATE DEFINITIONS
150-- VALIDATE DEFINITIONS
144
151
152+
145definitions :: [Source.Def] -> Result.Result wrn Error.Error [Valid.Def]
153definitions :: [Source.Def] -> Result.Result wrn Error.Error [Valid.Def]
146definitions sourceDefs =
154definitions sourceDefs =
147 do validDefs <- definitionsHelp sourceDefs
155 do validDefs <- definitionsHelp sourceDefs
@@ -194,8 +202,10 @@ checkDefinition (Valid.Definition pattern body _) =
194 Result.throw (R.merge start end) (Error.BadFunctionName (length args))
202 Result.throw (R.merge start end) (Error.BadFunctionName (length args))
195
203
196
204
205+
197-- VALIDATE EXPRESSIONS
206-- VALIDATE EXPRESSIONS
198
207
208+
199expression :: Source.Expr -> Result.Result wrn Error.Error Valid.Expr
209expression :: Source.Expr -> Result.Result wrn Error.Error Valid.Expr
200expression (A.A ann sourceExpression) =
210expression (A.A ann sourceExpression) =
201 A.A ann <$>
211 A.A ann <$>
@@ -300,16 +310,20 @@ both (expr1, expr2) =
300 (,) <$> expression expr1 <*> expression expr2
310 (,) <$> expression expr1 <*> expression expr2
301
311
302
312
313+
303-- VALIDATE PATTERNS
314-- VALIDATE PATTERNS
304
315
316+
305validatePattern :: Pattern.RawPattern -> Result.Result wrn Error.Error Pattern.RawPattern
317validatePattern :: Pattern.RawPattern -> Result.Result wrn Error.Error Pattern.RawPattern
306validatePattern pattern =
318validatePattern pattern =
307 do detectDuplicates Error.BadPattern (Pattern.boundVars pattern)
319 do detectDuplicates Error.BadPattern (Pattern.boundVars pattern)
308 return pattern
320 return pattern
309
321
310
322
323+
311-- DETECT DUPLICATES
324-- DETECT DUPLICATES
312
325
326+
313detectDuplicates
327detectDuplicates
314 :: (String -> Error.Error)
328 :: (String -> Error.Error)
315 -> [A.Located String]
329 -> [A.Located String]
@@ -383,8 +397,10 @@ extractValues (A.A (region, _) decl) =
383 )
397 )
384
398
385
399
400+
386-- UNBOUND TYPE VARIABLES
401-- UNBOUND TYPE VARIABLES
387
402
403+
388checkDecl :: Bool -> D.ValidDecl -> Result.Result wrn Error.Error ()
404checkDecl :: Bool -> D.ValidDecl -> Result.Result wrn Error.Error ()
389checkDecl isRoot (A.A (region,_) decl) =
405checkDecl isRoot (A.A (region,_) decl) =
390 case decl of
406 case decl of