summaryrefslogtreecommitdiffhomepage
path: root/src/Main.hs
diff options
context:
space:
mode:
authorJasper Van der Jeugt <m@jaspervdj.be>2012-05-27 10:19:39 +0200
committerJasper Van der Jeugt <m@jaspervdj.be>2012-05-27 10:19:39 +0200
commitd8d76c91c31eaee15f636005e547b1145bc50c07 (patch)
tree986c013ceebbd76a2cbf08875d6236266c85df1c /src/Main.hs
parent36e175e56da2226f9a8f5bceec6248c0ad37e5bb (diff)
downloadstylish-haskell-d8d76c91c31eaee15f636005e547b1145bc50c07.tar.gz
Stylish type synonym
Diffstat (limited to 'src/Main.hs')
-rw-r--r--src/Main.hs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Main.hs b/src/Main.hs
index 286c835..89b6048 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -11,27 +11,27 @@ import System.Environment (getArgs)
--------------------------------------------------------------------------------
-import StylishHaskell.Block
import qualified StylishHaskell.Imports
import qualified StylishHaskell.LanguagePragmas
import StylishHaskell.Parse
+import StylishHaskell.Stylish
import qualified StylishHaskell.Tabs
import qualified StylishHaskell.TrailingWhitespace
--------------------------------------------------------------------------------
-runFilter :: Maybe FilePath -> (Lines -> Module -> Lines) -> Lines -> Lines
-runFilter mfp f ls = case parseModule mfp (unlines ls) of
+runStylish :: Maybe FilePath -> Stylish -> Lines -> Lines
+runStylish mfp f ls = case parseModule mfp (unlines ls) of
Left err -> error err -- TODO: maybe return original lines?
Right module' -> f ls module'
--------------------------------------------------------------------------------
-runFilters :: Maybe FilePath -> [Lines -> Module -> Lines] -> Lines -> Lines
-runFilters mfp filters = foldr (.) id filters'
+chainStylish :: Maybe FilePath -> [Stylish] -> Lines -> Lines
+chainStylish mfp filters = foldr (.) id filters'
where
filters' :: [Lines -> Lines]
- filters' = map (runFilter mfp) filters
+ filters' = map (runStylish mfp) filters
--------------------------------------------------------------------------------
@@ -39,7 +39,7 @@ main :: IO ()
main = do
filePath <- listToMaybe <$> getArgs
contents <- maybe getContents readFile filePath
- putStr $ unlines $ runFilters filePath filters $ lines contents
+ putStr $ unlines $ chainStylish filePath filters $ lines contents
where
filters =
[ StylishHaskell.Imports.stylish