WIP: clash-ghc: Fixup files for formatting compatibility

rowanG077 · rowanG077 · commit 348bb5fbb20d · 2024-06-18T21:45:20.000+02:00
diff --git a/clash-ghc/src-bin-8.10/Clash/GHCi/UI.hs b/clash-ghc/src-bin-8.10/Clash/GHCi/UI.hs
@@ -454,6 +454,13 @@ default_prompt_cont = generatePromptFunctionFromString "%s| "
 default_args :: [String]
 default_args = []
 
+setEncodingUtf8mingw :: IO ()
+#if defined(mingw32_HOST_OS)
+setEncodingUtf8mingw = hSetEncoding stdin utf8
+#else
+setEncodingUtf8mingw = pure ()
+#endif
+
 interactiveUI :: GhciSettings -> [(FilePath, Maybe Phase)] -> Maybe [String]
               -> Ghc ()
 interactiveUI config srcs maybe_exprs = do
@@ -504,12 +511,10 @@ interactiveUI config srcs maybe_exprs = do
         -- intended for the program, so unbuffer stdin.
         liftIO $ hSetBuffering stdin NoBuffering
         liftIO $ hSetBuffering stderr NoBuffering
-#if defined(mingw32_HOST_OS)
         -- On Unix, stdin will use the locale encoding.  The IO library
         -- doesn't do this on Windows (yet), so for now we use UTF-8,
         -- for consistency with GHC 6.10 and to make the tests work.
-        liftIO $ hSetEncoding stdin utf8
-#endif
+        liftIO setEncodingUtf8mingw
 
    default_editor <- liftIO $ findEditor
    eval_wrapper <- mkEvalWrapper default_progname default_args
diff --git a/clash-ghc/src-bin-8.10/Clash/Main.hs b/clash-ghc/src-bin-8.10/Clash/Main.hs
@@ -186,6 +186,13 @@ defaultMainWithAction startAction = flip withArgs $ do
                 Right postLoadMode ->
                     main' postLoadMode dflagsExtra1 argv3 flagWarnings startAction r
 
+strt_dot_sl :: String -> Bool
+#if defined(mingw32_HOST_OS)
+strt_dot_sl fp = "./" `isPrefixOf` fp || ".\\" `isPrefixOf` fp
+#else
+strt_dot_sl fp = "./" `isPrefixOf` fp
+#endif
+
 main' :: PostLoadMode -> DynFlags -> [Located String] -> [Warn]
       -> Ghc ()
       -> IORef ClashOpts
@@ -274,14 +281,9 @@ main' postLoadMode dflags0 args flagWarnings startAction clashOpts = do
      -- #12674: Filenames starting with a hypen get normalised from ./-foo.hs
      -- to -foo.hs. We have to re-prepend the current directory.
     normalise_hyp fp
-        | strt_dot_sl && "-" `isPrefixOf` nfp = cur_dir ++ nfp
+        | strt_dot_sl fp && "-" `isPrefixOf` nfp = cur_dir ++ nfp
         | otherwise                           = nfp
         where
-#if defined(mingw32_HOST_OS)
-          strt_dot_sl = "./" `isPrefixOf` fp || ".\\" `isPrefixOf` fp
-#else
-          strt_dot_sl = "./" `isPrefixOf` fp
-#endif
           cur_dir = '.' : [pathSeparator]
           nfp = normalise fp
     normal_fileish_paths = map (normalise_hyp . unLoc) fileish_args
@@ -828,14 +830,19 @@ doShowIface dflags file = do
 -- ---------------------------------------------------------------------------
 -- Various banners and verbosity output.
 
+-- Show the GHCi banner
+showGhciWelcomeMsg :: IO ()
+#if defined(HAVE_INTERNAL_INTERPRETER)
+showGhciWelcomeMsg = putStrLn ghciWelcomeMsg
+#else
+showGhciWelcomeMsg = pure ()
+#endif
+
 showBanner :: PostLoadMode -> DynFlags -> IO ()
 showBanner _postLoadMode dflags = do
    let verb = verbosity dflags
 
-#if defined(HAVE_INTERNAL_INTERPRETER)
-   -- Show the GHCi banner
-   when (isInteractiveMode _postLoadMode && verb >= 1) $ putStrLn ghciWelcomeMsg
-#endif
+   when (isInteractiveMode _postLoadMode && verb >= 1) showGhciWelcomeMsg
 
    -- Display details of the configuration in verbose mode
    when (verb >= 2) $
