Simplify the interaction between classification and execution

Author: ndmitchell

src/Main.hs

@@ -21,10 +21,10 @@ main = do
     mode <- getMode
     if modeTest mode then test else do
         settings <- readSettings $ modeHints mode
-        let ignore idea = let f = classify settings in f idea == Skip
-        let hints = readHints settings
-
-        ideas <- liftM concat $ mapM (runFile ignore hints) (modeFiles mode)
+        let apply = map (classify settings) . applyHint (readHints settings)
+        ideas <- liftM concat $ mapM (liftM apply . parseFile) (modeFiles mode)
+        mapM_ print ideas
+        
         let n = length ideas
         if n == 0 then do
             when (not $ null $ modeReports mode) $ putStrLn "Skipping writing reports"
@@ -34,11 +34,3 @@ main = do
                 putStrLn $ "Writing report to " ++ x ++ " ..."
                 writeReport x ideas
             putStrLn $ "Found " ++ show n ++ " suggestions"
-
-
-runFile :: (Idea -> Bool) -> Hint -> FilePath -> IO [Idea]
-runFile ignore hint file = do
-    src <- parseFile file
-    let ideas = filter (not . ignore) $ applyHint hint src
-    mapM_ print ideas
-    return ideas

src/Settings.hs

@@ -30,10 +30,10 @@ pickFiles = mapM parseFile
 
 
 -- Eta bound variable lifted so the filter only happens once per classify
-classify :: [Setting] -> Idea -> Rank
-classify xs = \i -> foldl'
+classify :: [Setting] -> Idea -> Idea
+classify xs = \i -> i{rank=foldl'
         (\r c -> if matchHint (hint c) (hint i) && matchFunc (func c) (func i) then rank c else r)
-        Warn xs2
+        (rank i) xs2}
     where
         xs2 = filter isClassify xs