Exceptionally merge branch 'issue-147' into stable

Issues are normally merged into master, but this time the purpose of
issue 147 is to release a small increment from 1.1, so it made more
sense to start from tag 1.1 on stable and to merge it back there.
I will then merge back into master so that master has all the latest
changes.

If I had merged into master first and then into stable, stable would
have received all the other changes from master, which I don't want
yet. This is a minor release which adds no new feature except
compatibility with GHC 7.10.

CHANGELOG.md

@@ -1,6 +1,10 @@
 # What's new?
 
-## New since 1.0
+## New in 1.1.1
+
+GHC 7.10 compatibility.
+
+## New in 1.1
 
 In a nutshell, custom context directories and GHC 7.8 compatibility.
 

haskell-awk.cabal

@@ -1,5 +1,5 @@
 Name:           haskell-awk
-Version:        1.1
+Version:        1.1.1
 Author:         Mario Pastorelli <[email protected]>,  Samuel Gélineau <[email protected]>
 Maintainer:     Mario Pastorelli <[email protected]>,  Samuel Gélineau <[email protected]>
 Synopsis:       Transform text from the command-line using Haskell expressions.
@@ -13,6 +13,7 @@ License-File:   LICENSE
 Build-Type:     Custom
 Cabal-version:  >=1.10
 Extra-Source-Files: README.md
+                  , CHANGELOG.md
                   , src/*.hs
                   , src/Control/Monad/Trans/*.hs
                   , src/Control/Monad/Trans/State/*.hs
@@ -53,9 +54,8 @@ Executable hawk
                   , exceptions >=0.1
                   , filepath
                   , haskell-awk
-                  , haskell-src-exts >=1.14.0
+                  , haskell-src-exts >=1.16.0
                   , hint >=0.3.3.5
-                  , MonadCatchIO-mtl >=0.2.0.0
                   , mtl >=2.1.2
                   , network >=2.3.1.0
                   , stringsearch >=0.3.6.4

src/Data/HaskellModule/Parse.hs

@@ -45,6 +45,7 @@ locatedModule srcLoc source (ModuleName mName) = case moduleLine of
     Nothing -> return Nothing
     Just line -> located (srcLoc {srcLine = line}) >> return (Just mName)
   where
+    isModuleDecl :: Either B.ByteString String -> Bool
     isModuleDecl (Left xs) = "module " `B.isPrefixOf` xs
     isModuleDecl (Right xs) = "module " `isPrefixOf` xs
 

src/Language/Haskell/Exts/Location.hs

@@ -37,14 +37,14 @@ instance Location Decl where
   location (DataInsDecl      loc _ _ _ _)       = Just loc
   location (GDataInsDecl     loc _ _ _ _ _)     = Just loc
   location (ClassDecl        loc _ _ _ _ _)     = Just loc
-  location (InstDecl         loc _ _ _ _)       = Just loc
-  location (DerivDecl        loc _ _ _)         = Just loc
+  location (InstDecl         loc _ _ _ _ _ _)   = Just loc
+  location (DerivDecl        loc _ _ _ _ _)     = Just loc
   location (InfixDecl        loc _ _ _)         = Just loc
   location (DefaultDecl      loc _)             = Just loc
   location (SpliceDecl       loc _)             = Just loc
   location (TypeSig          loc _ _)           = Just loc
   location (FunBind matches) = location matches
-  location (PatBind          loc _ _ _ _)       = Just loc
+  location (PatBind          loc _ _ _)         = Just loc
   location (ForImp           loc _ _ _ _ _)     = Just loc
   location (ForExp           loc _ _ _ _)       = Just loc
   location (RulePragmaDecl   loc _)             = Just loc
@@ -54,7 +54,7 @@ instance Location Decl where
   location (InlineConlikeSig loc _ _)           = Just loc
   location (SpecSig          loc _ _ _)         = Just loc
   location (SpecInlineSig    loc _ _ _ _)       = Just loc
-  location (InstSig          loc _ _ _)         = Just loc
+  location (InstSig          loc _ _ _ _)       = Just loc
   location (AnnPragma        loc _)             = Just loc
 
 instance Location Match where

tests/RunTests.hs

@@ -30,7 +30,7 @@ substSuffix oldSuffix newSuffix xs | oldSuffix `isSuffixOf` xs = prefix ++ newSu
     prefix = take (length xs - length oldSuffix) xs
 substSuffix _ _ xs = xs
 
--- make sure doctest can the source of Hawk and the generated Paths_haskell_awk.hs
+-- make sure doctest can see the source of Hawk and the generated Paths_haskell_awk.hs
 doctest' :: String -> IO ()
 doctest' file = do
     exePath <- dropExtension <$> getExecutablePath