Apply Cabal-syntax changes to remaining modules

Author: patrickdoc

Cabal-QuickCheck/Cabal-QuickCheck.cabal

@@ -13,8 +13,9 @@ library
   build-depends:
     , base
     , bytestring
-    , Cabal       ^>=3.7.0.0
-    , QuickCheck  ^>=2.13.2 || ^>=2.14
+    , Cabal        ^>=3.7.0.0
+    , Cabal-syntax ^>=3.7.0.0
+    , QuickCheck   ^>=2.13.2 || ^>=2.14
 
   if !impl(ghc >= 8.0)
     build-depends: semigroups

Cabal-described/Cabal-described.cabal

@@ -12,6 +12,7 @@ library
   build-depends:
     , base
     , Cabal             ^>=3.7.0.0
+    , Cabal-syntax      ^>=3.7.0.0
     , containers
     , pretty
     , QuickCheck

Cabal-syntax/Cabal-syntax.cabal

@@ -77,22 +77,27 @@ library
     build-depends:  tagged >=0.8.6 && <0.9, bytestring-builder >= 0.10.8 && <0.11
 
   exposed-modules:
+    Distribution.Backpack
+    Distribution.BuildToolDepends
+    Distribution.CCompiler
     Distribution.CabalSpecVersion
     Distribution.Compat.Binary
     Distribution.Compat.CharParsing
     Distribution.Compat.DList
     Distribution.Compat.Exception
+    Distribution.Compat.Graph
     Distribution.Compat.Lens
     Distribution.Compat.MonadFail
     Distribution.Compat.Newtype
     Distribution.Compat.NonEmptySet
     Distribution.Compat.Parsing
-    Distribution.Compat.Prelude
+    Distribution.Compat.Prelude.Internal
     Distribution.Compat.Semigroup
     Distribution.Compat.Typeable
     Distribution.Compiler
     Distribution.FieldGrammar
     Distribution.FieldGrammar.Class
+    Distribution.FieldGrammar.FieldDescrs
     Distribution.FieldGrammar.Newtypes
     Distribution.FieldGrammar.Parsec
     Distribution.FieldGrammar.Pretty
@@ -104,10 +109,12 @@ library
     Distribution.Fields.ParseResult
     Distribution.Fields.Parser
     Distribution.Fields.Pretty
+    Distribution.InstalledPackageInfo
     Distribution.License
     Distribution.ModuleName
     Distribution.Package
     Distribution.PackageDescription
+    Distribution.PackageDescription.Check
     Distribution.PackageDescription.Configuration
     Distribution.PackageDescription.FieldGrammar
     Distribution.PackageDescription.Parsec
@@ -128,6 +135,7 @@ library
     Distribution.SPDX.LicenseListVersion
     Distribution.SPDX.LicenseReference
     Distribution.System
+    Distribution.Types.AbiDependency
     Distribution.Types.AbiHash
     Distribution.Types.Benchmark
     Distribution.Types.Benchmark.Lens
@@ -149,6 +157,7 @@ library
     Distribution.Types.Executable
     Distribution.Types.Executable.Lens
     Distribution.Types.ExecutableScope
+    Distribution.Types.ExposedModule
     Distribution.Types.Flag
     Distribution.Types.ForeignLib
     Distribution.Types.ForeignLib.Lens
@@ -158,6 +167,9 @@ library
     Distribution.Types.GenericPackageDescription.Lens
     Distribution.Types.HookedBuildInfo
     Distribution.Types.IncludeRenaming
+    Distribution.Types.InstalledPackageInfo
+    Distribution.Types.InstalledPackageInfo.FieldGrammar
+    Distribution.Types.InstalledPackageInfo.Lens
     Distribution.Types.LegacyExeDependency
     Distribution.Types.Lens
     Distribution.Types.Library
@@ -195,7 +207,9 @@ library
     Distribution.Types.VersionInterval
     Distribution.Types.VersionRange
     Distribution.Types.VersionRange.Internal
+    Distribution.Utils.Base62
     Distribution.Utils.Generic
+    Distribution.Utils.Glob
     Distribution.Utils.MD5
     Distribution.Utils.Path
     Distribution.Utils.ShortText
@@ -204,6 +218,9 @@ library
     Distribution.Version
     Language.Haskell.Extension
 
