diff --git a/Cabal-tests/tests/ParserTests.hs b/Cabal-tests/tests/ParserTests.hs index 8368ed19451..09b7490d268 100644 --- a/Cabal-tests/tests/ParserTests.hs +++ b/Cabal-tests/tests/ParserTests.hs @@ -10,11 +10,22 @@ import Test.Tasty import Test.Tasty.Golden.Advanced (goldenTest) import Test.Tasty.HUnit -import Control.Monad (unless, void) +import Control.Monad (void) import Data.Algorithm.Diff (PolyDiff (..), getGroupedDiff) import Data.Maybe (isNothing) import Distribution.Fields (pwarning) -import Distribution.PackageDescription (GenericPackageDescription) +import Distribution.PackageDescription + ( GenericPackageDescription + , packageDescription + , gpdScannedVersion + , genPackageFlags + , condLibrary + , condSubLibraries + , condForeignLibs + , condExecutables + , condTestSuites + , condBenchmarks + ) import Distribution.PackageDescription.Parsec (parseGenericPackageDescription) import Distribution.PackageDescription.PrettyPrint (showGenericPackageDescription) import Distribution.Parsec (PWarnType (..), PWarning (..), showPErrorWithSource, showPWarningWithSource) @@ -233,12 +244,22 @@ formatGoldenTest fp = cabalGoldenTest "format" correct $ do #ifdef MIN_VERSION_tree_diff treeDiffGoldenTest :: FilePath -> TestTree treeDiffGoldenTest fp = ediffGolden goldenTest "expr" exprFile $ do - contents <- BS.readFile input - let res = withSource (PCabalFile (fp, contents)) $ parseGenericPackageDescription contents - let (_, x) = runParseResult res - case x of - Right gpd -> pure (toExpr gpd) - Left (_, errs) -> fail $ unlines $ "ERROR" : map (showPErrorWithSource . fmap renderCabalFileSource) (NE.toList errs) + contents <- BS.readFile input + let res = withSource (PCabalFile (fp, contents)) $ parseGenericPackageDescription contents + let (_, x) = runParseResult res + case x of + Right gpd -> pure $ toExpr + ( packageDescription gpd + , gpdScannedVersion gpd + , genPackageFlags gpd + , condLibrary gpd + , condSubLibraries gpd + , condForeignLibs gpd + , condExecutables gpd + , condTestSuites gpd + , condBenchmarks gpd + ) + Left (_, errs) -> fail $ unlines $ "ERROR" : map (showPErrorWithSource . fmap renderCabalFileSource) (NE.toList errs) where input = "tests" "ParserTests" "regressions" fp exprFile = replaceExtension input "expr" @@ -250,24 +271,38 @@ formatRoundTripTest fp = testCase "roundtrip" $ do x <- parse contents let contents' = showGenericPackageDescription x y <- parse (toUTF8BS contents') - -- previously we mangled licenses a bit - let y' = y + + let checkField field = + field x == field y @? {- FOURMOLU_DISABLE -} - unless (x == y') $ #ifdef MIN_VERSION_tree_diff - assertFailure $ unlines - [ "re-parsed doesn't match" - , show $ ansiWlEditExpr $ ediff x y - ] + unlines + [ "re-parsed doesn't match" + , show $ ansiWlEditExpr $ ediff x y + ] #else - assertFailure $ unlines - [ "re-parsed doesn't match" - , "expected" - , show x - , "actual" - , show y - ] + unlines + [ "re-parsed doesn't match" + , "expected" + , show x + , "actual" + , show y + ] #endif + -- Due to the imports being merged, the structural comparison will fail + -- Instead, we check the equality after merging + sequence_ + [ checkField packageDescription + , checkField gpdScannedVersion + , checkField genPackageFlags + , checkField condLibrary + , checkField condSubLibraries + , checkField condForeignLibs + , checkField condExecutables + , checkField condTestSuites + , checkField condBenchmarks + ] + where parse :: BS.ByteString -> IO GenericPackageDescription parse c = do diff --git a/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr index 634b27b8828..247f70ac3de 100644 --- a/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr +++ b/Cabal-tests/tests/ParserTests/regressions/Octree-0.5.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_8, package = PackageIdentifier { @@ -67,10 +66,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -86,11 +85,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -178,11 +177,11 @@ GenericPackageDescription { (OrLaterVersion (mkVersion [2, 4, 0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [ + condTreeComponents = []}) + [] + [] + [] + [ _×_ (UnqualComponentName "test_Octree") @@ -199,11 +198,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -303,11 +302,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -400,5 +399,5 @@ GenericPackageDescription { (PackageName "markdown-unlit") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condBenchmarks = []} + condTreeComponents = []}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/anynone.expr b/Cabal-tests/tests/ParserTests/regressions/anynone.expr index 927605d6058..ead1ea3d662 100644 --- a/Cabal-tests/tests/ParserTests/regressions/anynone.expr +++ b/Cabal-tests/tests/ParserTests/regressions/anynone.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -33,10 +32,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -52,11 +51,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -113,9 +112,9 @@ GenericPackageDescription { (PackageName "base") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/big-version.expr b/Cabal-tests/tests/ParserTests/regressions/big-version.expr index 4d3659e4592..ad19d7949c4 100644 --- a/Cabal-tests/tests/ParserTests/regressions/big-version.expr +++ b/Cabal-tests/tests/ParserTests/regressions/big-version.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -35,10 +34,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -53,11 +52,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -106,9 +105,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr b/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr index 41e0fd5377a..5dcae95adf2 100644 --- a/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr +++ b/Cabal-tests/tests/ParserTests/regressions/common-conditional.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -45,15 +44,15 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [ + extraFiles = []} + Nothing + [ MkPackageFlag { flagName = FlagName "foo", flagDescription = "", flagDefault = True, - flagManual = True}], - condLibrary = Just + flagManual = True}] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -69,11 +68,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -148,11 +147,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -242,11 +241,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -304,11 +303,11 @@ GenericPackageDescription { mainLibSet], condTreeComponents = []}, condBranchIfFalse = Nothing}]}, - condBranchIfFalse = Nothing}]}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [ + condBranchIfFalse = Nothing}]}) + [] + [] + [] + [ _×_ (UnqualComponentName "tests") CondNode { @@ -323,11 +322,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -402,11 +401,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -474,11 +473,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -569,11 +568,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -649,11 +648,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -712,5 +711,5 @@ GenericPackageDescription { mainLibSet], condTreeComponents = []}, condBranchIfFalse = Nothing}]}, - condBranchIfFalse = Nothing}]}], - condBenchmarks = []} + condBranchIfFalse = Nothing}]}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/common.expr b/Cabal-tests/tests/ParserTests/regressions/common.expr index e8c766460f2..74a5b764371 100644 --- a/Cabal-tests/tests/ParserTests/regressions/common.expr +++ b/Cabal-tests/tests/ParserTests/regressions/common.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_10, package = PackageIdentifier { @@ -48,10 +47,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -67,11 +66,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -128,11 +127,11 @@ GenericPackageDescription { (PackageName "ghc-prim") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [ + condTreeComponents = []}) + [] + [] + [] + [ _×_ (UnqualComponentName "tests") CondNode { @@ -147,11 +146,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -208,5 +207,5 @@ GenericPackageDescription { (PackageName "HUnit") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condBenchmarks = []} + condTreeComponents = []}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/common2.expr b/Cabal-tests/tests/ParserTests/regressions/common2.expr index af882207fc4..91d471240ca 100644 --- a/Cabal-tests/tests/ParserTests/regressions/common2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/common2.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_2, package = PackageIdentifier { @@ -44,10 +43,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -63,11 +62,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -166,11 +165,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -227,8 +226,8 @@ GenericPackageDescription { (OrLaterVersion (mkVersion [0])) mainLibSet], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}, - condSubLibraries = [ + condBranchIfFalse = Nothing}]}) + [ _×_ (UnqualComponentName "internal") CondNode { @@ -248,11 +247,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -353,11 +352,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -414,10 +413,10 @@ GenericPackageDescription { (OrLaterVersion (mkVersion [0])) mainLibSet], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [ + condBranchIfFalse = Nothing}]}] + [] + [] + [ _×_ (UnqualComponentName "tests") CondNode { @@ -432,11 +431,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -535,11 +534,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -615,11 +614,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -695,11 +694,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -749,5 +748,5 @@ GenericPackageDescription { testCodeGenerators = []}, condTreeConstraints = [], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}], - condBenchmarks = []} + condBranchIfFalse = Nothing}]}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/common3.expr b/Cabal-tests/tests/ParserTests/regressions/common3.expr index be783c4cab6..cbe8a978ea8 100644 --- a/Cabal-tests/tests/ParserTests/regressions/common3.expr +++ b/Cabal-tests/tests/ParserTests/regressions/common3.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_2, package = PackageIdentifier { @@ -48,10 +47,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -67,11 +66,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -128,11 +127,11 @@ GenericPackageDescription { (PackageName "ghc-prim") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [ + condTreeComponents = []}) + [] + [] + [] + [ _×_ (UnqualComponentName "tests") CondNode { @@ -147,11 +146,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -232,5 +231,5 @@ GenericPackageDescription { (PackageName "HUnit") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condBenchmarks = []} + condTreeComponents = []}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/elif.expr b/Cabal-tests/tests/ParserTests/regressions/elif.expr index e04821eaaef..d93ce0fe88b 100644 --- a/Cabal-tests/tests/ParserTests/regressions/elif.expr +++ b/Cabal-tests/tests/ParserTests/regressions/elif.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_10, package = PackageIdentifier { @@ -43,10 +42,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -62,11 +61,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -133,11 +132,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -194,9 +193,9 @@ GenericPackageDescription { (OrLaterVersion (mkVersion [0])) mainLibSet], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condBranchIfFalse = Nothing}]}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/elif2.expr b/Cabal-tests/tests/ParserTests/regressions/elif2.expr index 88eb02d59d7..052996447c7 100644 --- a/Cabal-tests/tests/ParserTests/regressions/elif2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/elif2.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_2, package = PackageIdentifier { @@ -43,10 +42,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -62,11 +61,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -133,11 +132,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -209,11 +208,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -279,11 +278,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -355,11 +354,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -407,9 +406,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}}]}}]}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}}]}}]}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr b/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr index 02c4a4222c7..f267fa9a404 100644 --- a/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr +++ b/Cabal-tests/tests/ParserTests/regressions/encoding-0.8.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_12, package = PackageIdentifier { @@ -48,10 +47,10 @@ GenericPackageDescription { SymbolicPath "--"], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -67,11 +66,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -140,9 +139,9 @@ GenericPackageDescription { (ThisVersion (mkVersion [4, 4]))) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr b/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr index a7cdf1a4300..9f63d24ff43 100644 --- a/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr +++ b/Cabal-tests/tests/ParserTests/regressions/generics-sop.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_10, package = PackageIdentifier { @@ -124,10 +123,10 @@ GenericPackageDescription { SymbolicPath "CHANGELOG.md"], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -163,11 +162,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -334,11 +333,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -421,11 +420,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -526,11 +525,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -599,11 +598,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -654,11 +653,11 @@ GenericPackageDescription { mixins = []}}, condTreeConstraints = [], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [ + condBranchIfFalse = Nothing}]}) + [] + [] + [] + [ _×_ (UnqualComponentName "doctests") CondNode { @@ -673,11 +672,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -771,11 +770,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -851,5 +850,5 @@ GenericPackageDescription { (PackageName "generics-sop") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condBenchmarks = []} + condTreeComponents = []}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr b/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr index 9dfa089a3d5..5c0961709d2 100644 --- a/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr +++ b/Cabal-tests/tests/ParserTests/regressions/hasktorch.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_2, package = PackageIdentifier { @@ -55,9 +54,9 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [ + extraFiles = []} + Nothing + [ MkPackageFlag { flagName = FlagName "cuda", flagDescription = @@ -69,8 +68,8 @@ GenericPackageDescription { flagDescription = "only build with Double and Long support", flagDefault = False, - flagManual = False}], - condLibrary = Just + flagManual = False}] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -268,11 +267,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -603,11 +602,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -848,11 +847,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -1051,11 +1050,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -1105,8 +1104,7 @@ GenericPackageDescription { condTreeConstraints = [], condTreeComponents = []}, condBranchIfFalse = Nothing}]}, - condBranchIfFalse = Nothing}]}, - condSubLibraries = + condBranchIfFalse = Nothing}]}) [ _×_ (UnqualComponentName @@ -1391,11 +1389,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -2713,11 +2711,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -2805,11 +2803,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -5034,11 +5032,11 @@ GenericPackageDescription { cppOptions = [ "-DCUDA", "-DHASKTORCH_INTERNAL_CUDA"], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -6406,11 +6404,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -6499,11 +6497,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -8169,11 +8167,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -8660,11 +8658,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -9426,11 +9424,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -9531,9 +9529,9 @@ GenericPackageDescription { (EarlierVersion (mkVersion [0, 0, 2]))) mainLibSet], - condTreeComponents = []}], - condForeignLibs = [], - condExecutables = [ + condTreeComponents = []}] + [] + [ _×_ (UnqualComponentName "isdefinite-cpu") @@ -9549,11 +9547,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -9657,11 +9655,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -9765,11 +9763,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -9862,11 +9860,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -9944,8 +9942,8 @@ GenericPackageDescription { (PackageName "hasktorch") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condTestSuites = [ + condTreeComponents = []}] + [ _×_ (UnqualComponentName "spec") CondNode { @@ -9960,11 +9958,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -10244,5 +10242,5 @@ GenericPackageDescription { (PackageName "generic-lens") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condBenchmarks = []} + condTreeComponents = []}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr b/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr index 553b88dc595..eb2439d74fe 100644 --- a/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr +++ b/Cabal-tests/tests/ParserTests/regressions/hidden-main-lib.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -35,10 +34,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -54,11 +53,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -115,9 +114,9 @@ GenericPackageDescription { (PackageName "base") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation.expr b/Cabal-tests/tests/ParserTests/regressions/indentation.expr index f36a8997717..461ac4e71f5 100644 --- a/Cabal-tests/tests/ParserTests/regressions/indentation.expr +++ b/Cabal-tests/tests/ParserTests/regressions/indentation.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -45,10 +44,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -63,11 +62,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -116,9 +115,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation2.expr b/Cabal-tests/tests/ParserTests/regressions/indentation2.expr index 11afbcfd5d3..29498ea153f 100644 --- a/Cabal-tests/tests/ParserTests/regressions/indentation2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/indentation2.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -38,10 +37,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -56,11 +55,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -109,9 +108,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/indentation3.expr b/Cabal-tests/tests/ParserTests/regressions/indentation3.expr index 964bad3f924..4ff93a5f792 100644 --- a/Cabal-tests/tests/ParserTests/regressions/indentation3.expr +++ b/Cabal-tests/tests/ParserTests/regressions/indentation3.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -40,10 +39,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -58,11 +57,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -111,9 +110,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr b/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr index 996fa26eece..3c4bc89b0f8 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-5055.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_0, package = PackageIdentifier { @@ -35,13 +34,13 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Nothing, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [ + extraFiles = []} + Nothing + [] + Nothing + [] + [] + [ _×_ (UnqualComponentName "flag-test-exe") @@ -57,11 +56,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -126,8 +125,8 @@ GenericPackageDescription { (EarlierVersion (mkVersion [5]))) mainLibSet], - condTreeComponents = []}], - condTestSuites = [ + condTreeComponents = []}] + [ _×_ (UnqualComponentName "flag-cabal-test") @@ -143,11 +142,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -231,11 +230,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -285,5 +284,5 @@ GenericPackageDescription { testCodeGenerators = []}, condTreeConstraints = [], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}], - condBenchmarks = []} + condBranchIfFalse = Nothing}]}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr b/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr index c3e08359046..1fb51537e27 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-5846.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -33,10 +32,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -51,11 +50,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -176,9 +175,9 @@ GenericPackageDescription { (UnqualComponentName "a"), LSubLibName (UnqualComponentName "b")]))], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr index 001d3c86515..0068ed026a3 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-6083-a.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_4, package = PackageIdentifier { @@ -33,10 +32,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -51,11 +50,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -130,8 +129,8 @@ GenericPackageDescription { LSubLibName (UnqualComponentName "sublib")]))], - condTreeComponents = []}, - condSubLibraries = [ + condTreeComponents = []}) + [ _×_ (UnqualComponentName "sublib") CondNode { @@ -149,11 +148,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -202,9 +201,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}], - condForeignLibs = [], - condExecutables = [ + condTreeComponents = []}] + [] + [ _×_ (UnqualComponentName "demo-a") CondNode { @@ -219,11 +218,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -302,11 +301,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -380,6 +379,6 @@ GenericPackageDescription { LSubLibName (UnqualComponentName "sublib")]))], - condTreeComponents = []}], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr index ca99e3d554f..bc3bc498439 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-6083-b.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -33,10 +32,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -51,11 +50,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -130,8 +129,8 @@ GenericPackageDescription { LSubLibName (UnqualComponentName "sublib")]))], - condTreeComponents = []}, - condSubLibraries = [ + condTreeComponents = []}) + [ _×_ (UnqualComponentName "sublib") CondNode { @@ -149,11 +148,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -202,9 +201,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}], - condForeignLibs = [], - condExecutables = [ + condTreeComponents = []}] + [] + [ _×_ (UnqualComponentName "demo-a") CondNode { @@ -219,11 +218,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -312,11 +311,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -390,6 +389,6 @@ GenericPackageDescription { LSubLibName (UnqualComponentName "sublib")]))], - condTreeComponents = []}], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr index b2f47a1a938..6027c9e9024 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-6083-c.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_4, package = PackageIdentifier { @@ -33,10 +32,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -51,11 +50,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -130,8 +129,8 @@ GenericPackageDescription { LSubLibName (UnqualComponentName "sublib")]))], - condTreeComponents = []}, - condSubLibraries = [ + condTreeComponents = []}) + [ _×_ (UnqualComponentName "sublib") CondNode { @@ -149,11 +148,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -202,8 +201,8 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr b/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr index ce7c453e697..c65067d2cc0 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-6083-pkg-pkg.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -33,10 +32,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -51,11 +50,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -120,9 +119,9 @@ GenericPackageDescription { (PackageName "freetype") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/issue-774.expr b/Cabal-tests/tests/ParserTests/regressions/issue-774.expr index 4aeb65cb960..6a049b22cb6 100644 --- a/Cabal-tests/tests/ParserTests/regressions/issue-774.expr +++ b/Cabal-tests/tests/ParserTests/regressions/issue-774.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_12, package = PackageIdentifier { @@ -42,10 +41,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -61,11 +60,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -118,9 +117,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr b/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr index b6dc81fee1b..97750a5aa8e 100644 --- a/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr +++ b/Cabal-tests/tests/ParserTests/regressions/jaeger-flamegraph.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_2, package = PackageIdentifier { @@ -74,10 +73,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -93,11 +92,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -175,10 +174,10 @@ GenericPackageDescription { (MajorBoundVersion (mkVersion [2, 12, 6, 1])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [ + condTreeComponents = []}) + [] + [] + [ _×_ (UnqualComponentName "jaeger-flamegraph") @@ -194,11 +193,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -339,8 +338,8 @@ GenericPackageDescription { (MajorBoundVersion (mkVersion [1, 2, 3, 1])) mainLibSet], - condTreeComponents = []}], - condTestSuites = [ + condTreeComponents = []}] + [ _×_ (UnqualComponentName "tests") CondNode { @@ -361,11 +360,11 @@ GenericPackageDescription { (MajorBoundVersion (mkVersion [4, 2, 1]))], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -476,5 +475,5 @@ GenericPackageDescription { (MajorBoundVersion (mkVersion [0, 10])) mainLibSet], - condTreeComponents = []}], - condBenchmarks = []} + condTreeComponents = []}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr b/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr index 3a1d7d5f075..ccacd5b5422 100644 --- a/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/leading-comma-2.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -35,10 +34,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -61,11 +60,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -162,9 +161,9 @@ GenericPackageDescription { (PackageName "directory") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr b/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr index 230ebf53136..8ae9d323ce7 100644 --- a/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr +++ b/Cabal-tests/tests/ParserTests/regressions/leading-comma.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_2, package = PackageIdentifier { @@ -35,10 +34,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -54,11 +53,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -155,9 +154,9 @@ GenericPackageDescription { (PackageName "directory") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/libpq1.expr b/Cabal-tests/tests/ParserTests/regressions/libpq1.expr index b331abffcca..ff665dc58b5 100644 --- a/Cabal-tests/tests/ParserTests/regressions/libpq1.expr +++ b/Cabal-tests/tests/ParserTests/regressions/libpq1.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_8, package = PackageIdentifier { @@ -112,16 +111,16 @@ GenericPackageDescription { SymbolicPath "CHANGELOG.md"], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [ + extraFiles = []} + Nothing + [ MkPackageFlag { flagName = FlagName "use-pkg-config", flagDescription = "", flagDefault = False, - flagManual = True}], - condLibrary = Just + flagManual = True}] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -144,11 +143,11 @@ GenericPackageDescription { (mkVersion [0]))], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -250,11 +249,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -337,11 +336,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -424,11 +423,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [ @@ -499,11 +498,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -569,11 +568,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -637,11 +636,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -707,11 +706,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -761,9 +760,9 @@ GenericPackageDescription { condTreeConstraints = [], condTreeComponents = []}, condBranchIfFalse = - Nothing}]}}]}}]}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + Nothing}]}}]}}]}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/libpq2.expr b/Cabal-tests/tests/ParserTests/regressions/libpq2.expr index 9f6a16ada6e..4369c33fb02 100644 --- a/Cabal-tests/tests/ParserTests/regressions/libpq2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/libpq2.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -116,16 +115,16 @@ GenericPackageDescription { SymbolicPath "CHANGELOG.md"], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [ + extraFiles = []} + Nothing + [ MkPackageFlag { flagName = FlagName "use-pkg-config", flagDescription = "", flagDefault = False, - flagManual = True}], - condLibrary = Just + flagManual = True}] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -149,11 +148,11 @@ GenericPackageDescription { (OrLaterVersion (mkVersion [0]))], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -255,11 +254,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -342,11 +341,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -429,11 +428,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [ @@ -501,11 +500,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -571,11 +570,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -639,11 +638,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -709,11 +708,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -763,9 +762,9 @@ GenericPackageDescription { condTreeConstraints = [], condTreeComponents = []}, condBranchIfFalse = - Nothing}]}}]}}]}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + Nothing}]}}]}}]}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr index 0a137660468..b5c4b707678 100644 --- a/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr +++ b/Cabal-tests/tests/ParserTests/regressions/mixin-1.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_0, package = PackageIdentifier { @@ -33,13 +32,13 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Nothing, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [ + extraFiles = []} + Nothing + [] + Nothing + [] + [] + [ _×_ (UnqualComponentName "str-example") @@ -55,11 +54,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -160,6 +159,6 @@ GenericPackageDescription { (PackageName "str-bytestring") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr index 6c2239df825..025264cc0b8 100644 --- a/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/mixin-2.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -33,13 +32,13 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Nothing, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [ + extraFiles = []} + Nothing + [] + Nothing + [] + [] + [ _×_ (UnqualComponentName "str-example") @@ -55,11 +54,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -160,6 +159,6 @@ GenericPackageDescription { (PackageName "str-bytestring") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr b/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr index a4a94aac32c..ff0211a8a5a 100644 --- a/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr +++ b/Cabal-tests/tests/ParserTests/regressions/mixin-3.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -33,13 +32,13 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Nothing, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [ + extraFiles = []} + Nothing + [] + Nothing + [] + [] + [ _×_ (UnqualComponentName "str-example") @@ -55,11 +54,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -143,6 +142,6 @@ GenericPackageDescription { (PackageName "str-bytestring") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/monad-param.expr b/Cabal-tests/tests/ParserTests/regressions/monad-param.expr index db28c928ddb..b0607d45fba 100644 --- a/Cabal-tests/tests/ParserTests/regressions/monad-param.expr +++ b/Cabal-tests/tests/ParserTests/regressions/monad-param.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_0, package = PackageIdentifier { @@ -43,10 +42,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -63,11 +62,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -154,9 +153,9 @@ GenericPackageDescription { (PackageName "stm") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr b/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr index d2f1efdd913..4395c5c5e88 100644 --- a/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/multiple-libs-2.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_0, package = PackageIdentifier { @@ -35,10 +34,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -54,11 +53,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -115,8 +114,8 @@ GenericPackageDescription { (PackageName "base") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [ + condTreeComponents = []}) + [ _×_ (UnqualComponentName "public") CondNode { @@ -135,11 +134,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -196,8 +195,8 @@ GenericPackageDescription { (PackageName "base") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/noVersion.expr b/Cabal-tests/tests/ParserTests/regressions/noVersion.expr index 838f87733eb..8e462c3dcb5 100644 --- a/Cabal-tests/tests/ParserTests/regressions/noVersion.expr +++ b/Cabal-tests/tests/ParserTests/regressions/noVersion.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_22, package = PackageIdentifier { @@ -35,10 +34,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -54,11 +53,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -115,9 +114,9 @@ GenericPackageDescription { (PackageName "bad-package") (EarlierVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr b/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr index ccfe4421c7b..37d799dfcc8 100644 --- a/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr +++ b/Cabal-tests/tests/ParserTests/regressions/nothing-unicode.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_10, package = PackageIdentifier { @@ -45,15 +44,15 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [ + extraFiles = []} + Nothing + [ MkPackageFlag { flagName = FlagName "\28961", flagDescription = "\28961", flagDefault = True, - flagManual = False}], - condLibrary = Just + flagManual = False}] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -69,11 +68,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -140,11 +139,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -193,9 +192,9 @@ GenericPackageDescription { mixins = []}}, condTreeConstraints = [], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condBranchIfFalse = Nothing}]}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/shake.expr b/Cabal-tests/tests/ParserTests/regressions/shake.expr index 5be08b04064..57fec04d172 100644 --- a/Cabal-tests/tests/ParserTests/regressions/shake.expr +++ b/Cabal-tests/tests/ParserTests/regressions/shake.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_18, package = PackageIdentifier { @@ -150,16 +149,16 @@ GenericPackageDescription { extraDocFiles = [ SymbolicPath "CHANGES.txt", SymbolicPath "README.md"], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [ + extraFiles = []} + Nothing + [ MkPackageFlag { flagName = FlagName "portable", flagDescription = "Obtain FileTime using portable functions", flagDefault = False, - flagManual = True}], - condLibrary = Just + flagManual = True}] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -189,11 +188,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -480,11 +479,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = ["-DPORTABLE"], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -550,11 +549,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -627,11 +626,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -697,11 +696,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -778,11 +777,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -839,10 +838,10 @@ GenericPackageDescription { (OrLaterVersion (mkVersion [0])) mainLibSet], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [ + condBranchIfFalse = Nothing}]}) + [] + [] + [ _×_ (UnqualComponentName "shake") CondNode { @@ -857,11 +856,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -1183,11 +1182,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -1253,11 +1252,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = ["-DPORTABLE"], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -1320,11 +1319,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -1394,11 +1393,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -1461,11 +1460,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -1539,11 +1538,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -1600,8 +1599,8 @@ GenericPackageDescription { (OrLaterVersion (mkVersion [0])) mainLibSet], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}], - condTestSuites = [ + condBranchIfFalse = Nothing}]}] + [ _×_ (UnqualComponentName "shake-test") @@ -1617,11 +1616,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -1992,11 +1991,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -2064,11 +2063,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -2136,11 +2135,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = ["-DPORTABLE"], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -2207,11 +2206,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -2285,11 +2284,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -2356,11 +2355,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -2438,11 +2437,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -2500,5 +2499,5 @@ GenericPackageDescription { (OrLaterVersion (mkVersion [0])) mainLibSet], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}], - condBenchmarks = []} + condBranchIfFalse = Nothing}]}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr index 88500d2d365..3a07138ce1a 100644 --- a/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr +++ b/Cabal-tests/tests/ParserTests/regressions/spdx-1.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_0, package = PackageIdentifier { @@ -34,10 +33,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -52,11 +51,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -105,9 +104,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr index 9cd00ea1103..660f49c9da0 100644 --- a/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr +++ b/Cabal-tests/tests/ParserTests/regressions/spdx-2.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_2, package = PackageIdentifier { @@ -38,10 +37,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -56,11 +55,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -109,9 +108,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr b/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr index e8b2eca8989..17fa80ed692 100644 --- a/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr +++ b/Cabal-tests/tests/ParserTests/regressions/spdx-3.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV2_4, package = PackageIdentifier { @@ -38,10 +37,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -56,11 +55,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -109,9 +108,9 @@ GenericPackageDescription { targetBuildDepends = [], mixins = []}}, condTreeConstraints = [], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr b/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr index 2db686aa40f..af67967879c 100644 --- a/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr +++ b/Cabal-tests/tests/ParserTests/regressions/th-lift-instances.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_10, package = PackageIdentifier { @@ -62,10 +61,10 @@ GenericPackageDescription { SymbolicPath "README.md"], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -81,11 +80,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -235,11 +234,11 @@ GenericPackageDescription { (EarlierVersion (mkVersion [0, 11]))) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [ + condTreeComponents = []}) + [] + [] + [] + [ _×_ (UnqualComponentName "tests") CondNode { @@ -254,11 +253,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -435,11 +434,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -544,11 +543,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -598,5 +597,5 @@ GenericPackageDescription { testCodeGenerators = []}, condTreeConstraints = [], condTreeComponents = []}, - condBranchIfFalse = Nothing}]}], - condBenchmarks = []} + condBranchIfFalse = Nothing}]}] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/version-sets.expr b/Cabal-tests/tests/ParserTests/regressions/version-sets.expr index c086ae618aa..d95cb453c7b 100644 --- a/Cabal-tests/tests/ParserTests/regressions/version-sets.expr +++ b/Cabal-tests/tests/ParserTests/regressions/version-sets.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV3_0, package = PackageIdentifier { @@ -60,10 +59,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -78,11 +77,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -259,9 +258,9 @@ GenericPackageDescription { (MajorBoundVersion (mkVersion [2, 2, 0, 0]))) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}) + [] + [] + [] + [] + [] diff --git a/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr b/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr index e4e6a457a3d..c2749e7204a 100644 --- a/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr +++ b/Cabal-tests/tests/ParserTests/regressions/wl-pprint-indef.expr @@ -1,5 +1,4 @@ -GenericPackageDescription { - packageDescription = +`(,,,,,,,,)` PackageDescription { specVersion = CabalSpecV1_6, package = PackageIdentifier { @@ -52,10 +51,10 @@ GenericPackageDescription { extraSrcFiles = [], extraTmpFiles = [], extraDocFiles = [], - extraFiles = []}, - gpdScannedVersion = Nothing, - genPackageFlags = [], - condLibrary = Just + extraFiles = []} + Nothing + [] + (Just CondNode { condTreeData = Library { libName = LMainLibName, @@ -72,11 +71,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -142,10 +141,10 @@ GenericPackageDescription { (OrLaterVersion (mkVersion [0, 1, 0, 0])) mainLibSet], - condTreeComponents = []}, - condSubLibraries = [], - condForeignLibs = [], - condExecutables = [ + condTreeComponents = []}) + [] + [] + [ _×_ (UnqualComponentName "wl-pprint-string-example") @@ -161,11 +160,11 @@ GenericPackageDescription { buildTools = [], buildToolDepends = [], cppOptions = [], - jsppOptions = [], asmOptions = [], cmmOptions = [], ccOptions = [], cxxOptions = [], + jsppOptions = [], ldOptions = [], hsc2hsOptions = [], pkgconfigDepends = [], @@ -241,6 +240,6 @@ GenericPackageDescription { (PackageName "wl-pprint-indef") (OrLaterVersion (mkVersion [0])) mainLibSet], - condTreeComponents = []}], - condTestSuites = [], - condBenchmarks = []} + condTreeComponents = []}] + [] + [] diff --git a/Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs b/Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs index f7e7ca5b7b6..b51606922a8 100644 --- a/Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs +++ b/Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs @@ -56,6 +56,28 @@ instance ToExpr (SymbolicPathX allowAbs from to) instance ToExpr a => ToExpr (InstallDirs a) +instance + ( ToExpr a + , ToExpr b + , ToExpr c + , ToExpr d + , ToExpr e + , ToExpr f + , ToExpr g + , ToExpr h + , ToExpr i + ) => + ToExpr ( a + , b + , c + , d + , e + , f + , g + , h + , i + ) + instance ToExpr AbiDependency instance ToExpr AbiHash instance ToExpr Arch