hunk ./src/compiler98/Error.hs 3 -import List -import IO -import System +import Data.List +import System.IO +import System.Exit hunk ./src/compiler98/Extra.hs 1 -module Extra(module Extra, module HbcOnly, module Maybe, trace) where +{-# LANGUAGE ScopedTypeVariables #-} +module Extra(module Extra, module HbcOnly, module Data.Maybe, trace) where hunk ./src/compiler98/Extra.hs 5 -import Char -import List -import Maybe -import IO (hPutStr,stderr) +import Data.Char +import Data.List +import Data.Maybe +import System.IO (hPutStr,stderr) +import Control.Exception (catch,IOException) hunk ./src/compiler98/Extra.hs 37 +{- hunk ./src/compiler98/Extra.hs 42 +-} hunk ./src/compiler98/Extra.hs 295 - (\ _ -> readFirst xs) + (\ (_ :: IOException)-> readFirst xs) hunk ./src/compiler98/Lex.hs 5 -import Ratio +import Data.Ratio hunk ./src/compiler98/LexLow.hs 5 -import Ratio -import Char(isAlpha,isUpper,isLower,isDigit) +import Data.Ratio +import Data.Char(isAlpha,isUpper,isLower,isDigit) hunk ./src/compiler98/LexPre.hs 3 -import Char(isSpace,isDigit,isAlpha) +import Data.Char(isSpace,isDigit,isAlpha) hunk ./src/compiler98/LexStr.hs 3 -import Char +import Data.Char hunk ./src/compiler98/MergeSort.hs 3 -import List(sort) +import Data.List(sort) hunk ./src/compiler98/NT.hs 11 -import Char +import Data.Char hunk ./src/compiler98/OsOnly.hs 9 -import Char (isUpper) +import Data.Char (isUpper) hunk ./src/compiler98/ParseCore.hs 16 -#if defined(__HASKELL98__) -#define EVAL(b) -#else -#define EVAL(b) (Eval b) => -#endif - hunk ./src/compiler98/ParseCore.hs 48 -ap :: EVAL(b) Parser (a->b) i c -> Parser a i c -> Parser b i c +ap :: Parser (a->b) i c -> Parser a i c -> Parser b i c hunk ./src/compiler98/ParseLib.hs 43 -#if defined(__HASKELL98__) -#define EVAL(b) -#else -#define EVAL(b) (Eval b) => -#endif hunk ./src/compiler98/ParseLib.hs 44 - -revAp :: EVAL(b) Parser a i c -> Parser (a->b) i c -> Parser b i c +revAp :: Parser a i c -> Parser (a->b) i c -> Parser b i c hunk ./src/compiler98/ParseLib.hs 95 -parseAp :: EVAL(b) (a->b) -> Parser a i c -> Parser b i c +parseAp :: (a->b) -> Parser a i c -> Parser b i c hunk ./src/compiler98/ParseLib.hs 103 -apCut :: EVAL(b) Parser (a->b) i c -> Parser a i c -> Parser b i c +apCut :: Parser (a->b) i c -> Parser a i c -> Parser b i c hunk ./src/compiler98/PrettySyntax.hs 24 -import Maybe(isJust,fromJust) +import Data.Maybe(isJust,fromJust) hunk ./src/compiler98/Syntax.hs 7 -import Ratio -import Maybe(isNothing,fromJust) +import Data.Ratio +import Data.Maybe(isNothing,fromJust) hunk ./src/compiler98/SysDeps.hs 1 -module SysDeps ( - module PackedString, trace, isAlphaNum -) where +module SysDeps + ( PackedString, packString, unpackPS + , trace, isAlphaNum + ) where hunk ./src/compiler98/SysDeps.hs 6 -#if __GLASGOW_HASKELL__ >= 502 +#if __GLASGOW_HASKELL__ >= 608 +#elif __GLASGOW_HASKELL__ >= 502 hunk ./src/compiler98/SysDeps.hs 21 -#if defined(__HASKELL98__) +#if __GLASGOW_HASKELL__ >= 700 +import Data.Char (isAlphaNum) +#elif defined(__HASKELL98__) hunk ./src/compiler98/SysDeps.hs 31 + +#if __GLASGOW_HASKELL__ >= 608 +type PackedString = String +packString = id +unpackPS = id +#endif hunk ./src/compiler98/TokenId.hs 7 -import Char(isUpper) +import Data.Char(isUpper) hunk ./src/compiler98/Unlit.hs 7 -import Char +import Data.Char hunk ./src/trans/AuxFile.hs 8 -import Monad(when) -import IO(hPutStr,stderr) -import Maybe(isNothing,fromJust) -import List(isPrefixOf,nub,minimumBy,elemIndex) +import Control.Monad(when) +import System.IO(hPutStr,stderr) +import Data.Maybe(isNothing,fromJust) +import Data.List(isPrefixOf,nub,minimumBy,elemIndex) hunk ./src/trans/AuxLabelAST.hs 6 -import List (nubBy) -import Char (isUpper) -import Maybe (isJust) +import Data.List (nubBy) +import Data.Char (isUpper) +import Data.Maybe (isJust) hunk ./src/trans/AuxTypes.hs 3 -import Char (isDigit,isUpper) -import List (isPrefixOf) +import Data.Char (isDigit,isUpper) +import Data.List (isPrefixOf) hunk ./src/trans/Flags.hs 32 -import IO +import System.IO hunk ./src/trans/Flags.hs 35 -import List(isPrefixOf,isSuffixOf) -import Char(isDigit) +import Data.List(isPrefixOf,isSuffixOf) +import Data.Char(isDigit) hunk ./src/trans/Flags.hs 105 - _ -> error ("\nUsage: hat-trans file.[l]hs\n\ -\ hat-trans tmpfile.[l]hs origfile.[l]hs\n") + _ -> error ("\nUsage: hat-trans file.[l]hs\n" + ++" hat-trans tmpfile.[l]hs origfile.[l]hs\n") hunk ./src/trans/HatTrans.hs 1 +{-# LANGUAGE ScopedTypeVariables #-} hunk ./src/trans/HatTrans.hs 10 -import IO -import System -import Monad(when) -import List(isPrefixOf,intersperse,inits) -import Directory(doesDirectoryExist,createDirectory) +import System.IO +import System.Exit +import System.IO.Error +import System.Environment +import Control.Exception (catch,IOException) +import Control.Monad(when) +import Data.List(isPrefixOf,intersperse,inits) +import System.Directory(doesDirectoryExist,createDirectory) hunk ./src/trans/HatTrans.hs 82 - <- catch (readFile filename) (can'tOpen filename) + <- catch (readFile filename) + (\(e::IOException)->can'tOpen filename e) hunk ./src/trans/TraceId.hs 54 -import Maybe (isJust) +import Data.Maybe (isJust) hunk ./src/trans/TraceTrans.hs 38 -import List (isPrefixOf,union,partition,nubBy,delete) -import Char (isAlpha,digitToInt) -import Ratio (numerator,denominator) -import Maybe (fromJust,catMaybes,isNothing,isJust) +import Data.List (isPrefixOf,union,partition,nubBy,delete) +import Data.Char (isAlpha,digitToInt) +import Data.Ratio (numerator,denominator) +import Data.Maybe (fromJust,catMaybes,isNothing,isJust) hunk ./src/trans/Wrapper.hs 41 -import Maybe +import Data.Maybe