37cab45 · elk · git.iko.soy

git.iko.soy/elk

More HLint warnings

commit37cab4561aed2f5d571128ac02954b37dc056f77 authorAbhinav Gupta <abhinav@Abhinavs-MacBook-Pro.local> dateFri 27 Apr 2012, 23:57 (15 years ago) parent1ca1d33

3 files changed+17−13

compare with master

unifiedsplit

src/Parse/Binop.hs+1−1 src/Parse/Combinators.hs+5−5 src/Replace.hs+11−7

src/Parse/Binop.hs+1−1

@@ -26,7 +26,7 @@ sortOps = sortBy (\(i,_,_) (j,_,_) -> compare i j)

2626binops term anyOp = do

2727 e <- term

2828 (ops,es) <- liftM unzip $ star (do { op <- anyOp; e <- term; return (op,e) })

29− case binopOf (Map.empty) (sortOps table) ops (e:es) of

29+ case binopOf Map.empty (sortOps table) ops (e:es) of

3030 Right e -> return e

3131 Left msg -> zero

3232

src/Parse/Combinators.hs+5−5

@@ -13,7 +13,7 @@ instance Monad (Parser from) where

1313 p >>= f = Parser (\cs -> concat [parse (f a) cs' | (a,cs') <- parse p cs])

1414

1515instance MonadPlus (Parser from) where

16− mzero = Parser (\cs -> [])

16+ mzero = Parser $ const []

1717 mplus p q = Parser (\cs -> parse p cs ++ parse q cs)

1818

1919-- True recursive descent, tries everything.

@@ -24,7 +24,7 @@ p +|+ q = Parser (\cs -> case parse (mplus p q) cs of

2424 [] -> []

2525 (x:xs) -> [x])

2626

27−zero = Parser (\cs -> [])

27+zero = Parser $ const []

2828

2929item = Parser (\cs -> case cs of

3030 [] -> []

@@ -40,7 +40,7 @@ string (c:cs) = do {char c; string cs; return (c:cs)}

4040star p = plus p +++ return []

4141plus p = do {a <- p; as <- star p; return (a:as)}

4242

43−optional p = do { p >>= return . Just } +++ return Nothing

43+optional p = (Just `liftM` p) +++ return Nothing

4444

4545nospace = guard . (==0) . length =<< space

4646space = star $ sat isSpace

@@ -66,7 +66,7 @@ sepBy1 sep p = do

6666 xs <- star (sep >> p)

6767 return $ x:xs

6868

69−select ps = foldl1 (+|+) ps

69+select = foldl1 (+|+)

7070

7171chainl p op a = (chainl1 p op) +++ return a

7272chainl1 p op = do {a <- p; rest a}

@@ -79,4 +79,4 @@ extractResult err parse =

7979 case parse of

8080 (r,[]) : _ -> Right r

8181 _ : rest -> extractResult err rest

82− [] -> Left err

82+ [] -> Left err

src/Replace.hs+11−7

@@ -1,8 +1,9 @@

11module Replace (replace, depth) where

33import Ast

4−import Data.Set (singleton,empty,unions,member)

4+import Data.Set (singleton,empty,unions,member, Set)

6+replace :: String -> Expr -> Expr -> Expr

67replace y v expr =

78 let f = replace y v in

89 case expr of

@@ -14,22 +15,25 @@ replace y v expr =

1415 Lift e es -> Lift (f e) (map f es)

1516 Fold e1 e2 e3 -> Fold (f e1) (f e2) (f e3)

1617 Async e -> Async (f e)

17− Let defs e -> if elem y vs then Let defs e else Let (zip vs (map f es)) (f e)

18+ Let defs e -> if y `elem` vs then Let defs e else Let (zip vs (map f es)) (f e)

1819 where (vs,es) = unzip defs

1920 Var x -> if x == y then v else Var x

2021 Data name es -> Data name (map f es)

21− Case e cases -> Case (f e) $ map (case_replace y v) cases

22+ Case e cases -> Case (f e) $ map (caseReplace y v) cases

2223 _ -> expr

2324

24−case_replace y v (p,e) =

25− if member y (pattern_vars p) then (p,e) else (p, replace y v e)

25+caseReplace :: String -> Expr -> (Pattern, Expr) -> (Pattern, Expr)

26+caseReplace y v (p,e) =

27+ if member y (patternVars p) then (p,e) else (p, replace y v e)

2628

27−pattern_vars pattern =

29+patternVars :: Pattern -> Set String

30+patternVars pattern =

2831 case pattern of

29− PData _ ps -> unions (map pattern_vars ps)

32+ PData _ ps -> unions (map patternVars ps)

3033 PVar x -> singleton x

3134 PAnything -> empty

3235

36+depth :: Expr -> Integer

3337depth = depth' 0

3438depth' d expr =

3539 let f = depth' (d+1) in