Merge pull request #12 from FPtje/fp/fix-ghc-9.6

Fix incompatibility with GHC 9.6
UU-ComputerScience · Aug 8, 2023 · f84e64b · f84e64b
2 parents 55d7cda + 6cec92c
commit f84e64b
Show file tree

Hide file tree

Showing 6 changed files with 140 additions and 163 deletions.
diff --git a/uuagc/trunk/cabal-plugin/src/Distribution/Simple/UUAGC/Parser.hs b/uuagc/trunk/cabal-plugin/src/Distribution/Simple/UUAGC/Parser.hs
@@ -13,14 +13,10 @@ import Options
 import System.Console.GetOpt
 import System.IO.Unsafe(unsafeInterleaveIO)
 import System.IO(hPutStr,stderr)
-import Control.Monad.Error.Class
 
 data ParserError = DefParserError String
                  deriving (Show, Eq, Read)
 
-instance Error ParserError where
-    strMsg x = DefParserError x
-
 uFlags :: [String]
 uFlags = concat [ filter (not . null) x | Option _ x _ _ <- options]
 

diff --git a/uuagc/trunk/src-ag/PrintErrorMessages.ag b/uuagc/trunk/src-ag/PrintErrorMessages.ag
@@ -6,17 +6,8 @@ import UU.Scanner.Position(Pos(..), noPos)
 import ErrorMessages
 import Data.List(mapAccumL)
 import GrammarInfo
-import qualified Control.Monad.Error.Class as Err
 }
 
-
-{
-instance Err.Error Error where
-  noMsg  = Err.strMsg "error"
-  strMsg = CustomError False noPos . pp
-}
-
-
 {
 isError :: Options -> Error -> Bool
 isError _ (ParserError     _ _ _    ) = True
@@ -653,4 +644,3 @@ ppInterface :: Show a => a -> PP_Doc
 ppInterface inter = wfill ["interface:", show inter]
 
 }
-