Minimize __MHS__ differences.

Author: augustss

System/OsPath/Common.hs

@@ -45,13 +45,11 @@ module System.OsPath
   , PS.unsafeEncodeUtf
   , PS.encodeWith
   , encodeFS
-#if !defined(__MHS__)
 #if defined(WINDOWS) || defined(POSIX)
   , pstr
 #else
   , osp
 #endif
-#endif /* !defined(__MHS__) */
   , PS.pack
 
   -- * Filepath deconstruction
@@ -126,26 +124,22 @@ import System.OsString.Windows as PS
 import Data.Bifunctor ( bimap )
 import qualified System.OsPath.Windows.Internal as C
 import GHC.IO.Encoding.UTF16 ( mkUTF16le )
-#if !defined(__MHS__)
 import Language.Haskell.TH.Quote
     ( QuasiQuoter (..) )
 import Language.Haskell.TH.Syntax
     ( Lift (..), lift )
-#endif
 import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
 import Control.Monad ( when )
 
 #elif defined(POSIX)
 import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
 import Control.Monad ( when )
-#if !defined(__MHS__)
 import Language.Haskell.TH.Quote
     ( QuasiQuoter (..) )
 import Language.Haskell.TH.Syntax
     ( Lift (..), lift )
-#endif
-import GHC.IO.Encoding.UTF8 ( mkUTF8 )
 
+import GHC.IO.Encoding.UTF8 ( mkUTF8 )
 import System.OsPath.Types
 import System.OsString.Posix as PS
     ( unsafeFromChar
@@ -164,16 +158,14 @@ import qualified System.OsPath.Posix.Internal as C
 #else
 
 import System.OsPath.Internal as PS
-    ( decodeUtf
+    ( osp
+    , decodeUtf
     , decodeWith
     , pack
     , encodeUtf
     , unsafeEncodeUtf
     , encodeWith
     , unpack
-#if !defined(__MHS__)
-    , osp
-#endif
     )
 import System.OsPath.Types
     ( OsPath )

System/OsPath/Internal.hs

@@ -15,21 +15,21 @@ import Control.Monad.Catch
     ( MonadThrow )
 import Data.ByteString
     ( ByteString )
-#if !defined(__MHS__)
 import Language.Haskell.TH.Quote
     ( QuasiQuoter (..) )
 import Language.Haskell.TH.Syntax
     ( Lift (..), lift )
-import System.IO
-    ( TextEncoding )
-#else
-import GHC.IO.Encoding.Types ( TextEncoding )
-#endif
 import GHC.IO.Encoding.Failure ( CodingFailureMode(..) )
 
 import System.OsString.Internal.Types
 import System.OsPath.Encoding
 import Control.Monad (when)
+#if !defined(__MHS__)
+import System.IO
+    ( TextEncoding )
+#else
+import GHC.IO.Encoding.Types ( TextEncoding )
+#endif
 
 #if defined(mingw32_HOST_OS) || defined(__MINGW32__)
 import qualified System.OsPath.Windows as PF
@@ -128,7 +128,7 @@ fromBytes = OS.fromBytes
 
 
 
-#if !defined(__MHS__)
+#if defined(MIN_VERSION_template_haskell) || defined(MIN_VERSION_template_haskell_quasi_quoter)
 -- | QuasiQuote an 'OsPath'. This accepts Unicode characters
 -- and encodes as UTF-8 on unix and UTF-16LE on windows. Runs 'isValid'
 -- on the input. If used as a pattern, requires turning on the @ViewPatterns@
@@ -164,7 +164,10 @@ osp = QuasiQuoter
       fail "illegal QuasiQuote (allowed as expression or pattern only, used as a declaration)"
   }
 #endif
-#endif /* !defined(__MHS__) */
+#else
+osp :: a
+osp = error "Systen.OsPath.Internal.ostr: no Template Haskell"
+#endif /* defined(MIN_VERSION_template_haskell) || defined(MIN_VERSION_template_haskell_quasi_quoter) */
 
 
 -- | Unpack an 'OsPath' to a list of 'OsChar'.

System/OsPath/Posix.hs

@@ -11,7 +11,7 @@
 
 #include "Common.hs"
 
-#if !defined(__MHS__)
+#if defined(MIN_VERSION_template_haskell) || defined(MIN_VERSION_template_haskell_quasi_quoter)
 -- | QuasiQuote a 'PosixPath'. This accepts Unicode characters
 -- and encodes as UTF-8. Runs 'isValid' on the input.
 pstr :: QuasiQuoter
@@ -30,5 +30,8 @@ pstr =
   , quoteDec  = \_ ->
       fail "illegal QuasiQuote (allowed as expression or pattern only, used as a declaration)"
   }
-#endif /* !defined(__MHS__) */
+#else
+pstr :: a
+pstr = error "Systen.OsPath.Posix.pstr: no Template Haskell"
+#endif /* defined(MIN_VERSION_template_haskell) || defined(MIN_VERSION_template_haskell_quasi_quoter) */
 

System/OsPath/Windows.hs

@@ -11,7 +11,7 @@
 
 #include "Common.hs"
 
-#if !defined(__MHS__)
+#if defined(MIN_VERSION_template_haskell) || defined(MIN_VERSION_template_haskell_quasi_quoter)
 -- | QuasiQuote a 'WindowsPath'. This accepts Unicode characters
 -- and encodes as UTF-16LE. Runs 'isValid' on the input.
 pstr :: QuasiQuoter
@@ -30,4 +30,7 @@ pstr =
   , quoteDec  = \_ ->
       fail "illegal QuasiQuote (allowed as expression or pattern only, used as a declaration)"
   }
-#endif /* !defined(__MHS__) */
+#else
+pstr :: a
+pstr = error "Systen.OsPath.Windows.pstr: no Template Haskell"
+#endif /* defined(MIN_VERSION_template_haskell) || defined(MIN_VERSION_template_haskell_quasi_quoter) */