diff --git a/clash-ghc/src-bin-9.0/Clash/GHCi/UI.hs b/clash-ghc/src-bin-9.0/Clash/GHCi/UI.hs
@@ -460,6 +460,13 @@ default_prompt_cont = generatePromptFunctionFromString "| "
 default_args :: [String]
 default_args = []
 
+setEncodingUtf8mingw :: IO ()
+#if defined(mingw32_HOST_OS)
+setEncodingUtf8mingw = hSetEncoding stdin utf8
+#else
+setEncodingUtf8mingw = pure ()
+#endif
+
 interactiveUI :: GhciSettings -> [(FilePath, Maybe Phase)] -> Maybe [String]
               -> Ghc ()
 interactiveUI config srcs maybe_exprs = do
@@ -510,12 +517,10 @@ interactiveUI config srcs maybe_exprs = do
         -- intended for the program, so unbuffer stdin.
         liftIO $ hSetBuffering stdin NoBuffering
         liftIO $ hSetBuffering stderr NoBuffering
-#if defined(mingw32_HOST_OS)
         -- On Unix, stdin will use the locale encoding.  The IO library
         -- doesn't do this on Windows (yet), so for now we use UTF-8,
         -- for consistency with GHC 6.10 and to make the tests work.
-        liftIO $ hSetEncoding stdin utf8
-#endif
+        liftIO setEncodingUtf8mingw
 
    default_editor <- liftIO $ findEditor
    eval_wrapper <- mkEvalWrapper default_progname default_args
diff --git a/clash-ghc/src-bin-9.0/Clash/Main.hs b/clash-ghc/src-bin-9.0/Clash/Main.hs
@@ -188,6 +188,13 @@ defaultMainWithAction startAction = flip withArgs $ do
                 Right postLoadMode ->
                     main' postLoadMode dflagsExtra1 argv3 flagWarnings startAction r
 
+strt_dot_sl :: String -> Bool
+#if defined(mingw32_HOST_OS)
+strt_dot_sl fp = "./" `isPrefixOf` fp || ".\\" `isPrefixOf` fp
+#else
+strt_dot_sl fp = "./" `isPrefixOf` fp
+#endif
+
 main' :: PostLoadMode -> DynFlags -> [Located String] -> [Warn]
       -> Ghc () -> IORef ClashOpts
       -> Ghc ()
@@ -275,14 +282,9 @@ main' postLoadMode dflags0 args flagWarnings startAction clashOpts = do
      -- #12674: Filenames starting with a hypen get normalised from ./-foo.hs
      -- to -foo.hs. We have to re-prepend the current directory.
     normalise_hyp fp
-        | strt_dot_sl && "-" `isPrefixOf` nfp = cur_dir ++ nfp
+        | strt_dot_sl fp && "-" `isPrefixOf` nfp = cur_dir ++ nfp
         | otherwise                           = nfp
         where
-#if defined(mingw32_HOST_OS)
-          strt_dot_sl = "./" `isPrefixOf` fp || ".\\" `isPrefixOf` fp
-#else
-          strt_dot_sl = "./" `isPrefixOf` fp
-#endif
           cur_dir = '.' : [pathSeparator]
           nfp = normalise fp
     normal_fileish_paths = map (normalise_hyp . unLoc) fileish_args
@@ -829,14 +831,19 @@ doShowIface dflags file = do
 -- ---------------------------------------------------------------------------
 -- Various banners and verbosity output.
 
+-- Show the GHCi banner
+showGhciWelcomeMsg :: IO ()
+#if defined(HAVE_INTERNAL_INTERPRETER)
+showGhciWelcomeMsg = putStrLn ghciWelcomeMsg
+#else
+showGhciWelcomeMsg = pure ()
+#endif
+
 showBanner :: PostLoadMode -> DynFlags -> IO ()
 showBanner _postLoadMode dflags = do
    let verb = verbosity dflags
 
-#if defined(HAVE_INTERNAL_INTERPRETER)
-   -- Show the GHCi banner
-   when (isInteractiveMode _postLoadMode && verb >= 1) $ putStrLn ghciWelcomeMsg
-#endif
+  when (isInteractiveMode _postLoadMode && verb >= 1) showGhciWelcomeMsg
 
    -- Display details of the configuration in verbose mode
    when (verb >= 2) $
