fix backwards compatibility

HugoPeters1024 · Sep 13, 2022 · 37dcc97 · 37dcc97
1 parent 96bac54
commit 37dcc97
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/ghc-dump-core/GhcDump/Ast.hs b/ghc-dump-core/GhcDump/Ast.hs
@@ -147,6 +147,9 @@ instance Serialise TyCon
 data TyLit = NumTyLit Int
            | StrTyLit T.Text
            | CharTyLit Char
+           -- TyLit did not always exist, we weaken the definition 
+           -- with this constructor for backwards compatibility.
+           | UnknownLit
             deriving (Eq, Ord, Generic, Show)
 instance Serialise TyLit
 

diff --git a/ghc-dump-core/GhcDump/Convert.hs b/ghc-dump-core/GhcDump/Convert.hs
@@ -8,7 +8,6 @@ module GhcDump.Convert (cvtModule) where
 import Data.Bifunctor
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as TE
-import GHC.Data.FastString (unpackFS)
 
 #if MIN_VERSION_ghc(9,0,0)
 import GHC.Types.Literal (Literal(..))
@@ -342,10 +341,17 @@ cvtModule' phaseId phase guts =
 cvtModuleName :: HasEnv => Module.ModuleName -> Ast.ModuleName
 cvtModuleName = Ast.ModuleName . fastStringToText . moduleNameFS
 
+#if MIN_VERSION_ghc(9,0,0)
 cvtTyLit :: HasEnv => Type.TyLit -> Ast.TyLit
 cvtTyLit (Type.NumTyLit n) = (Ast.NumTyLit (fromIntegral n))
-cvtTyLit (Type.StrTyLit s) = (Ast.StrTyLit (T.pack (unpackFS s)))
+cvtTyLit (Type.StrTyLit s) = (Ast.StrTyLit (T.pack (FastString.unpackFS s)))
+#if MIN_VERSION_ghc(9,2,0)
 cvtTyLit (Type.CharTyLit c) = (Ast.CharTyLit c)
+#endif
+#else
+cvtTyLit :: HasEnv => a -> Ast.TyLit
+cvtTyLit _ = Ast.UnknownLit
+#endif
 
 cvtType :: HasEnv => Type.Type -> Ast.SType
 #if MIN_VERSION_ghc(9,0,0)