ghc-mod 1.10.0 → 1.10.1

raw patch · 6 files changed

+17/−20 lines, 6 files

Files

• CabalDev.hs +2/−2
• Check.hs +1/−1
• ErrMsg.hs +11/−14
• Flag.hs +1/−1
• elisp/ghc.el +1/−1
• ghc-mod.cabal +1/−1

@@ -34,7 +34,7 @@ searchIt [] = return Nothing searchIt path = do     a <- doesDirectoryExist (mpath path)-    if a then do+    if a then         findConf (mpath path)       else         searchIt $ init path@@ -44,4 +44,4 @@ findConf :: FilePath -> IO (Maybe FilePath) findConf path = do     f <- find (=~ "packages.*\\.conf") <$> getDirectoryContents path-    return $ ((path </>) <$> f)+    return ((path </>) <$> f)

@@ -12,7 +12,7 @@ ----------------------------------------------------------------  checkSyntax :: Options -> String -> IO String-checkSyntax opt file = do+checkSyntax opt file =   unlines <$> check opt file  ----------------------------------------------------------------

@@ -36,7 +36,7 @@     let newdf = df { log_action = appendLog ref }     return (newdf, reverse <$> readIORef ref)   where-    appendLog ref _ src _ msg = modifyIORef ref (\ls -> ppMsg src msg : ls)+    appendLog ref _ src stl msg = modifyIORef ref (\ls -> ppMsg src msg stl : ls)  ---------------------------------------------------------------- @@ -49,36 +49,33 @@ ----------------------------------------------------------------  ppErrMsg :: ErrMsg -> String-ppErrMsg err = ppMsg spn msg ++ ext+ppErrMsg err = ppMsg spn msg defaultUserStyle ++ ext    where      spn = head (errMsgSpans err)      msg = errMsgShortDoc err-     ext = showMsg (errMsgExtraInfo err)+     ext = showMsg (errMsgExtraInfo err) defaultUserStyle -ppMsg :: SrcSpan -> Message -> String+ppMsg :: SrcSpan -> Message -> PprStyle -> String #if __GLASGOW_HASKELL__ >= 702-ppMsg (UnhelpfulSpan _) _ = undefined-ppMsg (RealSrcSpan src) msg+ppMsg (UnhelpfulSpan _) _ _   = undefined+ppMsg (RealSrcSpan src) msg _ = undefined #else-ppMsg src msg+ppMsg src msg stl #endif     = file ++ ":" ++ line ++ ":" ++ col ++ ":" ++ cts ++ "\0"   where     file = takeFileName $ unpackFS (srcSpanFile src)     line = show (srcSpanStartLine src)     col  = show (srcSpanStartCol src)-    cts  = showMsg msg+    cts  = showMsg msg stl  ---------------------------------------------------------------- -style :: PprStyle-style = mkUserStyle neverQualify AllTheWay--showMsg :: SDoc -> String+showMsg :: SDoc -> PprStyle -> String #if __GLASGOW_HASKELL__ >= 702-showMsg d = map toNull $ renderWithStyle d style+showMsg d stl = map toNull $ renderWithStyle d stl #else-showMsg d = map toNull . Pretty.showDocWith PageMode $ d style+showMsg d stl = map toNull . Pretty.showDocWith PageMode $ d stl #endif   where     toNull '\n' = '\0'

@@ -6,7 +6,7 @@ import Types  listFlags :: Options -> IO String-listFlags opt = return $ convert opt $+listFlags opt = return $ convert opt    [ "-f" ++ prefix ++ option #if __GLASGOW_HASKELL__ == 702    | (option,_,_,_) <- fFlags

@@ -16,7 +16,7 @@  ;;; Code: -(defconst ghc-version "1.10.0")+(defconst ghc-version "1.10.1")  ;; (eval-when-compile ;;  (require 'haskell-mode))

@@ -1,5 +1,5 @@ Name:                   ghc-mod-Version:                1.10.0+Version:                1.10.1 Author:                 Kazu Yamamoto <kazu@iij.ad.jp> Maintainer:             Kazu Yamamoto <kazu@iij.ad.jp> License:                BSD3