git.iko.soy/elk
on master help sign in
Fixed HLint warnings in ExtractNoscript and FreeVar
84a90b4Abhinav Gupta
src/ExtractNoscript.hs+3−3
compare with master
unifiedsplit
@@ -2,7 +2,7 @@
2module ExtractNoscript (extract) where
2module ExtractNoscript (extract) where
3
3
4import Ast
4import Ast
5−import List (isPrefixOf)
5+import Data.List (isPrefixOf)
6
6
7extract = extract'
7extract = extract'
8
8
@@ -35,9 +35,9 @@ toString _ = []
35makeLinks (a:b:[]) = linkify a b
35makeLinks (a:b:[]) = linkify a b
36makeLinks xs = xs
36makeLinks xs = xs
37
37
38−linkish s = not (isPrefixOf "<a" s) && all (/=' ') s && any (=='/') s
38+linkish s = not ("<a" `isPrefixOf` s) && notElem ' ' s && elem '/' s
39
39
40linkify a b
40linkify a b
41 | linkish a = [ "<a href=\"" ++ a ++ "\">" ++ b ++ "</a>" ]
41 | linkish a = [ "<a href=\"" ++ a ++ "\">" ++ b ++ "</a>" ]
42 | linkish b = [ "<a href=\"" ++ b ++ "\">" ++ a ++ "</a>" ]
42 | linkish b = [ "<a href=\"" ++ b ++ "\">" ++ a ++ "</a>" ]
43− | otherwise = [a,b]
43+ | otherwise = [a,b]
src/FreeVar.hs+5−5
@@ -8,10 +8,10 @@ x `freeIn` expr = member x $ freeVars expr
8freeVars expr =
8freeVars expr =
9 let f = freeVars in
9 let f = freeVars in
10 case expr of
10 case expr of
11− Range e1 e2 -> union (f e1) (f e2)
11+ Range e1 e2 -> f e1 `union` f e2
12− Binop op e1 e2 -> union (f e1) (f e2)
12+ Binop op e1 e2 -> f e1 `union` f e2
13 Lambda x e -> delete x (f e)
13 Lambda x e -> delete x (f e)
14− App e1 e2 -> union (f e1) (f e2)
14+ App e1 e2 -> f e1 `union` f e2
15 If e1 e2 e3 -> unions $ map f [e1,e2,e3]
15 If e1 e2 e3 -> unions $ map f [e1,e2,e3]
16 Lift e es -> unions $ map f es
16 Lift e es -> unions $ map f es
17 Fold e1 e2 e3 -> unions $ map f [e1,e2,e3]
17 Fold e1 e2 e3 -> unions $ map f [e1,e2,e3]
@@ -20,11 +20,11 @@ freeVars expr =
20 where (vs,es) = unzip defs
20 where (vs,es) = unzip defs
21 Var x -> singleton x
21 Var x -> singleton x
22 Data name es -> unions (map f es)
22 Data name es -> unions (map f es)
23− Case e cases -> union (f e) (unions $ map caseFreeVars cases)
23+ Case e cases -> f e `union` unions (map caseFreeVars cases)
24 _ -> empty
24 _ -> empty
25
25
26caseFreeVars (p,e) = difference (freeVars e) (pvars p)
26caseFreeVars (p,e) = difference (freeVars e) (pvars p)
27 where pvars p = case p of
27 where pvars p = case p of
28 PAnything -> empty
28 PAnything -> empty
29 PVar x -> singleton x
29 PVar x -> singleton x
30− PData _ ps -> unions (map pvars ps)
30+ PData _ ps -> unions (map pvars ps)