+  other-modules:
+    Distribution.Compat.Prelude
+
   other-extensions:
     BangPatterns
     CPP

Cabal/src/Distribution/Backpack.hs renamed to Cabal-syntax/src/Distribution/Backpack.hs

@@ -3,7 +3,7 @@
 -- This modules provides functions for working with both the legacy
 -- "build-tools" field, and its replacement, "build-tool-depends". Prefer using
 -- the functions contained to access those fields directly.
-module Distribution.Simple.BuildToolDepends where
+module Distribution.BuildToolDepends where
 
 import           Prelude ()
 import           Distribution.Compat.Prelude

Cabal/src/Distribution/Simple/BuildToolDepends.hs renamed to Cabal-syntax/src/Distribution/BuildToolDepends.hs

@@ -39,7 +39,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -}
 
-module Distribution.Simple.CCompiler (
+module Distribution.CCompiler (
    CDialect(..),
    cSourceExtensions,
    cDialectFilenameExtension,

Cabal/src/Distribution/Simple/CCompiler.hs renamed to Cabal-syntax/src/Distribution/CCompiler.hs

@@ -0,0 +1,81 @@
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE RankNTypes #-}
+
+module Distribution.Compat.CreatePipe (createPipe) where
+
+#if MIN_VERSION_process(1,2,1)
+import System.Process (createPipe)
+#else
+import System.IO (Handle, hSetBinaryMode)
+
+import Prelude ()
+import Distribution.Compat.Prelude
+import Distribution.Compat.Stack
+
+-- The mingw32_HOST_OS CPP macro is GHC-specific
+#ifdef mingw32_HOST_OS
+import qualified Prelude
+import Control.Exception (onException)
+import Foreign.C.Error (throwErrnoIfMinus1_)
+import Foreign.C.Types (CInt(..), CUInt(..))
+import Foreign.Ptr (Ptr)
+import Foreign.Marshal.Array (allocaArray)
+import Foreign.Storable (peek, peekElemOff)
+import GHC.IO.FD (mkFD)
+import GHC.IO.Device (IODeviceType(Stream))
+import GHC.IO.Handle.FD (mkHandleFromFD)
+import System.IO (IOMode(ReadMode, WriteMode))
+#elif defined ghcjs_HOST_OS
+#else
+import System.Posix.IO (fdToHandle)
+import qualified System.Posix.IO as Posix
+#endif
+
+createPipe :: IO (Handle, Handle)
+-- The mingw32_HOST_OS CPP macro is GHC-specific
+#ifdef mingw32_HOST_OS
+createPipe = do
+    (readfd, writefd) <- allocaArray 2 $ \ pfds -> do
+        throwErrnoIfMinus1_ "_pipe" $ c__pipe pfds 2 ({- _O_BINARY -} 32768)
+        readfd <- peek pfds
+        writefd <- peekElemOff pfds 1
+        return (readfd, writefd)
+    (do readh <- fdToHandle readfd ReadMode
+        writeh <- fdToHandle writefd WriteMode
+        hSetBinaryMode readh True
+        hSetBinaryMode writeh True
+        return (readh, writeh)) `onException` (close readfd >> close writefd)
+  where
+    fdToHandle :: CInt -> IOMode -> IO Handle
+    fdToHandle fd mode = do
+        (fd', deviceType) <- mkFD fd mode (Just (Stream, 0, 0)) False False
+        mkHandleFromFD fd' deviceType "" mode False Nothing
+
+    close :: CInt -> IO ()
+    close = throwErrnoIfMinus1_ "_close" . c__close
+      where _ = callStack -- TODO: attach call stack to exception
+
+    _ = callStack -- TODO: attach call stack to exceptions
+
+foreign import ccall "io.h _pipe" c__pipe ::
+    Ptr CInt -> CUInt -> CInt -> Prelude.IO CInt
+
+foreign import ccall "io.h _close" c__close ::
+    CInt -> Prelude.IO CInt
+#elif defined ghcjs_HOST_OS
+createPipe = error "createPipe"
+  where
+    _ = callStack
+#else
+createPipe = do
+    (readfd, writefd) <- Posix.createPipe
+    readh <- fdToHandle readfd
+    writeh <- fdToHandle writefd
+    hSetBinaryMode readh True
+    hSetBinaryMode writeh True
+    return (readh, writeh)
+  where
+    _ = callStack
+#endif
+#endif