diff --git a/clash-ghc/src-bin-9.2/Clash/GHCi/UI.hs b/clash-ghc/src-bin-9.2/Clash/GHCi/UI.hs
@@ -481,6 +481,13 @@ default_prompt_cont = generatePromptFunctionFromString "clashi| "
 default_args :: [String]
 default_args = []
 
+setEncodingUtf8mingw :: IO ()
+#if defined(mingw32_HOST_OS)
+setEncodingUtf8mingw = hSetEncoding stdin utf8
+#else
+setEncodingUtf8mingw = pure ()
+#endif
+
 interactiveUI :: GhciSettings -> [(FilePath, Maybe Phase)] -> Maybe [String]
               -> Ghc ()
 interactiveUI config srcs maybe_exprs = do
@@ -528,12 +535,10 @@ interactiveUI config srcs maybe_exprs = do
         -- intended for the program, so unbuffer stdin.
         liftIO $ hSetBuffering stdin NoBuffering
         liftIO $ hSetBuffering stderr NoBuffering
-#if defined(mingw32_HOST_OS)
         -- On Unix, stdin will use the locale encoding.  The IO library
         -- doesn't do this on Windows (yet), so for now we use UTF-8,
         -- for consistency with GHC 6.10 and to make the tests work.
-        liftIO $ hSetEncoding stdin utf8
-#endif
+        liftIO setEncodingUtf8mingw
 
    default_editor <- liftIO $ findEditor
    eval_wrapper <- mkEvalWrapper default_progname default_args
diff --git a/clash-ghc/src-bin-9.2/Clash/Main.hs b/clash-ghc/src-bin-9.2/Clash/Main.hs
@@ -780,14 +780,19 @@ doMake srcs  = do
 -- ---------------------------------------------------------------------------
 -- Various banners and verbosity output.
 
+-- Show the GHCi banner
+showGhciWelcomeMsg :: IO ()
+#if defined(HAVE_INTERNAL_INTERPRETER)
+showGhciWelcomeMsg = putStrLn ghciWelcomeMsg
+#else
+showGhciWelcomeMsg = pure ()
+#endif
+
 showBanner :: PostLoadMode -> DynFlags -> IO ()
 showBanner _postLoadMode dflags = do
    let verb = verbosity dflags
 
-#if defined(HAVE_INTERNAL_INTERPRETER)
-   -- Show the GHCi banner
-   when (isInteractiveMode _postLoadMode && verb >= 1) $ putStrLn ghciWelcomeMsg
-#endif
+   when (isInteractiveMode _postLoadMode && verb >= 1) showGhciWelcomeMsg
 
    -- Display details of the configuration in verbose mode
    when (verb >= 2) $
diff --git a/clash-ghc/src-bin-9.4/Clash/GHCi/UI.hs b/clash-ghc/src-bin-9.4/Clash/GHCi/UI.hs
@@ -503,6 +503,13 @@ default_prompt_cont = generatePromptFunctionFromString "clashi| "
 default_args :: [String]
 default_args = []
 
+setEncodingUtf8mingw :: IO ()
+#if defined(mingw32_HOST_OS)
+setEncodingUtf8mingw = hSetEncoding stdin utf8
+#else
+setEncodingUtf8mingw = pure ()
+#endif
+
 interactiveUI :: GhciSettings -> [(FilePath, Maybe UnitId, Maybe Phase)] -> Maybe [String]
               -> Ghc ()
 interactiveUI config srcs maybe_exprs = do
@@ -557,12 +564,10 @@ interactiveUI config srcs maybe_exprs = do
         -- intended for the program, so unbuffer stdin.
         liftIO $ hSetBuffering stdin NoBuffering
         liftIO $ hSetBuffering stderr NoBuffering
-#if defined(mingw32_HOST_OS)
         -- On Unix, stdin will use the locale encoding.  The IO library
         -- doesn't do this on Windows (yet), so for now we use UTF-8,
         -- for consistency with GHC 6.10 and to make the tests work.
-        liftIO $ hSetEncoding stdin utf8
-#endif
+        liftIO setEncodingUtf8mingw
 
    default_editor <- liftIO $ findEditor
    eval_wrapper <- mkEvalWrapper default_progname default_args
