git.iko.soy/elk
on master help sign in
Fixed HLint warnings in ExtractNoscript and FreeVar
commit84a90b44d5287d446753589cc86577605aeb3382 authorAbhinav Gupta <abhinav@Abhinavs-MacBook-Pro.local> dateFri 27 Apr 2012, 01:24 (15 years ago) parent53e3f17
2 files changed+8−8
compare with master
unifiedsplit
src/ExtractNoscript.hs+3−3 src/FreeVar.hs+5−5
src/ExtractNoscript.hs+3−3
@@ -2,7 +2,7 @@
22module ExtractNoscript (extract) where
33
44import Ast
5−import List (isPrefixOf)
5+import Data.List (isPrefixOf)
66
77extract = extract'
88
@@ -35,9 +35,9 @@ toString _ = []
3535makeLinks (a:b:[]) = linkify a b
3636makeLinks xs = xs
3737
38−linkish s = not (isPrefixOf "<a" s) && all (/=' ') s && any (=='/') s
38+linkish s = not ("<a" `isPrefixOf` s) && notElem ' ' s && elem '/' s
3939
4040linkify a b
4141 | linkish a = [ "<a href=\"" ++ a ++ "\">" ++ b ++ "</a>" ]
4242 | 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
88freeVars expr =
99 let f = freeVars in
1010 case expr of
11− Range e1 e2 -> union (f e1) (f e2)
12− Binop op e1 e2 -> union (f e1) (f e2)
11+ Range e1 e2 -> f e1 `union` f e2
12+ Binop op e1 e2 -> f e1 `union` f e2
1313 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
1515 If e1 e2 e3 -> unions $ map f [e1,e2,e3]
1616 Lift e es -> unions $ map f es
1717 Fold e1 e2 e3 -> unions $ map f [e1,e2,e3]
@@ -20,11 +20,11 @@ freeVars expr =
2020 where (vs,es) = unzip defs
2121 Var x -> singleton x
2222 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)
2424 _ -> empty
2525
2626caseFreeVars (p,e) = difference (freeVars e) (pvars p)
2727 where pvars p = case p of
2828 PAnything -> empty
2929 PVar x -> singleton x
30− PData _ ps -> unions (map pvars ps)
30+ PData _ ps -> unions (map pvars ps)