Changes to avoid GHC warnings on building

kowainik · Oct 14, 2023 · 0163ff6 · 0163ff6
1 parent bbab16c
commit 0163ff6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/src/Stan/Ghc/Compat810.hs b/src/Stan/Ghc/Compat810.hs
@@ -71,5 +71,5 @@ import qualified Data.Text as T
 showTUnitId :: UnitId -> Text
 showTUnitId = T.pack . unitIdString
 #else
-  where
+  () where
 #endif
diff --git a/src/Stan/Hie.hs b/src/Stan/Hie.hs
@@ -16,6 +16,7 @@ module Stan.Hie
     ) where
 
 import Colourista (errorMessage, infoMessage, warningMessage)
+import Prelude hiding (span)
 import System.Directory (doesDirectoryExist, doesFileExist)
 import System.Directory.Recursive (getDirRecursive)
 import System.FilePath (takeExtension)

diff --git a/src/Stan/Hie/MatchAst.hs b/src/Stan/Hie/MatchAst.hs
@@ -17,7 +17,7 @@ module Stan.Hie.MatchAst
     ) where
 
 import Data.Char (toLower)
-
+import Prelude hiding (span)
 import Stan.Core.List (checkWith)
 import Stan.Ghc.Compat (nameOccName, occNameString)
 import Stan.Hie (slice)
@@ -54,7 +54,7 @@ hieMatchPatternAst hie@HieFile{..} node@Node{..} = \case
            hieMatchPatternAst hie node p1
         && hieMatchPatternAst hie node p2
     PatternAstConstant lit ->
-           Set.member literalAnns (Set.map toNodeAnnotation (nodeAnnotations nodeInfo))
+           Set.member literalAnns (Set.map toNodeAnnotation (nodeAnnotations nodeInfo'))
         && ( let span = slice nodeSpan hie_hs_src in case lit of
                 ExactNum n   -> (span >>= readMaybe . decodeUtf8) == Just n
                 ExactStr s   -> span == Just s
@@ -65,26 +65,26 @@ hieMatchPatternAst hie@HieFile{..} node@Node{..} = \case
     PatternAstName nameMeta patType ->
         any (matchNameAndType nameMeta patType)
         $ Map.assocs
-        $ nodeIdentifiers nodeInfo
+        $ nodeIdentifiers nodeInfo'
     PatternAstNode tags ->
-        matchAnnotations tags nodeInfo
+        matchAnnotations tags nodeInfo'
     PatternAstNodeExact tags patChildren ->
-           matchAnnotations tags nodeInfo
+           matchAnnotations tags nodeInfo'
         && checkWith (hieMatchPatternAst hie) nodeChildren patChildren
     PatternAstVarName varName -> isJust $ find
         (\case
             Right x -> varName `Str.isInfixOf` map toLower (occNameString $ nameOccName x)
             Left _ -> False
         )
-        $ Map.keys $ nodeIdentifiers nodeInfo
+        $ Map.keys $ nodeIdentifiers nodeInfo'
     PatternAstIdentifierDetailsDecl declType -> any (any (isDecl declType) . identInfo) $
-        Map.elems $ nodeIdentifiers nodeInfo
+        Map.elems $ nodeIdentifiers nodeInfo'
   where
     matchAnnotations :: Set NodeAnnotation -> NodeInfo TypeIndex -> Bool
     matchAnnotations tags NodeInfo{..} =
       tags `Set.isSubsetOf` Set.map toNodeAnnotation nodeAnnotations
 
-    nodeInfo = Stan.Hie.Compat.nodeInfo node
+    nodeInfo' = Stan.Hie.Compat.nodeInfo node
 
     matchNameAndType
         :: NameMeta
@@ -93,7 +93,7 @@ hieMatchPatternAst hie@HieFile{..} node@Node{..} = \case
         -> Bool
     matchNameAndType nameMeta patType ids =
         hieMatchNameMeta nameMeta ids
-        && case nodeType nodeInfo of
+        && case nodeType nodeInfo' of
             []    -> False
             t : _ -> hieMatchPatternType hie_types patType t
 

diff --git a/src/Stan/Pattern/Ast.hs b/src/Stan/Pattern/Ast.hs
@@ -190,6 +190,7 @@ foo :: Some -> Type
 typeSig :: PatternAst
 typeSig = PatternAstNode $ one (mkNodeAnnotation "TypeSig" "Sig")
 
+absBinds :: NodeAnnotation
 absBinds =
 #if __GLASGOW_HASKELL__ < 904
   mkNodeAnnotation "AbsBinds" "HsBindLR"

diff --git a/src/Stan/Pattern/Type.hs b/src/Stan/Pattern/Type.hs
@@ -107,6 +107,7 @@ listFunPattern :: PatternType
 listFunPattern = listPattern |-> (?)
 
 -- | 'PatternType' for 'Integer'.
+integerPattern :: PatternType
 integerPattern =
 #if __GLASGOW_HASKELL__ < 900
   integerPattern810
@@ -115,6 +116,7 @@ integerPattern =
 #endif
 
 -- | 'PatternType' for 'Natural'.
+naturalPattern :: PatternType
 naturalPattern =
 #if __GLASGOW_HASKELL__ < 900
   naturalPattern810