diff --git a/clash-ghc/src-bin-9.4/Clash/Main.hs b/clash-ghc/src-bin-9.4/Clash/Main.hs
@@ -1003,14 +1003,19 @@ createUnitEnvFromFlags unitDflags =
 -- ---------------------------------------------------------------------------
 -- Various banners and verbosity output.
 
+-- Show the GHCi banner
+showGhciWelcomeMsg :: IO ()
+#if defined(HAVE_INTERNAL_INTERPRETER)
+showGhciWelcomeMsg = putStrLn ghciWelcomeMsg
+#else
+showGhciWelcomeMsg = pure ()
+#endif
+
 showBanner :: PostLoadMode -> DynFlags -> IO ()
 showBanner _postLoadMode dflags = do
    let verb = verbosity dflags
 
-#if defined(HAVE_INTERNAL_INTERPRETER)
-   -- Show the GHCi banner
-   when (isInteractiveMode _postLoadMode && verb >= 1) $ putStrLn ghciWelcomeMsg
-#endif
+   when (isInteractiveMode _postLoadMode && verb >= 1) showGhciWelcomeMsg
 
    -- Display details of the configuration in verbose mode
    when (verb >= 2) $
diff --git a/clash-ghc/src-bin-9.6/Clash/GHCi/UI.hs b/clash-ghc/src-bin-9.6/Clash/GHCi/UI.hs
@@ -520,6 +520,13 @@ default_prompt_cont = generatePromptFunctionFromString "clashi| "
 default_args :: [String]
 default_args = []
 
+setEncodingUtf8mingw :: IO ()
+#if defined(mingw32_HOST_OS)
+setEncodingUtf8mingw = hSetEncoding stdin utf8
+#else
+setEncodingUtf8mingw = pure ()
+#endif
+
 interactiveUI :: GhciSettings -> [(FilePath, Maybe UnitId, Maybe Phase)] -> Maybe [String]
               -> Ghc ()
 interactiveUI config srcs maybe_exprs = do
@@ -574,12 +581,11 @@ interactiveUI config srcs maybe_exprs = do
         -- intended for the program, so unbuffer stdin.
         liftIO $ hSetBuffering stdin NoBuffering
         liftIO $ hSetBuffering stderr NoBuffering
-#if defined(mingw32_HOST_OS)
+
         -- On Unix, stdin will use the locale encoding.  The IO library
         -- doesn't do this on Windows (yet), so for now we use UTF-8,
         -- for consistency with GHC 6.10 and to make the tests work.
-        liftIO $ hSetEncoding stdin utf8
-#endif
+        liftIO setEncodingUtf8mingw
 
    default_editor <- liftIO $ findEditor
    eval_wrapper <- mkEvalWrapper default_progname default_args
diff --git a/clash-ghc/src-bin-9.6/Clash/Main.hs b/clash-ghc/src-bin-9.6/Clash/Main.hs
@@ -1016,14 +1016,19 @@ createUnitEnvFromFlags unitDflags =
 -- ---------------------------------------------------------------------------
 -- Various banners and verbosity output.
 
+-- Show the GHCi banner
+showGhciWelcomeMsg :: IO ()
+#if defined(HAVE_INTERNAL_INTERPRETER)
+showGhciWelcomeMsg = putStrLn ghciWelcomeMsg
+#else
+showGhciWelcomeMsg = pure ()
+#endif
+
 showBanner :: PostLoadMode -> DynFlags -> IO ()
 showBanner _postLoadMode dflags = do
    let verb = verbosity dflags
 
-#if defined(HAVE_INTERNAL_INTERPRETER)
-   -- Show the GHCi banner
-   when (isInteractiveMode _postLoadMode && verb >= 1) $ putStrLn ghciWelcomeMsg
-#endif
+   when (isInteractiveMode _postLoadMode && verb >= 1) showGhciWelcomeMsg
 
    -- Display details of the configuration in verbose mode
    when (verb >= 2) $
diff --git a/clash-ghc/src-bin-9.8/Clash/GHCi/UI.hs b/clash-ghc/src-bin-9.8/Clash/GHCi/UI.hs
@@ -516,6 +516,13 @@ default_prompt_cont = generatePromptFunctionFromString "clashi| "
 default_args :: [String]
 default_args = []
 
