diff options
author | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-12-03 17:02:57 +0100 |
---|---|---|
committer | Jasper Van der Jeugt <m@jaspervdj.be> | 2012-12-03 17:02:57 +0100 |
commit | a98f640e289d0122fe9b1e4f955bd594f578c13e (patch) | |
tree | 0a85bde829f9eb29eea5c05c2f61137a1aa4b8d1 /src | |
parent | 4a9b84e32146f0313ecaecf504c6f183a51753cc (diff) | |
download | stylish-haskell-a98f640e289d0122fe9b1e4f955bd594f578c13e.tar.gz |
Use classifyExtension to parse extensions
See #24
Diffstat (limited to 'src')
-rw-r--r-- | src/Language/Haskell/Stylish/Parse.hs | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/Language/Haskell/Stylish/Parse.hs b/src/Language/Haskell/Stylish/Parse.hs index 84b47c2..580e0fd 100644 --- a/src/Language/Haskell/Stylish/Parse.hs +++ b/src/Language/Haskell/Stylish/Parse.hs @@ -33,21 +33,13 @@ dropBom str = str -------------------------------------------------------------------------------- --- | Read an extension name from a string -parseExtension :: String -> Either String H.Extension -parseExtension str = case reads str of - [(x, "")] -> return x - _ -> throwError $ "Unknown extension: " ++ str - - --------------------------------------------------------------------------------- -- | Abstraction over HSE's parsing parseModule :: Extensions -> Maybe FilePath -> String -> Either String Module parseModule extraExts mfp string = do - -- Determine the extensions: those specified in the file and the extra ones - extraExts' <- mapM parseExtension extraExts - let fileExts = fromMaybe [] $ H.readExtensions string - exts = fileExts ++ extraExts' + -- Determine the extensions: those specified in the file and the extra ones + let extraExts' = map H.classifyExtension extraExts + fileExts = fromMaybe [] $ H.readExtensions string + exts = fileExts ++ extraExts' -- Parsing options... fp = fromMaybe "<unknown>" mfp |