diff --git a/data/Default.hs b/data/Default.hs --- a/data/Default.hs +++ b/data/Default.hs @@ -84,6 +84,9 @@ error = intercalate " " ==> unwords warn = concat (intersperse x y) ==> intercalate x y where _ = notEq x " " warn = concat (intersperse " " x) ==> unwords x +error "Use any" = null (filter f x) ==> not (any f x) +error "Use any" = filter f x == [] ==> not (any f x) +error = filter f x /= [] ==> any f x -- FOLDS diff --git a/data/report.html b/data/report.html deleted file mode 100644 --- a/data/report.html +++ /dev/null @@ -1,168 +0,0 @@ - - - - -HLint Report - - - - - - - - -
- -

All hints

- - -

All files

- - -
-
-

- Report generated by HLint -$VERSION - - a tool to suggest improvements to your Haskell code. -

- -$CONTENT -
- - diff --git a/data/report_template.html b/data/report_template.html new file mode 100644 --- /dev/null +++ b/data/report_template.html @@ -0,0 +1,168 @@ + + + + +HLint Report + + + + + + + + +
+ +

All hints

+ + +

All files

+ + +
+
+

+ Report generated by HLint +$VERSION + - a tool to suggest improvements to your Haskell code. +

+ +$CONTENT +
+ + diff --git a/hlint.cabal b/hlint.cabal --- a/hlint.cabal +++ b/hlint.cabal @@ -1,14 +1,14 @@ cabal-version: >= 1.6 build-type: Simple name: hlint -version: 1.8.4 +version: 1.8.5 -- license is GPL v2 only license: GPL license-file: LICENSE category: Development author: Neil Mitchell maintainer: Neil Mitchell -copyright: Neil Mitchell 2006-2010 +copyright: Neil Mitchell 2006-2011 synopsis: Source code suggestions description: HLint gives suggestions on how to improve your source code. @@ -21,7 +21,7 @@ Dollar.hs HLint.hs Test.hs - report.html + report_template.html hs-lint.el hlint.1 hlint.ghci diff --git a/src/CmdLine.hs b/src/CmdLine.hs --- a/src/CmdLine.hs +++ b/src/CmdLine.hs @@ -35,7 +35,7 @@ ,cmdColor :: Bool -- ^ color the result ,cmdCpp :: CppFlags -- ^ options for CPP ,cmdDataDir :: FilePath -- ^ the data directory - ,cmdEncoding :: String -- ^ the text encoding + ,cmdEncoding :: Encoding -- ^ the text encoding ,cmdFindHints :: [FilePath] -- ^ source files to look for hints in ,cmdLanguage :: [Extension] -- ^ the extensions (may be prefixed by "No") ,cmdQuiet :: Bool -- ^ supress all console output @@ -120,8 +120,7 @@ | CPP `elem` languages = Cpphs cpphs | otherwise = NoCpp - let encoding = last $ "" : [x | Encoding x <- opt] - when (encoding /= "") $ warnEncoding encoding + encoding <- newEncoding $ last $ "" : [x | Encoding x <- opt] return Cmd {cmdTest = test @@ -148,7 +147,7 @@ versionText :: String -versionText = "HLint v" ++ showVersion version ++ ", (C) Neil Mitchell 2006-2010\n" +versionText = "HLint v" ++ showVersion version ++ ", (C) Neil Mitchell 2006-2011\n" helpText :: String diff --git a/src/HSE/All.hs b/src/HSE/All.hs --- a/src/HSE/All.hs +++ b/src/HSE/All.hs @@ -24,12 +24,12 @@ data ParseFlags = ParseFlags {cppFlags :: CppFlags ,language :: [Extension] - ,encoding :: String + ,encoding :: Encoding ,infixes :: [Fixity] } parseFlags :: ParseFlags -parseFlags = ParseFlags NoCpp defaultExtensions "" [] +parseFlags = ParseFlags NoCpp defaultExtensions defaultEncoding [] parseFlagsNoLocations :: ParseFlags -> ParseFlags parseFlagsNoLocations x = x{cppFlags = case cppFlags x of Cpphs y -> Cpphs $ f y; y -> y} diff --git a/src/Main.hs b/src/Main.hs --- a/src/Main.hs +++ b/src/Main.hs @@ -1,6 +1,6 @@ {- HLint, Haskell source code suggestions -Copyright (C) 2006-2010, Neil Mitchell +Copyright (C) 2006-2011, Neil Mitchell This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/Report.hs b/src/Report.hs --- a/src/Report.hs +++ b/src/Report.hs @@ -15,7 +15,7 @@ writeTemplate :: FilePath -> [(String,[String])] -> FilePath -> IO () writeTemplate dataDir content to = do - src <- readFile $ dataDir "report.html" + src <- readFile $ dataDir "report_template.html" writeFile to $ unlines $ concatMap f $ lines src where f ('$':xs) = fromMaybe ['$':xs] $ lookup xs content diff --git a/src/Util.hs b/src/Util.hs --- a/src/Util.hs +++ b/src/Util.hs @@ -1,10 +1,11 @@ -{-# LANGUAGE CPP, ExistentialQuantification, Rank2Types #-} +{-# LANGUAGE CPP, ExistentialQuantification, Rank2Types, PatternGuards #-} module Util where import Control.Arrow import Control.Monad import Control.Monad.Trans.State +import Control.Exception import Data.Char import Data.Function import Data.List @@ -118,23 +119,62 @@ --------------------------------------------------------------------- -- SYSTEM.IO -readFileEncoding :: String -> FilePath -> IO String -#if __GLASGOW_HASKELL__ < 612 -readFileEncoding _ = readFile -#else -readFileEncoding "" = readFile -readFileEncoding enc = \file -> do - h <- openFile file ReadMode - enc <- mkTextEncoding enc - hSetEncoding h enc - hGetContents h -#endif +-- | An encoding is a function to change a handle to a particular encoding +data Encoding = Encoding_Internal (Maybe (Handle -> IO ())) -warnEncoding :: String -> IO () -#if __GLASGOW_HASKELL__ < 612 -warnEncoding enc | enc /= "" = putStrLn "Warning: Text encodings are not supported with HLint compiled by GHC 6.10" +defaultEncoding :: Encoding +defaultEncoding = Encoding_Internal Nothing + + +readFileEncoding :: Encoding -> FilePath -> IO String +readFileEncoding (Encoding_Internal x) = case x of + Nothing -> readFile + Just set -> \file -> do + h <- openFile file ReadMode + set h + hGetContents h + + +-- GHC's mkTextEncoding function is fairly poor - it doesn't support lots of fun things, +-- so we fake them up, and then try mkTextEncoding last +newEncoding :: String -> IO Encoding +newEncoding "" = return defaultEncoding +#if __GLASGOW_HASKELL__ >= 612 +newEncoding enc + | Just e <- lookup (f enc) [(f a, b) | (as,b) <- encs, a <- as] = return $ wrap e + | otherwise = do + res <- try $ mkTextEncoding enc :: IO (Either SomeException TextEncoding) + case res of + Right e -> return $ wrap e + Left _ -> do + let (a,b) = splitAt 2 $ map (head . fst) encs + putStr $ unlines + ["Error: Unknown text encoding argument, " ++ enc + ,"Possible values:" + ," " ++ unwords a + ," " ++ unwords b + ," and anything accepted by System.IO.mkTextEncoding"] + exitWith $ ExitFailure 1 + where + f = map toLower . filter (`notElem` "-_ ") + wrap = Encoding_Internal . Just . flip hSetEncoding + + encs = let a*b = (words a, b) + in ["ISO8859-1 8859-1 ISO8859 8859 LATIN LATIN1" * latin1 + ,"LOCALE" * localeEncoding + ,"UTF-8" * utf8 + ,"UTF-8BOM" * utf8_bom + ,"UTF-16" * utf16 + ,"UTF-16LE" * utf16le + ,"UTF-16BE" * utf16be + ,"UTF-32" * utf16 + ,"UTF-32LE" * utf16le + ,"UTF-32BE" * utf16be] +#else +newEncoding enc = do + putStrLn "Warning: Text encodings are not supported with HLint compiled by GHC 6.10" + return defaultEncoding #endif -warnEncoding _ = return () exitMessage :: String -> a