+setEncodingUtf8mingw :: IO ()
+#if defined(mingw32_HOST_OS)
+setEncodingUtf8mingw = hSetEncoding stdin utf8
+#else
+setEncodingUtf8mingw = pure ()
+#endif
+
 interactiveUI :: GhciSettings -> [(FilePath, Maybe UnitId, Maybe Phase)] -> Maybe [String]
               -> Ghc ()
 interactiveUI config srcs maybe_exprs = do
@@ -570,12 +577,11 @@ interactiveUI config srcs maybe_exprs = do
         -- intended for the program, so unbuffer stdin.
         liftIO $ hSetBuffering stdin NoBuffering
         liftIO $ hSetBuffering stderr NoBuffering
-#if defined(mingw32_HOST_OS)
+
         -- On Unix, stdin will use the locale encoding.  The IO library
         -- doesn't do this on Windows (yet), so for now we use UTF-8,
         -- for consistency with GHC 6.10 and to make the tests work.
-        liftIO $ hSetEncoding stdin utf8
-#endif
+        liftIO setEncodingUtf8mingw
 
    default_editor <- liftIO $ findEditor
    eval_wrapper <- mkEvalWrapper default_progname default_args
diff --git a/clash-ghc/src-bin-9.8/Clash/Main.hs b/clash-ghc/src-bin-9.8/Clash/Main.hs
@@ -1015,14 +1015,19 @@ createUnitEnvFromFlags unitDflags =
 -- ---------------------------------------------------------------------------
 -- Various banners and verbosity output.
 
+-- Show the GHCi banner
+showGhciWelcomeMsg :: IO ()
+#if defined(HAVE_INTERNAL_INTERPRETER)
+showGhciWelcomeMsg = putStrLn ghciWelcomeMsg
+#else
+showGhciWelcomeMsg = pure ()
+#endif
+
 showBanner :: PostLoadMode -> DynFlags -> IO ()
 showBanner _postLoadMode dflags = do
    let verb = verbosity dflags
 
-#if defined(HAVE_INTERNAL_INTERPRETER)
-   -- Show the GHCi banner
-   when (isInteractiveMode _postLoadMode && verb >= 1) $ putStrLn ghciWelcomeMsg
-#endif
+   when (isInteractiveMode _postLoadMode && verb >= 1) showGhciWelcomeMsg
 
    -- Display details of the configuration in verbose mode
    when (verb >= 2) $
diff --git a/clash-ghc/src-ghc/Clash/GHC/ClashFlags.hs b/clash-ghc/src-ghc/Clash/GHC/ClashFlags.hs
@@ -43,14 +43,18 @@ parseClashFlags :: IORef ClashOpts -> [Located String]
                 -> IO ([Located String],[Warn])
 parseClashFlags r = parseClashFlagsFull (flagsClash r)
 
-parseClashFlagsFull :: [Flag IO] -> [Located String]
-                    -> IO ([Located String],[Warn])
-parseClashFlagsFull flagsAvialable args = do
-  (leftovers,errs,warns) <- processArgs flagsAvialable args
+processGhcArgs :: [Flag IO] -> [Located String] -> IO ([Located String], [Err], [Warn])
 #if MIN_VERSION_ghc(9,4,0)
-                              parseResponseFile
+processGhcArgs flagsAvailable args = processArgs flagsAvailable args parseResponseFile
+#else
+processGhcArgs flagsAvailable args = processArgs flagsAvailable args
 #endif
 
+parseClashFlagsFull :: [Flag IO] -> [Located String]
+                    -> IO ([Located String],[Warn])
+parseClashFlagsFull flagsAvailable args = do
+  (leftovers,errs,warns) <- processGhcArgs flagsAvailable args
+
   unless (null errs) $ throwGhcExceptionIO $
     errorsToGhcException . map (("on the commandline", ) .  unLoc . errMsg)
                          $ errs
diff --git a/clash-ghc/src-ghc/Clash/GHC/Evaluator.hs b/clash-ghc/src-ghc/Clash/GHC/Evaluator.hs
diff --git a/clash-ghc/src-ghc/Clash/GHC/Evaluator/Primitive.hs b/clash-ghc/src-ghc/Clash/GHC/Evaluator/Primitive.hs
diff --git a/clash-ghc/src-ghc/Clash/GHC/GHC2Core.hs b/clash-ghc/src-ghc/Clash/GHC/GHC2Core.hs
