Cabal 3.4.1.0 → 3.6.0.0

raw patch · 820 files changed

+61177/−100411 lines, 820 filesdep −Cabaldep −Diffdep −QuickCheckdep ~arraydep ~basedep ~binaryPVP ok

version bump matches the API change (PVP)

Dependencies removed: Cabal, Diff, QuickCheck, async, base-compat, base-orphans, clock, integer-logarithms, optparse-applicative, rere, stm, tar, tasty, tasty-golden, tasty-hunit, tasty-quickcheck, temporary, tree-diff

Dependency ranges changed: array, base, binary, bytestring, containers, deepseq, directory, filepath, pretty, process, semigroups, tagged, text, time, transformers, void

API changes (from Hackage documentation)

Files

• Cabal-QuickCheck/src/Test/QuickCheck/GenericArbitrary.hs +0/−49
• Cabal-QuickCheck/src/Test/QuickCheck/Instances/Cabal.hs +0/−548
• Cabal-described/src/Distribution/Described.hs +0/−577
• Cabal-described/src/Distribution/Utils/CharSet.hs +0/−242
• Cabal-described/src/Distribution/Utils/GrammarRegex.hs +0/−215
• Cabal-tree-diff/src/Data/TreeDiff/Instances/Cabal.hs +0/−135
• Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalLanguage.hs +0/−17
• Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalSPDX.hs +0/−28
• Cabal-tree-diff/src/Data/TreeDiff/Instances/CabalVersion.hs +0/−14
• Cabal.cabal +14/−491
• ChangeLog.md +10/−25
• Distribution/Backpack.hs +0/−269
• Distribution/Backpack/ComponentsGraph.hs +0/−97
• Distribution/Backpack/Configure.hs +0/−359
• Distribution/Backpack/ConfiguredComponent.hs +0/−308
• Distribution/Backpack/DescribeUnitId.hs +0/−61
• Distribution/Backpack/FullUnitId.hs +0/−26
• Distribution/Backpack/Id.hs +0/−145
• Distribution/Backpack/LinkedComponent.hs +0/−396
• Distribution/Backpack/MixLink.hs +0/−185
• Distribution/Backpack/ModSubst.hs +0/−52
• Distribution/Backpack/ModuleScope.hs +0/−132
• Distribution/Backpack/ModuleShape.hs +0/−84
• Distribution/Backpack/PreExistingComponent.hs +0/−67
• Distribution/Backpack/PreModuleShape.hs +0/−44
• Distribution/Backpack/ReadyComponent.hs +0/−376
• Distribution/Backpack/UnifyM.hs +0/−627
• Distribution/CabalSpecVersion.hs +0/−146
• Distribution/Compat/Async.hs +0/−148
• Distribution/Compat/Binary.hs +0/−71
• Distribution/Compat/Binary/Class.hs +0/−519
• Distribution/Compat/Binary/Generic.hs +0/−128
• Distribution/Compat/CharParsing.hs +0/−357
• Distribution/Compat/CopyFile.hs +0/−250
• Distribution/Compat/CreatePipe.hs +0/−81
• Distribution/Compat/DList.hs +0/−53
• Distribution/Compat/Directory.hs +0/−49
• Distribution/Compat/Environment.hs +0/−134
• Distribution/Compat/Exception.hs +0/−37
• Distribution/Compat/FilePath.hs +0/−27
• Distribution/Compat/GetShortPathName.hs +0/−59
• Distribution/Compat/Graph.hs +0/−408
• Distribution/Compat/Internal/TempFile.hs +0/−137
• Distribution/Compat/Lens.hs +0/−262
• Distribution/Compat/MonadFail.hs +0/−5
• Distribution/Compat/Newtype.hs +0/−91
• Distribution/Compat/NonEmptySet.hs +0/−155
• Distribution/Compat/Parsing.hs +0/−362
• Distribution/Compat/Prelude.hs +0/−316
• Distribution/Compat/Prelude/Internal.hs +0/−14
• Distribution/Compat/Process.hs +0/−82
• Distribution/Compat/ResponseFile.hs +0/−67
• Distribution/Compat/Semigroup.hs +0/−119
• Distribution/Compat/SnocList.hs +0/−33
• Distribution/Compat/Stack.hs +0/−113
• Distribution/Compat/Time.hs +0/−194
• Distribution/Compat/Typeable.hs +0/−18
• Distribution/Compiler.hs +0/−223
• Distribution/FieldGrammar.hs +0/−88
• Distribution/FieldGrammar/Class.hs +0/−205
• Distribution/FieldGrammar/FieldDescrs.hs +0/−121
• Distribution/FieldGrammar/Newtypes.hs +0/−339
• Distribution/FieldGrammar/Parsec.hs +0/−439
• Distribution/FieldGrammar/Pretty.hs +0/−104
• Distribution/Fields.hs +0/−42
• Distribution/Fields/ConfVar.hs +0/−126
• Distribution/Fields/Field.hs +0/−108
• Distribution/Fields/Lexer.hs +0/−496
• Distribution/Fields/LexerMonad.hs +0/−155
• Distribution/Fields/ParseResult.hs +0/−196
• Distribution/Fields/Parser.hs +0/−377
• Distribution/Fields/Pretty.hs +0/−176
• Distribution/GetOpt.hs +0/−209
• Distribution/InstalledPackageInfo.hs +0/−145
• Distribution/Lex.hs +0/−40
• Distribution/License.hs +0/−252
• Distribution/Make.hs +0/−182
• Distribution/ModuleName.hs +0/−131
• Distribution/Package.hs +0/−96
• Distribution/PackageDescription.hs +0/−97
• Distribution/PackageDescription/Check.hs +0/−2389
• Distribution/PackageDescription/Configuration.hs +0/−599
• Distribution/PackageDescription/FieldGrammar.hs +0/−692
• Distribution/PackageDescription/Parsec.hs +0/−975
• Distribution/PackageDescription/PrettyPrint.hs +0/−283
• Distribution/PackageDescription/Quirks.hs +0/−319
• Distribution/PackageDescription/Utils.hs +0/−23
• Distribution/Parsec.hs +0/−524
• Distribution/Parsec/Error.hs +0/−21
• Distribution/Parsec/FieldLineStream.hs +0/−91
• Distribution/Parsec/Position.hs +0/−44
• Distribution/Parsec/Warning.hs +0/−59
• Distribution/Pretty.hs +0/−106
• Distribution/ReadE.hs +0/−49
• Distribution/SPDX.hs +0/−40
• Distribution/SPDX/License.hs +0/−65
• Distribution/SPDX/LicenseExceptionId.hs +0/−294
• Distribution/SPDX/LicenseExpression.hs +0/−162
• Distribution/SPDX/LicenseId.hs +0/−2025
• Distribution/SPDX/LicenseListVersion.hs +0/−20
• Distribution/SPDX/LicenseReference.hs +0/−80
• Distribution/Simple.hs +0/−855
• Distribution/Simple/Bench.hs +0/−125
• Distribution/Simple/Build.hs +0/−733
• Distribution/Simple/Build/Macros.hs +0/−110
• Distribution/Simple/Build/Macros/Z.hs +0/−140
• Distribution/Simple/Build/PathsModule.hs +0/−356
• Distribution/Simple/BuildPaths.hs +0/−256
• Distribution/Simple/BuildTarget.hs +0/−1063
• Distribution/Simple/BuildToolDepends.hs +0/−93
• Distribution/Simple/CCompiler.hs +0/−123
• Distribution/Simple/Command.hs +0/−555
• Distribution/Simple/Compiler.hs +0/−453
• Distribution/Simple/Configure.hs +0/−2092
• Distribution/Simple/Doctest.hs +0/−187
• Distribution/Simple/Flag.hs +0/−132
• Distribution/Simple/GHC.hs +0/−2084
• Distribution/Simple/GHC/EnvironmentParser.hs +0/−49
• Distribution/Simple/GHC/ImplInfo.hs +0/−93
• Distribution/Simple/GHC/Internal.hs +0/−681
• Distribution/Simple/GHCJS.hs +0/−1830
• Distribution/Simple/Glob.hs +0/−306
• Distribution/Simple/Haddock.hs +0/−926
• Distribution/Simple/HaskellSuite.hs +0/−227
• Distribution/Simple/Hpc.hs +0/−149
• Distribution/Simple/Install.hs +0/−258
• Distribution/Simple/InstallDirs.hs +0/−506
• Distribution/Simple/InstallDirs/Internal.hs +0/−127
• Distribution/Simple/LocalBuildInfo.hs +0/−365
• Distribution/Simple/PackageIndex.hs +0/−716
• Distribution/Simple/PreProcess.hs +0/−751
• Distribution/Simple/PreProcess/Unlit.hs +0/−167
• Distribution/Simple/Program.hs +0/−183
• Distribution/Simple/Program/Ar.hs +0/−191
• Distribution/Simple/Program/Builtin.hs +0/−348
• Distribution/Simple/Program/Db.hs +0/−505
• Distribution/Simple/Program/Find.hs +0/−198
• Distribution/Simple/Program/GHC.hs +0/−851
• Distribution/Simple/Program/HcPkg.hs +0/−516
• Distribution/Simple/Program/Hpc.hs +0/−110
• Distribution/Simple/Program/Internal.hs +0/−47
• Distribution/Simple/Program/Ld.hs +0/−92
• Distribution/Simple/Program/ResponseFile.hs +0/−60
• Distribution/Simple/Program/Run.hs +0/−297
• Distribution/Simple/Program/Script.hs +0/−114
• Distribution/Simple/Program/Strip.hs +0/−75
• Distribution/Simple/Program/Types.hs +0/−190
• Distribution/Simple/Register.hs +0/−595
• Distribution/Simple/Setup.hs +0/−2411
• Distribution/Simple/ShowBuildInfo.hs +0/−161
• Distribution/Simple/SrcDist.hs +0/−517
• Distribution/Simple/Test.hs +0/−136
• Distribution/Simple/Test/ExeV10.hs +0/−188
• Distribution/Simple/Test/LibV09.hs +0/−287
• Distribution/Simple/Test/Log.hs +0/−166
• Distribution/Simple/UHC.hs +0/−295
• Distribution/Simple/UserHooks.hs +0/−207
• Distribution/Simple/Utils.hs +0/−1609
• Distribution/Simple/Utils/Json.hs +0/−46
• Distribution/System.hs +0/−275
• Distribution/TestSuite.hs +0/−102
• Distribution/Text.hs +0/−12
• Distribution/Types/AbiDependency.hs +0/−44
• Distribution/Types/AbiHash.hs +0/−61
• Distribution/Types/AnnotatedId.hs +0/−34
• Distribution/Types/Benchmark.hs +0/−77
• Distribution/Types/Benchmark/Lens.hs +0/−27
• Distribution/Types/BenchmarkInterface.hs +0/−46
• Distribution/Types/BenchmarkType.hs +0/−40
• Distribution/Types/BuildInfo.hs +0/−262
• Distribution/Types/BuildInfo/Lens.hs +0/−334
• Distribution/Types/BuildType.hs +0/−55
• Distribution/Types/Component.hs +0/−91
• Distribution/Types/ComponentId.hs +0/−69
• Distribution/Types/ComponentInclude.hs +0/−32
• Distribution/Types/ComponentLocalBuildInfo.hs +0/−129
• Distribution/Types/ComponentName.hs +0/−78
• Distribution/Types/ComponentRequestedSpec.hs +0/−127
• Distribution/Types/CondTree.hs +0/−181
• Distribution/Types/Condition.hs +0/−135
• Distribution/Types/ConfVar.hs +0/−25
• Distribution/Types/Dependency.hs +0/−179
• Distribution/Types/DependencyMap.hs +0/−57
• Distribution/Types/ExeDependency.hs +0/−71
• Distribution/Types/Executable.hs +0/−65
• Distribution/Types/Executable/Lens.hs +0/−31
• Distribution/Types/ExecutableScope.hs +0/−43
• Distribution/Types/ExposedModule.hs +0/−45
• Distribution/Types/Flag.hs +0/−346
• Distribution/Types/ForeignLib.hs +0/−199
• Distribution/Types/ForeignLib/Lens.hs +0/−45
• Distribution/Types/ForeignLibOption.hs +0/−39
• Distribution/Types/ForeignLibType.hs +0/−69
• Distribution/Types/GenericPackageDescription.hs +0/−105
• Distribution/Types/GenericPackageDescription/Lens.hs +0/−131
• Distribution/Types/GivenComponent.hs +0/−28
• Distribution/Types/HookedBuildInfo.hs +0/−66
• Distribution/Types/IncludeRenaming.hs +0/−68
• Distribution/Types/InstalledPackageInfo.hs +0/−173
• Distribution/Types/InstalledPackageInfo/FieldGrammar.hs +0/−317
• Distribution/Types/InstalledPackageInfo/Lens.hs +0/−190
• Distribution/Types/LegacyExeDependency.hs +0/−47
• Distribution/Types/Lens.hs +0/−25
• Distribution/Types/Library.hs +0/−96
• Distribution/Types/Library/Lens.hs +0/−45
• Distribution/Types/LibraryName.hs +0/−73
• Distribution/Types/LibraryVisibility.hs +0/−52
• Distribution/Types/LocalBuildInfo.hs +0/−304
• Distribution/Types/Mixin.hs +0/−93
• Distribution/Types/Module.hs +0/−46
• Distribution/Types/ModuleReexport.hs +0/−50
• Distribution/Types/ModuleRenaming.hs +0/−134
• Distribution/Types/MungedPackageId.hs +0/−83
• Distribution/Types/MungedPackageName.hs +0/−157
• Distribution/Types/PackageDescription.hs +0/−456
• Distribution/Types/PackageDescription/Lens.hs +0/−220
• Distribution/Types/PackageId.hs +0/−74
• Distribution/Types/PackageId/Lens.hs +0/−22
• Distribution/Types/PackageName.hs +0/−73
• Distribution/Types/PackageName/Magic.hs +0/−20
• Distribution/Types/PackageVersionConstraint.hs +0/−74
• Distribution/Types/PkgconfigDependency.hs +0/−39
• Distribution/Types/PkgconfigName.hs +0/−68
• Distribution/Types/PkgconfigVersion.hs +0/−119
• Distribution/Types/PkgconfigVersionRange.hs +0/−161
• Distribution/Types/SetupBuildInfo.hs +0/−41
• Distribution/Types/SetupBuildInfo/Lens.hs +0/−21
• Distribution/Types/SourceRepo.hs +0/−201
• Distribution/Types/SourceRepo/Lens.hs +0/−39
• Distribution/Types/TargetInfo.hs +0/−33
• Distribution/Types/TestSuite.hs +0/−83
• Distribution/Types/TestSuite/Lens.hs +0/−27
• Distribution/Types/TestSuiteInterface.hs +0/−52
• Distribution/Types/TestType.hs +0/−43
• Distribution/Types/UnitId.hs +0/−134
• Distribution/Types/UnqualComponentName.hs +0/−93
• Distribution/Types/Version.hs +0/−242
• Distribution/Types/VersionInterval.hs +0/−364
• Distribution/Types/VersionRange.hs +0/−180
• Distribution/Types/VersionRange/Internal.hs +0/−526
• Distribution/Utils/Base62.hs +0/−22
• Distribution/Utils/Generic.hs +0/−576
• Distribution/Utils/IOData.hs +0/−92
• Distribution/Utils/LogProgress.hs +0/−89
• Distribution/Utils/MD5.hs +0/−79
• Distribution/Utils/MapAccum.hs +0/−34
• Distribution/Utils/NubList.hs +0/−108
• Distribution/Utils/Progress.hs +0/−67
• Distribution/Utils/ShortText.hs +0/−159
• Distribution/Utils/String.hs +0/−93
• Distribution/Utils/Structured.hs +0/−476
• Distribution/Utils/UnionFind.hs +0/−102
• Distribution/Verbosity.hs +0/−345
• Distribution/Verbosity/Internal.hs +0/−27
• Distribution/Version.hs +0/−178
• Distribution/ZinzaPrelude.hs +0/−43
• Language/Haskell/Extension.hs +0/−919
• README.md +0/−102
• doc/README.md +0/−121
• doc/bugs-and-stability.rst +0/−6
• doc/concepts-and-development.rst +0/−7
• doc/conf.py +0/−223
• doc/config-and-install.rst +0/−5
• doc/developing-packages.rst +0/−488
• doc/file-format-changelog.rst +0/−236
• doc/images/Cabal-dark.png binary
• doc/index.rst +0/−21
• doc/installing-packages.rst +0/−247
• doc/intro.rst +0/−200
• doc/misc.rst +0/−103
• doc/nix-local-build-overview.rst +0/−45
• doc/nix-local-build.rst +0/−264
• doc/references.inc +0/−26
• src/Distribution/Backpack.hs +269/−0
• src/Distribution/Backpack/ComponentsGraph.hs +97/−0
• src/Distribution/Backpack/Configure.hs +359/−0
• src/Distribution/Backpack/ConfiguredComponent.hs +308/−0
• src/Distribution/Backpack/DescribeUnitId.hs +61/−0
• src/Distribution/Backpack/FullUnitId.hs +26/−0
• src/Distribution/Backpack/Id.hs +145/−0
• src/Distribution/Backpack/LinkedComponent.hs +396/−0
• src/Distribution/Backpack/MixLink.hs +185/−0
• src/Distribution/Backpack/ModSubst.hs +52/−0
• src/Distribution/Backpack/ModuleScope.hs +132/−0
• src/Distribution/Backpack/ModuleShape.hs +84/−0
• src/Distribution/Backpack/PreExistingComponent.hs +67/−0
• src/Distribution/Backpack/PreModuleShape.hs +44/−0
• src/Distribution/Backpack/ReadyComponent.hs +376/−0
• src/Distribution/Backpack/UnifyM.hs +625/−0
• src/Distribution/CabalSpecVersion.hs +150/−0
• src/Distribution/Compat/Async.hs +148/−0
• src/Distribution/Compat/Binary.hs +71/−0
• src/Distribution/Compat/Binary/Class.hs +519/−0
• src/Distribution/Compat/Binary/Generic.hs +128/−0
• src/Distribution/Compat/CharParsing.hs +357/−0
• src/Distribution/Compat/CopyFile.hs +250/−0
• src/Distribution/Compat/CreatePipe.hs +81/−0
• src/Distribution/Compat/DList.hs +53/−0
• src/Distribution/Compat/Directory.hs +49/−0
• src/Distribution/Compat/Environment.hs +134/−0
• src/Distribution/Compat/Exception.hs +37/−0
• src/Distribution/Compat/FilePath.hs +27/−0
• src/Distribution/Compat/GetShortPathName.hs +59/−0
• src/Distribution/Compat/Graph.hs +408/−0
• src/Distribution/Compat/Internal/TempFile.hs +137/−0
• src/Distribution/Compat/Lens.hs +262/−0
• src/Distribution/Compat/MonadFail.hs +5/−0
• src/Distribution/Compat/Newtype.hs +91/−0
• src/Distribution/Compat/NonEmptySet.hs +155/−0
• src/Distribution/Compat/Parsing.hs +362/−0
• src/Distribution/Compat/Prelude.hs +316/−0
• src/Distribution/Compat/Prelude/Internal.hs +14/−0
• src/Distribution/Compat/Process.hs +82/−0
• src/Distribution/Compat/ResponseFile.hs +67/−0
• src/Distribution/Compat/Semigroup.hs +119/−0
• src/Distribution/Compat/SnocList.hs +33/−0
• src/Distribution/Compat/Stack.hs +113/−0
• src/Distribution/Compat/Time.hs +194/−0
• src/Distribution/Compat/Typeable.hs +18/−0
• src/Distribution/Compiler.hs +223/−0
• src/Distribution/FieldGrammar.hs +88/−0
• src/Distribution/FieldGrammar/Class.hs +205/−0
• src/Distribution/FieldGrammar/FieldDescrs.hs +121/−0
• src/Distribution/FieldGrammar/Newtypes.hs +392/−0
• src/Distribution/FieldGrammar/Parsec.hs +439/−0
• src/Distribution/FieldGrammar/Pretty.hs +104/−0
• src/Distribution/Fields.hs +42/−0
• src/Distribution/Fields/ConfVar.hs +126/−0
• src/Distribution/Fields/Field.hs +141/−0
• src/Distribution/Fields/Lexer.hs +496/−0
• src/Distribution/Fields/LexerMonad.hs +155/−0
• src/Distribution/Fields/ParseResult.hs +196/−0
• src/Distribution/Fields/Parser.hs +377/−0
• src/Distribution/Fields/Pretty.hs +176/−0
• src/Distribution/GetOpt.hs +231/−0
• src/Distribution/InstalledPackageInfo.hs +145/−0
• src/Distribution/Lex.hs +40/−0
• src/Distribution/License.hs +252/−0
• src/Distribution/Make.hs +182/−0
• src/Distribution/ModuleName.hs +131/−0
• src/Distribution/Package.hs +96/−0
• src/Distribution/PackageDescription.hs +113/−0
• src/Distribution/PackageDescription/Check.hs +2392/−0
• src/Distribution/PackageDescription/Configuration.hs +600/−0
• src/Distribution/PackageDescription/FieldGrammar.hs +802/−0
• src/Distribution/PackageDescription/Parsec.hs +980/−0
• src/Distribution/PackageDescription/PrettyPrint.hs +282/−0
• src/Distribution/PackageDescription/Quirks.hs +340/−0
• src/Distribution/PackageDescription/Utils.hs +23/−0
• src/Distribution/Parsec.hs +524/−0
• src/Distribution/Parsec/Error.hs +21/−0
• src/Distribution/Parsec/FieldLineStream.hs +91/−0
• src/Distribution/Parsec/Position.hs +44/−0
• src/Distribution/Parsec/Warning.hs +61/−0
• src/Distribution/Pretty.hs +110/−0
• src/Distribution/ReadE.hs +49/−0
• src/Distribution/SPDX.hs +40/−0
• src/Distribution/SPDX/License.hs +65/−0
• src/Distribution/SPDX/LicenseExceptionId.hs +316/−0
• src/Distribution/SPDX/LicenseExpression.hs +162/−0
• src/Distribution/SPDX/LicenseId.hs +2152/−0
• src/Distribution/SPDX/LicenseListVersion.hs +22/−0
• src/Distribution/SPDX/LicenseReference.hs +80/−0
• src/Distribution/Simple.hs +818/−0
• src/Distribution/Simple/Bench.hs +125/−0
• src/Distribution/Simple/Build.hs +734/−0
• src/Distribution/Simple/Build/Macros.hs +110/−0
• src/Distribution/Simple/Build/Macros/Z.hs +140/−0
• src/Distribution/Simple/Build/PathsModule.hs +165/−0
• src/Distribution/Simple/Build/PathsModule/Z.hs +323/−0
• src/Distribution/Simple/BuildPaths.hs +257/−0
• src/Distribution/Simple/BuildTarget.hs +1064/−0
• src/Distribution/Simple/BuildToolDepends.hs +93/−0
• src/Distribution/Simple/CCompiler.hs +123/−0
• src/Distribution/Simple/Command.hs +594/−0
• src/Distribution/Simple/Compiler.hs +453/−0
• src/Distribution/Simple/Configure.hs +2088/−0
• src/Distribution/Simple/Flag.hs +132/−0
• src/Distribution/Simple/GHC.hs +2087/−0
• src/Distribution/Simple/GHC/EnvironmentParser.hs +49/−0
• src/Distribution/Simple/GHC/ImplInfo.hs +96/−0
• src/Distribution/Simple/GHC/Internal.hs +686/−0
• src/Distribution/Simple/GHCJS.hs +1831/−0
• src/Distribution/Simple/Glob.hs +320/−0
• src/Distribution/Simple/Haddock.hs +926/−0
• src/Distribution/Simple/HaskellSuite.hs +228/−0
• src/Distribution/Simple/Hpc.hs +155/−0
• src/Distribution/Simple/Install.hs +260/−0
• src/Distribution/Simple/InstallDirs.hs +506/−0
• src/Distribution/Simple/InstallDirs/Internal.hs +127/−0
• src/Distribution/Simple/LocalBuildInfo.hs +365/−0
• src/Distribution/Simple/PackageIndex.hs +716/−0
• src/Distribution/Simple/PreProcess.hs +779/−0
• src/Distribution/Simple/PreProcess/Unlit.hs +167/−0
• src/Distribution/Simple/Program.hs +183/−0
• src/Distribution/Simple/Program/Ar.hs +191/−0
• src/Distribution/Simple/Program/Builtin.hs +348/−0
• src/Distribution/Simple/Program/Db.hs +505/−0
• src/Distribution/Simple/Program/Find.hs +198/−0
• src/Distribution/Simple/Program/GHC.hs +850/−0
• src/Distribution/Simple/Program/HcPkg.hs +516/−0
• src/Distribution/Simple/Program/Hpc.hs +109/−0
• src/Distribution/Simple/Program/Internal.hs +47/−0
• src/Distribution/Simple/Program/Ld.hs +92/−0
• src/Distribution/Simple/Program/ResponseFile.hs +60/−0
• src/Distribution/Simple/Program/Run.hs +297/−0
• src/Distribution/Simple/Program/Script.hs +114/−0
• src/Distribution/Simple/Program/Strip.hs +75/−0
• src/Distribution/Simple/Program/Types.hs +190/−0
• src/Distribution/Simple/Register.hs +595/−0
• src/Distribution/Simple/Setup.hs +2348/−0
• src/Distribution/Simple/ShowBuildInfo.hs +162/−0
• src/Distribution/Simple/SrcDist.hs +520/−0
• src/Distribution/Simple/Test.hs +136/−0
• src/Distribution/Simple/Test/ExeV10.hs +193/−0
• src/Distribution/Simple/Test/LibV09.hs +292/−0
• src/Distribution/Simple/Test/Log.hs +166/−0
• src/Distribution/Simple/UHC.hs +296/−0
• src/Distribution/Simple/UserHooks.hs +197/−0
• src/Distribution/Simple/Utils.hs +1609/−0
• src/Distribution/Simple/Utils/Json.hs +46/−0
• src/Distribution/System.hs +275/−0
• src/Distribution/TestSuite.hs +102/−0
• src/Distribution/Text.hs +12/−0
• src/Distribution/Types/AbiDependency.hs +44/−0
• src/Distribution/Types/AbiHash.hs +61/−0
• src/Distribution/Types/AnnotatedId.hs +34/−0
• src/Distribution/Types/Benchmark.hs +77/−0
• src/Distribution/Types/Benchmark/Lens.hs +27/−0
• src/Distribution/Types/BenchmarkInterface.hs +46/−0
• src/Distribution/Types/BenchmarkType.hs +40/−0
• src/Distribution/Types/BuildInfo.hs +266/−0
• src/Distribution/Types/BuildInfo/Lens.hs +342/−0
• src/Distribution/Types/BuildType.hs +55/−0
• src/Distribution/Types/Component.hs +91/−0
• src/Distribution/Types/ComponentId.hs +69/−0
• src/Distribution/Types/ComponentInclude.hs +32/−0
• src/Distribution/Types/ComponentLocalBuildInfo.hs +129/−0
• src/Distribution/Types/ComponentName.hs +78/−0
• src/Distribution/Types/ComponentRequestedSpec.hs +127/−0
• src/Distribution/Types/CondTree.hs +181/−0
• src/Distribution/Types/Condition.hs +135/−0
• src/Distribution/Types/ConfVar.hs +25/−0
• src/Distribution/Types/Dependency.hs +179/−0
• src/Distribution/Types/DependencyMap.hs +57/−0
• src/Distribution/Types/ExeDependency.hs +71/−0
• src/Distribution/Types/Executable.hs +65/−0
• src/Distribution/Types/Executable/Lens.hs +31/−0
• src/Distribution/Types/ExecutableScope.hs +43/−0
• src/Distribution/Types/ExposedModule.hs +45/−0
• src/Distribution/Types/Flag.hs +346/−0
• src/Distribution/Types/ForeignLib.hs +199/−0
• src/Distribution/Types/ForeignLib/Lens.hs +45/−0
• src/Distribution/Types/ForeignLibOption.hs +39/−0
• src/Distribution/Types/ForeignLibType.hs +69/−0
• src/Distribution/Types/GenericPackageDescription.hs +105/−0
• src/Distribution/Types/GenericPackageDescription/Lens.hs +131/−0
• src/Distribution/Types/GivenComponent.hs +28/−0
• src/Distribution/Types/HookedBuildInfo.hs +66/−0
• src/Distribution/Types/IncludeRenaming.hs +68/−0
• src/Distribution/Types/InstalledPackageInfo.hs +173/−0
• src/Distribution/Types/InstalledPackageInfo/FieldGrammar.hs +317/−0
• src/Distribution/Types/InstalledPackageInfo/Lens.hs +190/−0
• src/Distribution/Types/LegacyExeDependency.hs +47/−0
• src/Distribution/Types/Lens.hs +25/−0
• src/Distribution/Types/Library.hs +96/−0
• src/Distribution/Types/Library/Lens.hs +45/−0
• src/Distribution/Types/LibraryName.hs +73/−0
• src/Distribution/Types/LibraryVisibility.hs +52/−0
• src/Distribution/Types/LocalBuildInfo.hs +304/−0
• src/Distribution/Types/Mixin.hs +93/−0
• src/Distribution/Types/Module.hs +46/−0
• src/Distribution/Types/ModuleReexport.hs +50/−0
• src/Distribution/Types/ModuleRenaming.hs +134/−0
• src/Distribution/Types/MungedPackageId.hs +83/−0
• src/Distribution/Types/MungedPackageName.hs +157/−0
• src/Distribution/Types/PackageDescription.hs +457/−0
• src/Distribution/Types/PackageDescription/Lens.hs +221/−0
• src/Distribution/Types/PackageId.hs +74/−0
• src/Distribution/Types/PackageId/Lens.hs +22/−0
• src/Distribution/Types/PackageName.hs +73/−0
• src/Distribution/Types/PackageName/Magic.hs +20/−0
• src/Distribution/Types/PackageVersionConstraint.hs +74/−0
• src/Distribution/Types/PkgconfigDependency.hs +39/−0
• src/Distribution/Types/PkgconfigName.hs +68/−0
• src/Distribution/Types/PkgconfigVersion.hs +119/−0
• src/Distribution/Types/PkgconfigVersionRange.hs +161/−0
• src/Distribution/Types/SetupBuildInfo.hs +41/−0
• src/Distribution/Types/SetupBuildInfo/Lens.hs +21/−0
• src/Distribution/Types/SourceRepo.hs +201/−0
• src/Distribution/Types/SourceRepo/Lens.hs +39/−0
• src/Distribution/Types/TargetInfo.hs +33/−0
• src/Distribution/Types/TestSuite.hs +83/−0
• src/Distribution/Types/TestSuite/Lens.hs +27/−0
• src/Distribution/Types/TestSuiteInterface.hs +52/−0
• src/Distribution/Types/TestType.hs +43/−0
• src/Distribution/Types/UnitId.hs +134/−0
• src/Distribution/Types/UnqualComponentName.hs +93/−0
• src/Distribution/Types/Version.hs +242/−0
• src/Distribution/Types/VersionInterval.hs +345/−0
• src/Distribution/Types/VersionInterval/Legacy.hs +368/−0
• src/Distribution/Types/VersionRange.hs +180/−0
• src/Distribution/Types/VersionRange/Internal.hs +526/−0
• src/Distribution/Utils/Base62.hs +22/−0
• src/Distribution/Utils/Generic.hs +576/−0
• src/Distribution/Utils/IOData.hs +92/−0
• src/Distribution/Utils/LogProgress.hs +89/−0
• src/Distribution/Utils/MD5.hs +79/−0
• src/Distribution/Utils/MapAccum.hs +34/−0
• src/Distribution/Utils/NubList.hs +108/−0
• src/Distribution/Utils/Path.hs +103/−0
• src/Distribution/Utils/Progress.hs +67/−0
• src/Distribution/Utils/ShortText.hs +159/−0
• src/Distribution/Utils/String.hs +93/−0
• src/Distribution/Utils/Structured.hs +476/−0
• src/Distribution/Utils/UnionFind.hs +102/−0
• src/Distribution/Verbosity.hs +345/−0
• src/Distribution/Verbosity/Internal.hs +27/−0
• src/Distribution/Version.hs +185/−0
• src/Distribution/ZinzaPrelude.hs +43/−0
• src/Language/Haskell/Extension.hs +933/−0
• tests/CheckTests.hs +0/−98
• tests/HackageTests.hs +0/−431
• tests/ParserTests.hs +0/−378
• tests/ParserTests/errors/MiniAgda.cabal +0/−89
• tests/ParserTests/errors/MiniAgda.errors +0/−4
• tests/ParserTests/errors/anynone.cabal +0/−10
• tests/ParserTests/errors/anynone.errors +0/−5
• tests/ParserTests/errors/big-version.cabal +0/−7
• tests/ParserTests/errors/big-version.errors +0/−4
• tests/ParserTests/errors/common1.cabal +0/−29
• tests/ParserTests/errors/common1.errors +0/−2
• tests/ParserTests/errors/common2.cabal +0/−29
• tests/ParserTests/errors/common2.errors +0/−2
• tests/ParserTests/errors/common3.cabal +0/−31
• tests/ParserTests/errors/common3.errors +0/−2
• tests/ParserTests/errors/forward-compat.cabal +0/−4
• tests/ParserTests/errors/forward-compat.errors +0/−2
• tests/ParserTests/errors/forward-compat2.cabal +0/−16
• tests/ParserTests/errors/forward-compat2.errors +0/−2
• tests/ParserTests/errors/forward-compat3.cabal +0/−16
• tests/ParserTests/errors/forward-compat3.errors +0/−2
• tests/ParserTests/errors/issue-5055-2.cabal +0/−25
• tests/ParserTests/errors/issue-5055-2.errors +0/−2
• tests/ParserTests/errors/issue-5055.cabal +0/−21
• tests/ParserTests/errors/issue-5055.errors +0/−2
• tests/ParserTests/errors/leading-comma-2.cabal +0/−23
• tests/ParserTests/errors/leading-comma-2.errors +0/−5
• tests/ParserTests/errors/leading-comma-2b.cabal +0/−23
• tests/ParserTests/errors/leading-comma-2b.errors +0/−5
• tests/ParserTests/errors/leading-comma-2c.cabal +0/−21
• tests/ParserTests/errors/leading-comma-2c.errors +0/−5
• tests/ParserTests/errors/leading-comma.cabal +0/−20
• tests/ParserTests/errors/leading-comma.errors +0/−5
• tests/ParserTests/errors/libpq1.cabal +0/−81
• tests/ParserTests/errors/libpq1.errors +0/−5
• tests/ParserTests/errors/libpq2.cabal +0/−81
• tests/ParserTests/errors/libpq2.errors +0/−5
• tests/ParserTests/errors/mixin-1.cabal +0/−15
• tests/ParserTests/errors/mixin-1.errors +0/−4
• tests/ParserTests/errors/mixin-2.cabal +0/−14
• tests/ParserTests/errors/mixin-2.errors +0/−4
• tests/ParserTests/errors/multiple-libs.cabal +0/−14
• tests/ParserTests/errors/multiple-libs.errors +0/−2
• tests/ParserTests/errors/noVersion.cabal +0/−10
• tests/ParserTests/errors/noVersion.errors +0/−4
• tests/ParserTests/errors/noVersion2.cabal +0/−10
• tests/ParserTests/errors/noVersion2.errors +0/−5
• tests/ParserTests/errors/range-ge-wild.cabal +0/−10
• tests/ParserTests/errors/range-ge-wild.errors +0/−4
• tests/ParserTests/errors/removed-fields.cabal +0/−14
• tests/ParserTests/errors/removed-fields.errors +0/−3
• tests/ParserTests/errors/spdx-1.cabal +0/−9
• tests/ParserTests/errors/spdx-1.errors +0/−4
• tests/ParserTests/errors/spdx-2.cabal +0/−9
• tests/ParserTests/errors/spdx-2.errors +0/−4
• tests/ParserTests/errors/spdx-3.cabal +0/−9
• tests/ParserTests/errors/spdx-3.errors +0/−4
• tests/ParserTests/errors/undefined-flag.cabal +0/−26
• tests/ParserTests/errors/undefined-flag.errors +0/−2
• tests/ParserTests/errors/version-sets-1.cabal +0/−8
• tests/ParserTests/errors/version-sets-1.errors +0/−5
• tests/ParserTests/errors/version-sets-2.cabal +0/−8
• tests/ParserTests/errors/version-sets-2.errors +0/−5
• tests/ParserTests/errors/version-sets-3.cabal +0/−8
• tests/ParserTests/errors/version-sets-3.errors +0/−5
• tests/ParserTests/errors/version-sets-4.cabal +0/−8
• tests/ParserTests/errors/version-sets-4.errors +0/−5
• tests/ParserTests/ipi/Includes2.cabal +0/−27
• tests/ParserTests/ipi/Includes2.expr +0/−58
• tests/ParserTests/ipi/Includes2.format +0/−35
• tests/ParserTests/ipi/internal-preprocessor-test.cabal +0/−26
• tests/ParserTests/ipi/internal-preprocessor-test.expr +0/−48
• tests/ParserTests/ipi/internal-preprocessor-test.format +0/−32
• tests/ParserTests/ipi/issue-2276-ghc-9885.cabal +0/−175
• tests/ParserTests/ipi/issue-2276-ghc-9885.expr +0/−2133
• tests/ParserTests/ipi/issue-2276-ghc-9885.format +0/−182
• tests/ParserTests/ipi/transformers.cabal +0/−59
• tests/ParserTests/ipi/transformers.expr +0/−133
• tests/ParserTests/ipi/transformers.format +0/−62
• tests/ParserTests/regressions/Octree-0.5.cabal +0/−44
• tests/ParserTests/regressions/Octree-0.5.expr +0/−357
• tests/ParserTests/regressions/Octree-0.5.format +0/−51
• tests/ParserTests/regressions/anynone.cabal +0/−10
• tests/ParserTests/regressions/anynone.expr +0/−105
• tests/ParserTests/regressions/anynone.format +0/−10
• tests/ParserTests/regressions/assoc-cpp-options.cabal +0/−48
• tests/ParserTests/regressions/assoc-cpp-options.check +0/−1
• tests/ParserTests/regressions/bad-glob-syntax.cabal +0/−16
• tests/ParserTests/regressions/bad-glob-syntax.check +0/−2
• tests/ParserTests/regressions/big-version.cabal +0/−7
• tests/ParserTests/regressions/big-version.expr +0/−96
• tests/ParserTests/regressions/big-version.format +0/−6
• tests/ParserTests/regressions/cc-options-with-optimization.cabal +0/−15
• tests/ParserTests/regressions/cc-options-with-optimization.check +0/−1
• tests/ParserTests/regressions/common-conditional.cabal +0/−49
• tests/ParserTests/regressions/common-conditional.expr +0/−682
• tests/ParserTests/regressions/common-conditional.format +0/−44
• tests/ParserTests/regressions/common.cabal +0/−35
• tests/ParserTests/regressions/common.expr +0/−176
• tests/ParserTests/regressions/common.format +0/−24
• tests/ParserTests/regressions/common2.cabal +0/−53
• tests/ParserTests/regressions/common2.expr +0/−707
• tests/ParserTests/regressions/common2.format +0/−48
• tests/ParserTests/regressions/common3.cabal +0/−36
• tests/ParserTests/regressions/common3.expr +0/−206
• tests/ParserTests/regressions/common3.format +0/−25
• tests/ParserTests/regressions/cxx-options-with-optimization.cabal +0/−15
• tests/ParserTests/regressions/cxx-options-with-optimization.check +0/−1
• tests/ParserTests/regressions/denormalised-paths.cabal +0/−71
• tests/ParserTests/regressions/denormalised-paths.check +0/−12
• tests/ParserTests/regressions/elif.cabal +0/−20
• tests/ParserTests/regressions/elif.expr +0/−178
• tests/ParserTests/regressions/elif.format +0/−18
• tests/ParserTests/regressions/elif2.cabal +0/−20
• tests/ParserTests/regressions/elif2.expr +0/−378
• tests/ParserTests/regressions/elif2.format +0/−23
• tests/ParserTests/regressions/encoding-0.8.cabal +0/−24
• tests/ParserTests/regressions/encoding-0.8.expr +0/−127
• tests/ParserTests/regressions/encoding-0.8.format +0/−19
• tests/ParserTests/regressions/extensions-paths-5054.cabal +0/−39
• tests/ParserTests/regressions/extensions-paths-5054.check +0/−1
• tests/ParserTests/regressions/generics-sop.cabal +0/−128
• tests/ParserTests/regressions/generics-sop.expr +0/−789
• tests/ParserTests/regressions/generics-sop.format +0/−129
• tests/ParserTests/regressions/ghc-option-j.cabal +0/−18
• tests/ParserTests/regressions/ghc-option-j.check +0/−2
• tests/ParserTests/regressions/haddock-api-2.18.1-check.cabal +0/−147
• tests/ParserTests/regressions/haddock-api-2.18.1-check.check +0/−4
• tests/ParserTests/regressions/hasktorch.cabal +0/−558
• tests/ParserTests/regressions/hasktorch.expr +0/−9817
• tests/ParserTests/regressions/hasktorch.format +0/−565
• tests/ParserTests/regressions/hidden-main-lib.cabal +0/−11
• tests/ParserTests/regressions/hidden-main-lib.expr +0/−105
• tests/ParserTests/regressions/hidden-main-lib.format +0/−11
• tests/ParserTests/regressions/indentation.cabal +0/−18
• tests/ParserTests/regressions/indentation.expr +0/−106
• tests/ParserTests/regressions/indentation.format +0/−17
• tests/ParserTests/regressions/indentation2.cabal +0/−9
• tests/ParserTests/regressions/indentation2.expr +0/−96
• tests/ParserTests/regressions/indentation2.format +0/−10
• tests/ParserTests/regressions/indentation3.cabal +0/−11
• tests/ParserTests/regressions/indentation3.expr +0/−101
• tests/ParserTests/regressions/indentation3.format +0/−12
• tests/ParserTests/regressions/issue-5055.cabal +0/−25
• tests/ParserTests/regressions/issue-5055.expr +0/−246
• tests/ParserTests/regressions/issue-5055.format +0/−21
• tests/ParserTests/regressions/issue-5846.cabal +0/−11
• tests/ParserTests/regressions/issue-5846.expr +0/−170
• tests/ParserTests/regressions/issue-5846.format +0/−15
• tests/ParserTests/regressions/issue-6083-a.cabal +0/−19
• tests/ParserTests/regressions/issue-6083-a.expr +0/−333
• tests/ParserTests/regressions/issue-6083-a.format +0/−26
• tests/ParserTests/regressions/issue-6083-b.cabal +0/−19
• tests/ParserTests/regressions/issue-6083-b.expr +0/−340
• tests/ParserTests/regressions/issue-6083-b.format +0/−25
• tests/ParserTests/regressions/issue-6083-c.cabal +0/−11
• tests/ParserTests/regressions/issue-6083-c.expr +0/−181
• tests/ParserTests/regressions/issue-6083-c.format +0/−12
• tests/ParserTests/regressions/issue-6083-pkg-pkg.cabal +0/−9
• tests/ParserTests/regressions/issue-6083-pkg-pkg.expr +0/−116
• tests/ParserTests/regressions/issue-6083-pkg-pkg.format +0/−10
• tests/ParserTests/regressions/issue-6288-a.cabal +0/−14
• tests/ParserTests/regressions/issue-6288-a.check +0/−1
• tests/ParserTests/regressions/issue-6288-b.cabal +0/−13
• tests/ParserTests/regressions/issue-6288-b.check +0/−0
• tests/ParserTests/regressions/issue-6288-c.cabal +0/−14
• tests/ParserTests/regressions/issue-6288-c.check +0/−0
• tests/ParserTests/regressions/issue-6288-d.cabal +0/−13
• tests/ParserTests/regressions/issue-6288-d.check +0/−1
• tests/ParserTests/regressions/issue-6288-e.cabal +0/−13
• tests/ParserTests/regressions/issue-6288-e.check +0/−0
• tests/ParserTests/regressions/issue-6288-f.cabal +0/−13
• tests/ParserTests/regressions/issue-6288-f.check +0/−0
• tests/ParserTests/regressions/issue-774.cabal +0/−21
• tests/ParserTests/regressions/issue-774.check +0/−7
• tests/ParserTests/regressions/issue-774.expr +0/−108
• tests/ParserTests/regressions/issue-774.format +0/−22
• tests/ParserTests/regressions/jaeger-flamegraph.cabal +0/−70
• tests/ParserTests/regressions/jaeger-flamegraph.expr +0/−471
• tests/ParserTests/regressions/jaeger-flamegraph.format +0/−70
• tests/ParserTests/regressions/leading-comma-2.cabal +0/−33
• tests/ParserTests/regressions/leading-comma-2.expr +0/−167
• tests/ParserTests/regressions/leading-comma-2.format +0/−25
• tests/ParserTests/regressions/leading-comma.cabal +0/−19
• tests/ParserTests/regressions/leading-comma.expr +0/−160
• tests/ParserTests/regressions/leading-comma.format +0/−16
• tests/ParserTests/regressions/libpq1.cabal +0/−81
• tests/ParserTests/regressions/libpq1.expr +0/−688
• tests/ParserTests/regressions/libpq1.format +0/−74
• tests/ParserTests/regressions/libpq2.cabal +0/−81
• tests/ParserTests/regressions/libpq2.expr +0/−689
• tests/ParserTests/regressions/libpq2.format +0/−74
• tests/ParserTests/regressions/mixin-1.cabal +0/−11
• tests/ParserTests/regressions/mixin-1.expr +0/−147
• tests/ParserTests/regressions/mixin-1.format +0/−16
• tests/ParserTests/regressions/mixin-2.cabal +0/−13
• tests/ParserTests/regressions/mixin-2.expr +0/−147
• tests/ParserTests/regressions/mixin-2.format +0/−15
• tests/ParserTests/regressions/mixin-3.cabal +0/−12
• tests/ParserTests/regressions/mixin-3.expr +0/−132
• tests/ParserTests/regressions/mixin-3.format +0/−13
• tests/ParserTests/regressions/monad-param.cabal +0/−25
• tests/ParserTests/regressions/monad-param.expr +0/−142
• tests/ParserTests/regressions/monad-param.format +0/−31
• tests/ParserTests/regressions/multiple-libs-2.cabal +0/−17
• tests/ParserTests/regressions/multiple-libs-2.check +0/−6
• tests/ParserTests/regressions/multiple-libs-2.expr +0/−172
• tests/ParserTests/regressions/multiple-libs-2.format +0/−16
• tests/ParserTests/regressions/noVersion.cabal +0/−11
• tests/ParserTests/regressions/noVersion.expr +0/−105
• tests/ParserTests/regressions/noVersion.format +0/−10
• tests/ParserTests/regressions/nothing-unicode.cabal +0/−21
• tests/ParserTests/regressions/nothing-unicode.check +0/−6
• tests/ParserTests/regressions/nothing-unicode.expr +0/−170
• tests/ParserTests/regressions/nothing-unicode.format +0/−20
• tests/ParserTests/regressions/pre-1.6-glob.cabal +0/−17
• tests/ParserTests/regressions/pre-1.6-glob.check +0/−1
• tests/ParserTests/regressions/pre-2.4-globstar.cabal +0/−19
• tests/ParserTests/regressions/pre-2.4-globstar.check +0/−3
• tests/ParserTests/regressions/public-multilib-1.cabal +0/−17
• tests/ParserTests/regressions/public-multilib-1.check +0/−3
• tests/ParserTests/regressions/public-multilib-2.cabal +0/−14
• tests/ParserTests/regressions/public-multilib-2.check +0/−3
• tests/ParserTests/regressions/shake.cabal +0/−405
• tests/ParserTests/regressions/shake.expr +0/−2506
• tests/ParserTests/regressions/shake.format +0/−412
• tests/ParserTests/regressions/spdx-1.cabal +0/−9
• tests/ParserTests/regressions/spdx-1.expr +0/−95
• tests/ParserTests/regressions/spdx-1.format +0/−9
• tests/ParserTests/regressions/spdx-2.cabal +0/−9
• tests/ParserTests/regressions/spdx-2.expr +0/−96
• tests/ParserTests/regressions/spdx-2.format +0/−9
• tests/ParserTests/regressions/spdx-3.cabal +0/−9
• tests/ParserTests/regressions/spdx-3.expr +0/−96
• tests/ParserTests/regressions/spdx-3.format +0/−9
• tests/ParserTests/regressions/th-lift-instances.cabal +0/−76
• tests/ParserTests/regressions/th-lift-instances.expr +0/−570
• tests/ParserTests/regressions/th-lift-instances.format +0/−77
• tests/ParserTests/regressions/version-sets.cabal +0/−18
• tests/ParserTests/regressions/version-sets.expr +0/−283
• tests/ParserTests/regressions/version-sets.format +0/−19
• tests/ParserTests/regressions/wl-pprint-indef.cabal +0/−34
• tests/ParserTests/regressions/wl-pprint-indef.expr +0/−218
• tests/ParserTests/regressions/wl-pprint-indef.format +0/−37
• tests/ParserTests/warnings/bom.cabal +0/−7
• tests/ParserTests/warnings/bool.cabal +0/−12
• tests/ParserTests/warnings/deprecatedfield.cabal +0/−7
• tests/ParserTests/warnings/doubledash.cabal +0/−9
• tests/ParserTests/warnings/extratestmodule.cabal +0/−11
• tests/ParserTests/warnings/gluedop.cabal +0/−9
• tests/ParserTests/warnings/multiplesingular.cabal +0/−8
• tests/ParserTests/warnings/nbsp.cabal +0/−7
• tests/ParserTests/warnings/newsyntax.cabal +0/−6
• tests/ParserTests/warnings/oldsyntax.cabal +0/−6
• tests/ParserTests/warnings/operator.cabal +0/−7
• tests/ParserTests/warnings/specversion-a.cabal +0/−7
• tests/ParserTests/warnings/specversion-b.cabal +0/−7
• tests/ParserTests/warnings/specversion-c.cabal +0/−7
• tests/ParserTests/warnings/subsection.cabal +0/−9
• tests/ParserTests/warnings/tab.cabal +0/−12
• tests/ParserTests/warnings/trailingfield.cabal +0/−9
• tests/ParserTests/warnings/unknownfield.cabal +0/−8
• tests/ParserTests/warnings/unknownsection.cabal +0/−10
• tests/ParserTests/warnings/utf8.cabal +0/−8
• tests/ParserTests/warnings/versiontag.cabal +0/−7
• tests/ParserTests/warnings/wildcard.cabal +0/−7
• tests/README.md +0/−5
• tests/RPMVerCmp.hs +0/−103
• tests/Test/Laws.hs +0/−79
• tests/Test/QuickCheck/Utils.hs +0/−29
• tests/UnitTests.hs +0/−117
• tests/UnitTests/Distribution/CabalSpecVersion.hs +0/−42
• tests/UnitTests/Distribution/Compat/CreatePipe.hs +0/−56
• tests/UnitTests/Distribution/Compat/Graph.hs +0/−91
• tests/UnitTests/Distribution/Compat/Time.hs +0/−49
• tests/UnitTests/Distribution/Described.hs +0/−49
• tests/UnitTests/Distribution/PkgconfigVersion.hs +0/−21
• tests/UnitTests/Distribution/SPDX.hs +0/−180
• tests/UnitTests/Distribution/Simple/Glob.hs +0/−164
• tests/UnitTests/Distribution/Simple/Program/GHC.hs +0/−172
• tests/UnitTests/Distribution/Simple/Program/Internal.hs +0/−36
• tests/UnitTests/Distribution/Simple/Utils.hs +0/−110
• tests/UnitTests/Distribution/System.hs +0/−30
• tests/UnitTests/Distribution/Types/GenericPackageDescription.hs +0/−37
• tests/UnitTests/Distribution/Utils/CharSet.hs +0/−27
• tests/UnitTests/Distribution/Utils/Generic.hs +0/−71
• tests/UnitTests/Distribution/Utils/NubList.hs +0/−76
• tests/UnitTests/Distribution/Utils/ShortText.hs +0/−33
• tests/UnitTests/Distribution/Utils/Structured.hs +0/−30
• tests/UnitTests/Distribution/Version.hs +0/−656
• tests/UnitTests/Orphans.hs +0/−10
• tests/cbits/rpmvercmp.c +0/−141
• tests/custom-setup/CabalDoctestSetup.hs +0/−498
• tests/custom-setup/CustomSetupTests.hs +0/−8
• tests/custom-setup/IdrisSetup.hs +0/−388
• tests/hackage/check.sh +0/−25
• tests/hackage/download.sh +0/−19
• tests/hackage/unpack.sh +0/−16
• tests/misc/ghc-supported-languages.hs +0/−97

@@ -1,49 +0,0 @@-{-# LANGUAGE CPP              #-}-{-# LANGUAGE FlexibleContexts #-}-{-# LANGUAGE GADTs            #-}-{-# LANGUAGE TypeOperators #-}-module Test.QuickCheck.GenericArbitrary (-    genericArbitrary,-    GArbitrary,-) where--import GHC.Generics-import Test.QuickCheck--#if !MIN_VERSION_base(4,8,0)-import Control.Applicative (pure, (<$>), (<*>))-#endif---- Generic arbitary for non-recursive types-genericArbitrary :: (Generic a, GArbitrary (Rep a)) => Gen a-genericArbitrary = fmap to garbitrary--class GArbitrary f where-    garbitrary :: Gen (f ())--class GArbitrarySum f where-    garbitrarySum :: [Gen (f ())]--class GArbitraryProd f where-    garbitraryProd :: Gen (f ())--instance (GArbitrarySum f, i ~ D) => GArbitrary (M1 i c f) where-    garbitrary = fmap M1 (oneof garbitrarySum)--instance (GArbitraryProd f, i ~ C) => GArbitrarySum (M1 i c f) where-    garbitrarySum = [fmap M1 garbitraryProd]--instance (GArbitrarySum f, GArbitrarySum g) => GArbitrarySum (f :+: g) where-    garbitrarySum = map (fmap L1) garbitrarySum ++ map (fmap R1) garbitrarySum--instance (GArbitraryProd f, i ~ S) => GArbitraryProd (M1 i c f) where-    garbitraryProd = fmap M1 garbitraryProd--instance GArbitraryProd U1 where-    garbitraryProd = pure U1--instance (GArbitraryProd f, GArbitraryProd g) => GArbitraryProd (f :*: g) where-    garbitraryProd = (:*:) <$> garbitraryProd <*> garbitraryProd--instance (Arbitrary a) => GArbitraryProd (K1 i a) where-    garbitraryProd = fmap K1 arbitrary

@@ -1,548 +0,0 @@-{-# LANGUAGE CPP           #-}-{-# LANGUAGE TypeOperators #-}-{-# OPTIONS_GHC -fno-warn-orphans #-}-module Test.QuickCheck.Instances.Cabal () where--import Control.Applicative        (liftA2)-import Data.Bits                  (shiftR)-import Data.Char                  (isAlphaNum, isDigit)-import Data.List                  (intercalate, isPrefixOf)-import Data.List.NonEmpty         (NonEmpty (..))-import Distribution.Utils.Generic (lowercase)-import Test.QuickCheck--#if MIN_VERSION_base(4,8,0)-import Data.Bits (countLeadingZeros, finiteBitSize, shiftL)-#else-import Data.Bits (popCount)-#endif--import Distribution.CabalSpecVersion-import Distribution.Compat.NonEmptySet             (NonEmptySet)-import Distribution.Compiler-import Distribution.FieldGrammar.Newtypes-import Distribution.ModuleName-import Distribution.Simple.Compiler                (DebugInfoLevel (..), OptimisationLevel (..), PackageDB (..), ProfDetailLevel (..), knownProfDetailLevels)-import Distribution.Simple.Flag                    (Flag (..))-import Distribution.Simple.InstallDirs-import Distribution.Simple.Setup                   (HaddockTarget (..), TestShowDetails (..))-import Distribution.SPDX-import Distribution.System-import Distribution.Types.Dependency-import Distribution.Types.Flag                     (FlagAssignment, FlagName, mkFlagAssignment, mkFlagName, unFlagAssignment)-import Distribution.Types.IncludeRenaming-import Distribution.Types.LibraryName-import Distribution.Types.LibraryVisibility-import Distribution.Types.Mixin-import Distribution.Types.ModuleRenaming-import Distribution.Types.PackageId-import Distribution.Types.PackageName-import Distribution.Types.PackageVersionConstraint-import Distribution.Types.PkgconfigVersion-import Distribution.Types.PkgconfigVersionRange-import Distribution.Types.SourceRepo-import Distribution.Types.UnqualComponentName-import Distribution.Types.VersionRange.Internal-import Distribution.Utils.NubList-import Distribution.Verbosity-import Distribution.Version--import Test.QuickCheck.GenericArbitrary--import qualified Data.ByteString.Char8           as BS8-import qualified Distribution.Compat.NonEmptySet as NES--#if !MIN_VERSION_base(4,8,0)-import Control.Applicative (pure, (<$>), (<*>))-#endif------------------------------------------------------------------------------------ CabalSpecVersion----------------------------------------------------------------------------------instance Arbitrary CabalSpecVersion where-    arbitrary = arbitraryBoundedEnum--instance Arbitrary SpecVersion where-    arbitrary = fmap SpecVersion arbitrary------------------------------------------------------------------------------------ PackageName and PackageIdentifier----------------------------------------------------------------------------------instance Arbitrary PackageName where-    arbitrary = mkPackageName . intercalate "-" <$> shortListOf1 2 nameComponent-      where-        nameComponent = shortListOf1 5 (elements packageChars)-                        `suchThat` (not . all isDigit)-        packageChars  = filter isAlphaNum ['\0'..'\127']--instance Arbitrary PackageIdentifier where-    arbitrary = PackageIdentifier <$> arbitrary <*> arbitrary--    shrink (PackageIdentifier pn vr) = uncurry PackageIdentifier <$> shrink (pn, vr)------------------------------------------------------------------------------------ Version------------------------------------------------------------------------------------ | Does *NOT* generate 'nullVersion'-instance Arbitrary Version where-  arbitrary = do-      branch <- smallListOf1 $-                  frequency [(3, return 0)-                            ,(3, return 1)-                            ,(2, return 2)-                            ,(2, return 3)-                            ,(1, return 0xfffd)-                            ,(1, return 0xfffe) -- max fitting into packed W64-                            ,(1, return 0xffff)-                            ,(1, return 999999998)-                            ,(1, return 999999999)-                            ,(1, return 0x10000)]-      return (mkVersion branch)-    where-      smallListOf1 = scale (\n -> min 6 (n `div` 3)) . listOf1--  shrink ver = [ mkVersion ns | ns <- shrink (versionNumbers ver)-                              , not (null ns) ]--instance Arbitrary VersionRange where-  arbitrary = sized $ \n -> chooseInt (0, n) >>= verRangeExp . intSqrt-    where-      verRangeExp n-        | n > 0     = oneof-          [ recurse unionVersionRanges     n-          , recurse intersectVersionRanges n-          ]-        | otherwise = oneof-          [ return anyVersion-          , fmap thisVersion arbitrary-          , fmap laterVersion arbitrary-          , fmap orLaterVersion arbitrary-          , fmap orLaterVersion' arbitrary-          , fmap earlierVersion arbitrary-          , fmap orEarlierVersion arbitrary-          , fmap orEarlierVersion' arbitrary-          , fmap withinVersion arbitraryV-          , fmap majorBoundVersion arbitrary-          ]--      recurse mk n = do-        k <- chooseInt (0, n - 1)-        liftA2 mk (verRangeExp k) (verRangeExp (n - k - 1))--      arbitraryV :: Gen Version-      arbitraryV = arbitrary `suchThat` \v -> all (< 999999999) (versionNumbers v)--      orLaterVersion'   v =-        unionVersionRanges (LaterVersion v)   (ThisVersion v)-      orEarlierVersion' v =-        unionVersionRanges (EarlierVersion v) (ThisVersion v)--  shrink (ThisVersion v)              = map ThisVersion (shrink v)-  shrink (LaterVersion v)             = map LaterVersion (shrink v)-  shrink (EarlierVersion v)           = map EarlierVersion (shrink v)-  shrink (OrLaterVersion v)           = LaterVersion v : map OrLaterVersion (shrink v)-  shrink (OrEarlierVersion v)         = EarlierVersion v : map OrEarlierVersion (shrink v)-  shrink (MajorBoundVersion v)        = map MajorBoundVersion (shrink v)-  shrink (UnionVersionRanges a b)     = a : b : map (uncurry UnionVersionRanges) (shrink (a, b))-  shrink (IntersectVersionRanges a b) = a : b : map (uncurry IntersectVersionRanges) (shrink (a, b))---- | Generating VersionIntervals------ This is a tad tricky as VersionIntervals is an abstract type, so we first--- make a local type for generating the internal representation. Then we check--- that this lets us construct valid 'VersionIntervals'.-----instance Arbitrary VersionIntervals where-  arbitrary = fmap mkVersionIntervals' arbitrary-    where-      mkVersionIntervals' :: [(Version, Bound)] -> VersionIntervals-      mkVersionIntervals' = mkVersionIntervals . go version0-        where-          go :: Version -> [(Version, Bound)] -> [VersionInterval]-          go _ [] = []-          go v [(lv, lb)] =-              [(LowerBound (addVersion lv v) lb, NoUpperBound)]-          go v ((lv, lb) : (uv, ub) : rest) =-              (LowerBound lv' lb, UpperBound uv' ub) : go uv' rest-            where-              lv' = addVersion v lv-              uv' = addVersion lv' uv--          addVersion :: Version -> Version -> Version-          addVersion xs ys = mkVersion $  z (versionNumbers xs) (versionNumbers ys)-            where-              z [] ys' = ys'-              z xs' [] = xs'-              z (x : xs') (y : ys') = x + y : z xs' ys'--instance Arbitrary Bound where-  arbitrary = elements [ExclusiveBound, InclusiveBound]------------------------------------------------------------------------------------ Backpack----------------------------------------------------------------------------------instance Arbitrary Mixin where-    arbitrary = normaliseMixin <$> genericArbitrary-    shrink    = fmap normaliseMixin . genericShrink--instance Arbitrary IncludeRenaming where-    arbitrary = genericArbitrary-    shrink    = genericShrink--instance Arbitrary ModuleRenaming where-    arbitrary = genericArbitrary-    shrink    = genericShrink----------------------------------------------------------------------------------------------------------------------------------------------------------------------instance Arbitrary LibraryVisibility where-  arbitrary = elements [LibraryVisibilityPrivate, LibraryVisibilityPublic]--  shrink LibraryVisibilityPublic  = [LibraryVisibilityPrivate]-  shrink LibraryVisibilityPrivate = []------------------------------------------------------------------------------------ ModuleName----------------------------------------------------------------------------------instance Arbitrary ModuleName where-  arbitrary = fromString . intercalate "." <$> shortListOf1 4 comp where-    comp = (:) <$> elements upper <*> shortListOf1 10 (elements moduleChar)-    upper = ['A'..'Z']-    moduleChar = [ c | c <- ['\0' .. '\255'], isAlphaNum c || c `elem` "_'" ]------------------------------------------------------------------------------------ Dependency----------------------------------------------------------------------------------instance Arbitrary Dependency where-    arbitrary = mkDependency-        <$> arbitrary-        <*> arbitrary-        <*> (arbitrary `suchThat` const True) -- should be (not . null)--    shrink (Dependency pn vr lb) =-        [ mkDependency pn' vr' lb'-        | (pn', vr', lb') <- shrink (pn, vr, lb)-        ]------------------------------------------------------------------------------------ PackageVersionConstraint----------------------------------------------------------------------------------instance Arbitrary PackageVersionConstraint where-    arbitrary = PackageVersionConstraint-        <$> arbitrary-        <*> arbitrary--    shrink (PackageVersionConstraint pn vr) =-        [ PackageVersionConstraint pn' vr'-        | (pn', vr') <- shrink (pn, vr)-        ]------------------------------------------------------------------------------------ System----------------------------------------------------------------------------------instance Arbitrary OS where-    arbitrary = elements knownOSs--instance Arbitrary Arch where-    arbitrary = elements knownArches--instance Arbitrary Platform where-    arbitrary = Platform <$> arbitrary <*> arbitrary------------------------------------------------------------------------------------ Various names----------------------------------------------------------------------------------instance Arbitrary UnqualComponentName where-    -- same rules as package names-    arbitrary = packageNameToUnqualComponentName <$> arbitrary--instance Arbitrary LibraryName where-    arbitrary = oneof-        [ LSubLibName <$> arbitrary-        , pure LMainLibName-        ]--    shrink (LSubLibName _) = [LMainLibName]-    shrink _               = []------------------------------------------------------------------------------------ option flags----------------------------------------------------------------------------------instance Arbitrary a => Arbitrary (Flag a) where-    arbitrary = arbitrary1--    shrink NoFlag   = []-    shrink (Flag x) = NoFlag : [ Flag x' | x' <- shrink x ]--instance Arbitrary1 Flag where-    liftArbitrary genA = sized $ \sz ->-        if sz <= 0-        then pure NoFlag-        else frequency [ (1, pure NoFlag)-                       , (3, Flag <$> genA) ]------------------------------------------------------------------------------------ GPD flags----------------------------------------------------------------------------------instance Arbitrary FlagName where-    arbitrary = mkFlagName <$> frequency-        [ (20, flagident)-        -- special nasty cases-        , (1,  pure "none")-        , (1,  pure "any")-        ]-      where-        flagident   = lowercase <$> shortListOf1 5 (elements flagChars)-                      `suchThat` (("-" /=) . take 1)-        flagChars   = "-_" ++ ['a'..'z']--instance Arbitrary FlagAssignment where-    arbitrary = mkFlagAssignment <$> arbitrary-    shrink x = mkFlagAssignment <$> shrink (unFlagAssignment x)------------------------------------------------------------------------------------ Verbosity----------------------------------------------------------------------------------instance Arbitrary Verbosity where-    arbitrary = do-        v <- elements [minBound..maxBound]-        -- verbose markoutput is left out on purpose-        flags <- listOf $ elements-            [ verboseCallSite-            , verboseCallStack-            , verboseNoWrap-            , verboseTimestamp-            , verboseStderr-            ]-        return (foldr ($) v flags)------------------------------------------------------------------------------------ SourceRepo----------------------------------------------------------------------------------instance Arbitrary RepoType where-    arbitrary = elements (KnownRepoType <$> knownRepoTypes)--instance Arbitrary RepoKind where-    arbitrary = elements [RepoHead, RepoThis]------------------------------------------------------------------------------------ SPDX----------------------------------------------------------------------------------instance Arbitrary LicenseId where-    arbitrary = elements $ licenseIdList currentLicenseListVersion--instance Arbitrary LicenseExceptionId where-    arbitrary = elements $ licenseExceptionIdList currentLicenseListVersion--currentLicenseListVersion :: LicenseListVersion-currentLicenseListVersion = cabalSpecVersionToSPDXListVersion cabalSpecLatest--instance Arbitrary LicenseRef where-    arbitrary = mkLicenseRef' <$> ids' <*> ids-      where-        ids = listOf1 $ elements $ ['a'..'z'] ++ ['A' .. 'Z'] ++ ['0'..'9'] ++ "_-"-        ids' = oneof [ pure Nothing, Just <$> ids ]--instance Arbitrary SimpleLicenseExpression where-    arbitrary = oneof-        [ ELicenseId <$> arbitrary-        , ELicenseIdPlus <$> arbitrary-        , ELicenseRef <$> arbitrary-        ]--instance Arbitrary LicenseExpression where-    arbitrary = sized arb-      where-        arb n-            | n <= 0     = ELicense <$> arbitrary <*> pure Nothing-            | otherwise = oneof-                [ ELicense <$> arbitrary <*> arbitrary-                , EAnd <$> arbA <*> arbB-                , EOr <$> arbA <*> arbB-                ]-              where-                m = n `div` 2-                arbA = arb m-                arbB = arb (n - m)--    shrink (EAnd a b) = a : b : map (uncurry EAnd) (shrink (a, b))-    shrink (EOr a b)  = a : b : map (uncurry EOr) (shrink (a, b))-    shrink _          = []------------------------------------------------------------------------------------ Compiler----------------------------------------------------------------------------------instance Arbitrary CompilerFlavor where-    arbitrary = elements knownCompilerFlavors--instance Arbitrary CompilerId where-    arbitrary = genericArbitrary-    shrink    = genericShrink--instance Arbitrary ProfDetailLevel where-    arbitrary = elements [ d | (_,_,d) <- knownProfDetailLevels ]--instance Arbitrary OptimisationLevel where-    arbitrary = elements [minBound..maxBound]--instance Arbitrary DebugInfoLevel where-    arbitrary = elements [minBound..maxBound]------------------------------------------------------------------------------------ NonEmptySet----------------------------------------------------------------------------------instance (Arbitrary a, Ord a) => Arbitrary (NonEmptySet a) where-    arbitrary = mk <$> arbitrary <*> arbitrary where-        mk x xs = NES.fromNonEmpty (x :| xs)--    shrink nes = case NES.toNonEmpty nes of-        x :| xs -> map mk (shrink (x, xs))-      where-        mk (x,xs) = NES.fromNonEmpty (x :| xs)------------------------------------------------------------------------------------ NubList----------------------------------------------------------------------------------instance (Arbitrary a, Ord a) => Arbitrary (NubList a) where-    arbitrary = toNubList <$> arbitrary-    shrink xs = [ toNubList [] | (not . null) (fromNubList xs) ]-    -- try empty, otherwise don't shrink as it can loop------------------------------------------------------------------------------------ InstallDirs----------------------------------------------------------------------------------instance Arbitrary a => Arbitrary (InstallDirs a) where-    arbitrary = InstallDirs-        <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary --  4-        <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary --  8-        <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- 12-        <*> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary -- 16--instance Arbitrary PathTemplate where-    arbitrary = toPathTemplate <$> arbitraryShortToken-    shrink t  = [ toPathTemplate s-                | s <- shrink (fromPathTemplate t)-                , not (null s) ]------------------------------------------------------------------------------------ Pkgconfig----------------------------------------------------------------------------------instance Arbitrary PkgconfigVersion where-    arbitrary = PkgconfigVersion . BS8.pack . dropDash . concat <$> listOf1 elems where-        elems = frequency-            [ (2, pure ".")-            , (1, pure "-")-            , (5, listOf1 $ elements ['0' .. '9'])-            , (1, listOf1 $ elements ['A' .. 'Z'])-            , (1, listOf1 $ elements ['a' .. 'z'])-            ]--        -- disallow versions starting with dash-        dropDash = notEmpty . dropWhile (== '-')-        notEmpty x-            | null x    = "0"-            | otherwise = x--instance Arbitrary PkgconfigVersionRange where-  arbitrary = sized $ \n -> chooseInt (0, n) >>= verRangeExp . intSqrt-    where-      verRangeExp n-        | n > 0     = oneof-          [ recurse PcUnionVersionRanges     n-          , recurse PcIntersectVersionRanges n-          ]-        | otherwise = oneof-          [ return PcAnyVersion-          , fmap PcThisVersion arbitrary-          , fmap PcLaterVersion arbitrary-          , fmap PcOrLaterVersion arbitrary-          , fmap orLaterVersion' arbitrary-          , fmap PcEarlierVersion arbitrary-          , fmap PcOrEarlierVersion arbitrary-          , fmap orEarlierVersion' arbitrary-          ]--      recurse mk n = do-        k <- chooseInt (0, n - 1)-        liftA2 mk (verRangeExp k) (verRangeExp (n - k - 1))--      orLaterVersion'   v =-        PcUnionVersionRanges (PcLaterVersion v)   (PcThisVersion v)-      orEarlierVersion' v =-        PcUnionVersionRanges (PcEarlierVersion v) (PcThisVersion v)------------------------------------------------------------------------------------ Setup----------------------------------------------------------------------------------instance Arbitrary HaddockTarget where-    arbitrary = elements [ForHackage, ForDevelopment]--instance Arbitrary TestShowDetails where-    arbitrary = arbitraryBoundedEnum------------------------------------------------------------------------------------ PackageDB----------------------------------------------------------------------------------instance Arbitrary PackageDB where-    arbitrary = oneof [ pure GlobalPackageDB-                      , pure UserPackageDB-                      , SpecificPackageDB <$> arbitraryShortToken-                      ]------------------------------------------------------------------------------------- Helpers----------------------------------------------------------------------------------shortListOf1 :: Int -> Gen a -> Gen [a]-shortListOf1 bound gen = sized $ \n -> do-    k <- choose (1, 1 `max` ((n `div` 2) `min` bound))-    vectorOf k gen--arbitraryShortToken :: Gen String-arbitraryShortToken =-    shortListOf1 5 (choose ('#', '~')) `suchThat` (not . ("[]" `isPrefixOf`))---- |-intSqrt :: Int -> Int-intSqrt 0 = 0-intSqrt 1 = 1-intSqrt n = case compare n 0 of-    LT -> 0 -- whatever-    EQ -> 0-    GT -> iter (iter guess) -- two iterations give good results-  where-    iter :: Int -> Int-    iter 0 = 0-    iter x = shiftR (x + n `div` x) 1--    guess :: Int-#if MIN_VERSION_base(4,8,0)-    guess = shiftR n (shiftL (finiteBitSize n - countLeadingZeros n) 1)-#else-    guess = shiftR n (shiftR (popCount n) 1)-#endif

@@ -1,577 +0,0 @@-{-# LANGUAGE OverloadedStrings   #-}-{-# LANGUAGE ScopedTypeVariables #-}-module Distribution.Described (-    Described (..),-    describeDoc,-    -- * Regular expressions-    GrammarRegex (..),-    reEps,-    reChar,-    reChars,-    reMunchCS,-    reMunch1CS,-    -- * Variables-    reVar0,-    reVar1,-    -- * Special expressions-    reDot,-    reComma,-    reSpacedComma,-    reHsString,-    reUnqualComponent,-    -- *-    describeFlagAssignmentNonEmpty,-    -- * Lists-    reSpacedList,-    reCommaList,-    reCommaNonEmpty,-    reOptCommaList,-    -- * Character Sets-    csChar,-    csAlpha,-    csAlphaNum,-    csUpper,-    csNotSpace,-    csNotSpaceOrComma,-    -- * tasty-    testDescribed,-    ) where--import Prelude-       (Bool (..), Char, Either (..), Enum (..), Eq (..), Ord (..), Show (..), String, elem, fmap, foldr, id, map, maybe, otherwise, return, undefined, ($),-       (.))--import Data.Functor.Identity (Identity (..))-import Data.Maybe            (fromMaybe)-import Data.Proxy            (Proxy (..))-import Data.String           (IsString (..))-import Data.Typeable         (Typeable, typeOf)-import Data.Void             (Void, vacuous)-import Test.QuickCheck       (Arbitrary (..), Property, counterexample)-import Test.Tasty            (TestTree, testGroup)-import Test.Tasty.QuickCheck (testProperty)--import Distribution.Compat.Semigroup (Semigroup (..))-import Distribution.Parsec           (Parsec, eitherParsec)-import Distribution.Pretty           (Pretty, prettyShow)--import qualified Distribution.Utils.CharSet as CS-import qualified RERE                       as RE-import qualified RERE.CharSet               as RE-import qualified Text.PrettyPrint           as PP--import Distribution.Utils.GrammarRegex---- Types-import Distribution.Compat.Newtype-import Distribution.Compiler                       (CompilerFlavor, CompilerId, knownCompilerFlavors)-import Distribution.FieldGrammar.Newtypes-import Distribution.ModuleName                     (ModuleName)-import Distribution.System                         (Arch, OS, knownArches, knownOSs)-import Distribution.Types.AbiDependency            (AbiDependency)-import Distribution.Types.AbiHash                  (AbiHash)-import Distribution.Types.BenchmarkType            (BenchmarkType)-import Distribution.Types.BuildType                (BuildType)-import Distribution.Types.Dependency               (Dependency)-import Distribution.Types.ExecutableScope          (ExecutableScope)-import Distribution.Types.ExeDependency            (ExeDependency)-import Distribution.Types.ExposedModule            (ExposedModule)-import Distribution.Types.Flag                     (FlagAssignment, FlagName)-import Distribution.Types.ForeignLib               (LibVersionInfo)-import Distribution.Types.ForeignLibOption         (ForeignLibOption)-import Distribution.Types.ForeignLibType           (ForeignLibType)-import Distribution.Types.IncludeRenaming          (IncludeRenaming)-import Distribution.Types.LegacyExeDependency      (LegacyExeDependency)-import Distribution.Types.LibraryVisibility        (LibraryVisibility)-import Distribution.Types.Mixin                    (Mixin)-import Distribution.Types.ModuleReexport           (ModuleReexport)-import Distribution.Types.ModuleRenaming           (ModuleRenaming)-import Distribution.Types.MungedPackageName        (MungedPackageName)-import Distribution.Types.PackageId                (PackageIdentifier)-import Distribution.Types.PackageName              (PackageName)-import Distribution.Types.PackageVersionConstraint (PackageVersionConstraint)-import Distribution.Types.PkgconfigDependency      (PkgconfigDependency)-import Distribution.Types.SourceRepo               (RepoType)-import Distribution.Types.TestType                 (TestType)-import Distribution.Types.UnitId                   (UnitId)-import Distribution.Types.UnqualComponentName      (UnqualComponentName)-import Distribution.Verbosity                      (Verbosity)-import Distribution.Version                        (Version, VersionRange)-import Language.Haskell.Extension                  (Extension, Language)---- | Class describing the pretty/parsec format of a.-class (Pretty a, Parsec a) => Described a where-    -- | A pretty document of "regex" describing the field format-    describe :: proxy a -> GrammarRegex void---- | Pretty-print description.------ >>> describeDoc ([] :: [Bool])--- \left\{ \mathop{\mathord{``}\mathtt{True}\mathord{"}}\mid\mathop{\mathord{``}\mathtt{False}\mathord{"}} \right\}----describeDoc :: Described a => proxy a -> PP.Doc-describeDoc p = regexDoc (describe p)--instance Described Bool where-    describe _ = REUnion ["True", "False"]--instance Described a => Described (Identity a) where-    describe _ = describe ([] :: [a])------------------------------------------------------------------------------------ Lists---------------------------------------------------------------------------------reSpacedList :: GrammarRegex a -> GrammarRegex a-reSpacedList = REMunch RESpaces1--reCommaList :: GrammarRegex a -> GrammarRegex a-reCommaList = RECommaList--reCommaNonEmpty :: GrammarRegex a -> GrammarRegex a-reCommaNonEmpty = RECommaNonEmpty--reOptCommaList :: GrammarRegex a -> GrammarRegex a-reOptCommaList = REOptCommaList------------------------------------------------------------------------------------ Specific grammars----------------------------------------------------------------------------------reHsString :: GrammarRegex a-reHsString = RENamed "hs-string" impl  where-    impl = reChar '"' <> REMunch reEps (REUnion [strChar, escChar]) <> reChar '"'-    strChar = RECharSet $ CS.difference CS.universe (CS.fromList "\"\\")--    escChar = REUnion-        [ "\\&"-        , "\\\\"-        , REUnion ["\\n", RENamed "escapes" "\\n"] -- TODO-        , "\\" <> RECharSet "0123456789"-        , "\\o" <> RECharSet "01234567"-        , "\\x" <> RECharSet "0123456789abcdefABCDEF"-        , REUnion ["\\^@", RENamed "control" "\\^@"] -- TODO-        , REUnion ["\\NUL", RENamed "ascii" "\\NUL"] -- TODO-        ]--reUnqualComponent :: GrammarRegex a-reUnqualComponent = RENamed "unqual-name" $-    REMunch1 (reChar '-') component-  where-    component-        = REMunch reEps (RECharSet csAlphaNum)-        -- currently the parser accepts "csAlphaNum `difference` "0123456789"-        -- which is larger set than CS.alpha-        ---        -- Hackage rejects non ANSI names, so it's not so relevant.-        <> RECharSet CS.alpha-        <> REMunch reEps (RECharSet csAlphaNum)--reDot :: GrammarRegex a-reDot = reChar '.'--reComma :: GrammarRegex a-reComma = reChar ','--reSpacedComma :: GrammarRegex a-reSpacedComma = RESpaces <> reComma <> RESpaces------------------------------------------------------------------------------------ Character sets----------------------------------------------------------------------------------csChar :: Char -> CS.CharSet-csChar = CS.singleton--csAlpha :: CS.CharSet-csAlpha = CS.alpha--csAlphaNum :: CS.CharSet-csAlphaNum = CS.alphanum--csUpper :: CS.CharSet-csUpper = CS.upper--csNotSpace :: CS.CharSet-csNotSpace = CS.difference CS.universe $ CS.singleton ' '--csNotSpaceOrComma :: CS.CharSet-csNotSpaceOrComma = CS.difference csNotSpace $ CS.singleton ','------------------------------------------------------------------------------------ Special----------------------------------------------------------------------------------describeFlagAssignmentNonEmpty :: GrammarRegex void-describeFlagAssignmentNonEmpty = REMunch1 RESpaces1 $-    REUnion [fromString "+", fromString "-"] <> describe (Proxy :: Proxy FlagName)------------------------------------------------------------------------------------ Conversion----------------------------------------------------------------------------------convert :: GrammarRegex Void -> RE.RE Void-convert = go id . vacuous where-    go :: Ord b => (a -> b) -> GrammarRegex a -> RE.RE b-    go f (REAppend rs)      = foldr (\r acc -> go f r <> acc) RE.Eps rs-    go f (REUnion rs)       = foldr (\r acc -> go f r RE.\/ acc) RE.Null rs-    go _ (RECharSet cs)     = RE.Ch (convertCS cs)-    go _ (REString str)     = RE.string_ str--    go f (REMunch sep r)    = RE.Eps RE.\/ r' <> RE.star_ (sep' <> r') where-        sep' = go f sep-        r'   = go f r-    go f (REMunch1 sep r)   = r' <> RE.star_ (sep' <> r') where-        sep' = go f sep-        r'   = go f r-    go f (REMunchR n sep r)-        | n <= 0    = RE.Eps-        | otherwise = RE.Eps RE.\/ r' <> go' (pred n)-      where-        sep' = go f sep-        r'   = go f r--        go' m | m <= 0    = RE.Eps-              | otherwise = RE.Eps RE.\/ sep' <> r' <> go' (pred m)--    go f (REOpt r)          = RE.Eps RE.\/ go f r--    go f (REVar a)          = RE.Var (f a)-    go f (RENamed _ r)      = go f r-    go f (RERec n r)        = RE.fix_ (fromString n)-        (go (maybe RE.B (RE.F . f)) r)--    go _ RESpaces           = RE.Eps RE.\/ RE.ch_ ' ' RE.\/ "  " RE.\/ "\n"-    go _ RESpaces1          = RE.ch_ ' ' RE.\/ "  " RE.\/ "\n"--    go f (RECommaList r)    = go f (expandedCommaList r)-    go f (RECommaNonEmpty r)= go f (expandedCommaNonEmpty r)-    go f (REOptCommaList r) = go f (expandedOptCommaList r)--    go _ RETodo             = RE.Null--expandedCommaList :: GrammarRegex a -> GrammarRegex a-expandedCommaList = REUnion . expandedCommaList'--expandedCommaNonEmpty :: GrammarRegex a -> GrammarRegex a-expandedCommaNonEmpty r = REUnion-    [ REMunch1 reSpacedComma r-    , reComma <> RESpaces <> REMunch1 reSpacedComma r-    , REMunch1 reSpacedComma r <> RESpaces <> reComma-    ]--expandedCommaList' :: GrammarRegex a -> [GrammarRegex a]-expandedCommaList' r =-    [ REMunch reSpacedComma r-    , reComma <> RESpaces <> REMunch1 reSpacedComma r-    , REMunch1 reSpacedComma r <> RESpaces <> reComma-    ]--expandedOptCommaList :: GrammarRegex a -> GrammarRegex a-expandedOptCommaList r = REUnion $ reSpacedList r : expandedCommaList' r--convertCS :: CS.CharSet -> RE.CharSet-convertCS = RE.fromIntervalList . CS.toIntervalList------------------------------------------------------------------------------------ tasty----------------------------------------------------------------------------------testDescribed-    :: forall a. (Arbitrary a, Described a, Typeable a, Eq a, Show a)-    => Proxy a-    -> TestTree-testDescribed _ = testGroup name-    [ testProperty "parsec" propParsec-    , testProperty "pretty" propPretty-    , testProperty "roundtrip" propRoundtrip-    ]-  where-    name = show (typeOf (undefined :: a))--    propParsec :: Ex a -> Property-    propParsec (Example str) = counterexample (show res) $ case res of-        Right _ -> True-        Left _  -> False-      where-        res :: Either String a-        res = eitherParsec str--    rr :: RE.RE Void-    rr = convert $ describe (Proxy :: Proxy a)--    propPretty :: a -> Property-    propPretty x = counterexample str $ RE.matchR rr str-      where-        str = prettyShow x--    propRoundtrip :: a -> Property-    propRoundtrip x = counterexample (show (res, str)) $ case res of-        Right y -> x == y-        Left _  -> False-      where-        str = prettyShow x-        res = eitherParsec str--newtype Ex a = Example String-  deriving (Show)--instance Described a => Arbitrary (Ex a) where-    arbitrary-        = fmap Example-        $ fromMaybe (return "")-        $ RE.generate 10 5-        $ convert $ describe (Proxy :: Proxy a)--    shrink (Example s)-        | '\n' `elem` s = [ Example $ map (\c -> if c == '\n' then ' ' else c) s ]-        | otherwise     = []------------------------------------------------------------------------------------ Instances----------------------------------------------------------------------------------instance Described AbiDependency where-    describe _ =-        describe (Proxy :: Proxy UnitId) <>-        reChar '=' <>-        describe (Proxy :: Proxy AbiHash)--instance Described AbiHash where-    describe _ = reMunchCS csAlphaNum--instance Described Arch where-    describe _ = REUnion-        [ fromString (prettyShow arch)-        | arch <- knownArches-        ]--instance Described BenchmarkType where-    describe _ = "exitcode-stdio-1.0"--instance Described BuildType where-    describe _ = REUnion ["Simple","Configure","Custom","Make","Default"]--instance Described CompilerFlavor where-    describe _ = REUnion-        [ fromString (prettyShow c)-        | c <- knownCompilerFlavors-        ]--instance Described CompilerId where-    describe _ =-        describe (Proxy :: Proxy CompilerFlavor)-        <> fromString "-"-        <> describe (Proxy :: Proxy Version)--instance Described Dependency where-    describe _ = REAppend-        [ RENamed "pkg-name" (describe (Proxy :: Proxy PackageName))-        , REOpt $-               reChar ':'-            <> REUnion-                [ reUnqualComponent-                , REAppend-                    [ reChar '{'-                    , RESpaces-                    -- no leading or trailing comma-                    , REMunch1 reSpacedComma reUnqualComponent-                    , RESpaces-                    , reChar '}'-                    ]-                ]--        , REOpt $ RESpaces <> vr-        ]-      where-        vr = RENamed "version-range" (describe (Proxy :: Proxy VersionRange))--instance Described ExecutableScope where-    describe _ = REUnion ["public","private"]--instance Described ExeDependency where-    describe _ = RETodo--instance Described ExposedModule where-    describe _ = RETodo--instance Described Extension where-    describe _ = RETodo--instance Described FlagAssignment where-    describe _ = REMunch RESpaces1 $-        REUnion [fromString "+", fromString "-"] <> describe (Proxy :: Proxy FlagName)--instance Described FlagName where-    describe _ = lead <> rest where-        lead = RECharSet $ csAlphaNum <> fromString "_"-        rest = reMunchCS $ csAlphaNum <> fromString "_-"--instance Described ForeignLibOption where-    describe _ = "standalone"--instance Described ForeignLibType where-    describe _ = REUnion ["native-shared","native-static"]--instance Described IncludeRenaming where-    describe _ = mr <> REOpt (RESpaces <> "requires" <> RESpaces1 <> mr)-      where-        mr = describe (Proxy :: Proxy ModuleRenaming)--instance Described Language where-    describe _ = REUnion ["Haskell98", "Haskell2010"]--instance Described LegacyExeDependency where-    describe _ = RETodo--instance Described LibraryVisibility where-    describe _ = REUnion ["public","private"]--instance Described LibVersionInfo where-    describe _ = reDigits <> REOpt (reChar ':' <> reDigits <> REOpt (reChar ':' <> reDigits)) where-        reDigits = reChars ['0'..'9']--instance Described Mixin where-    describe _ =-        RENamed "package-name" (describe (Proxy :: Proxy PackageName)) <>-        REOpt (reChar ':' <> RENamed "library-name" (describe (Proxy :: Proxy UnqualComponentName))) <>-        REOpt (RESpaces1 <> describe (Proxy :: Proxy IncludeRenaming))--instance Described ModuleName where-    describe _ = REMunch1 (reChar '.') component where-        component = RECharSet csUpper <> REMunch reEps (REUnion [RECharSet csAlphaNum, RECharSet (fromString "_'")])--instance Described ModuleReexport where-    describe _ = RETodo--instance Described ModuleRenaming where-    describe _ = REUnion-        [ reEps-        , "hiding" <> RESpaces <> bp (REMunch reSpacedComma mn)-        , bp (REMunch reSpacedComma entry)-        ]-      where-        bp r = "(" <> RESpaces <> r <> RESpaces <> ")"-        mn = RENamed "module-name" $ describe (Proxy :: Proxy ModuleName)--        entry = mn <> REOpt (RESpaces1 <> "as" <> RESpaces1 <> mn)--instance Described MungedPackageName where-    describe _ = RETodo--instance Described OS where-    describe _ = REUnion-        [ fromString (prettyShow os)-        | os <- knownOSs-        ]--instance Described PackageIdentifier where-    describe _ = describe (Proxy :: Proxy PackageName) <> fromString "-" <> describe (Proxy :: Proxy Version)--instance Described PackageName where-    describe _ = reUnqualComponent--instance Described PackageVersionConstraint where-    describe _ = describe (Proxy :: Proxy PackageName) <> REUnion-        [ fromString "-" <> describe (Proxy :: Proxy Version)-        , RESpaces <> describe (Proxy :: Proxy VersionRange)-        ]--instance Described PkgconfigDependency where-    describe _ = RETodo--instance Described RepoType where-    describe _ = reMunch1CS $ csAlphaNum <> csChar '_' <> csChar '-'--instance Described TestType where-    describe _ = REUnion ["exitcode-stdio-1.0", "detailed-0.9"]--instance Described Verbosity where-    describe _ = REUnion-        [ REUnion ["0", "1", "2", "3"]-        , REUnion ["silent", "normal", "verbose", "debug", "deafening"]-          <> REMunch reEps (RESpaces <> "+" <>-            -- markoutput is left out on purpose-            REUnion ["callsite", "callstack", "nowrap", "timestamp", "stderr", "stdout" ])-        ]--instance Described Version where-    describe _ = REMunch1 reDot reDigits where-        reDigits = REUnion-            [ reChar '0'-            , reChars ['1'..'9'] <> REMunchR 8 reEps (reChars ['0'..'9'])-            ]--instance Described VersionRange where-    describe _ = RERec "version-range" $ REUnion-        [ "=="  <> RESpaces <> ver-        , ">"   <> RESpaces <> ver-        , "<"   <> RESpaces <> ver-        , "<="  <> RESpaces <> ver-        , ">="  <> RESpaces <> ver-        , "^>=" <> RESpaces <> ver--        -- ==0.1.*-        , "==" <> RESpaces <> wildVer--        , reVar0 <> RESpaces  <> "||" <> RESpaces <> reVar0-        , reVar0 <> RESpaces  <> "&&" <> RESpaces <> reVar0-        , "(" <> RESpaces <> reVar0  <> RESpaces <> ")"--        -- == { 0.1.2 }-        -- silly haddock: ^>= { 0.1.2, 3.4.5 }-        , "=="  <> RESpaces <> verSet-        , "^>=" <> RESpaces <> verSet-        ]-      where-        ver'    = describe (Proxy :: Proxy Version)-        ver     = RENamed "version" ver'-        wildVer = ver' <> ".*"-        verSet  = "{" <> RESpaces <> REMunch1 reSpacedComma ver <> RESpaces <> "}"--instance Described UnitId where-    describe _ = reMunch1CS $ csAlphaNum <> csChar '-' <> csChar '_' <> csChar '.' <> csChar '+'--instance Described UnqualComponentName where-    describe _ = reUnqualComponent------------------------------------------------------------------------------------ Instances: Newtypes----------------------------------------------------------------------------------class Sep sep => DescribeSep sep where-    describeSep :: Proxy sep -> GrammarRegex a -> GrammarRegex a--instance DescribeSep CommaVCat   where describeSep _ = reCommaList-instance DescribeSep CommaFSep   where describeSep _ = reCommaList-instance DescribeSep VCat        where describeSep _ = reCommaList-instance DescribeSep FSep        where describeSep _ = reOptCommaList-instance DescribeSep NoCommaFSep where describeSep _ = reSpacedList--instance (Newtype a b, DescribeSep sep, Described b) => Described (List sep b a) where-    describe _ = describeSep (Proxy :: Proxy sep) (describe (Proxy :: Proxy b))--instance (Newtype a b, Ord a, DescribeSep sep, Described b) => Described (Set' sep b a) where-    describe _ = describeSep (Proxy :: Proxy sep) (describe (Proxy :: Proxy b))--instance Described Token where-    describe _ = REUnion [reHsString, reMunch1CS csNotSpaceOrComma]--instance Described Token' where-    describe _ = REUnion [reHsString, reMunch1CS csNotSpace]--instance Described a => Described (MQuoted a) where-    -- TODO: this is simplification-    describe _ = describe ([] :: [a])--instance Described SpecVersion where-    describe _ = "3.4" -- :)--instance Described SpecLicense where-    describe _ = RETodo--instance Described TestedWith where-    describe _ = RETodo--instance Described FilePathNT where-    describe _ = describe ([] :: [Token])

@@ -1,242 +0,0 @@-{-# LANGUAGE BangPatterns #-}-{-# LANGUAGE CPP          #-}--- | Sets of characters.------ Using this is more efficint than 'RE.Type.Alt':ng individual characters.-module Distribution.Utils.CharSet (-    -- * Set of characters-    CharSet,-    -- * Construction-    empty,-    universe,-    singleton,-    insert,-    union,-    intersection,-    complement,-    difference,-    -- * Query-    size,-    null,-    member,-    -- * Conversions-    fromList,-    toList,-    fromIntervalList,-    toIntervalList,-    -- * Special lists-    alpha,-    alphanum,-    upper,-    ) where--import Data.Char                     (chr, isAlpha, isAlphaNum, isUpper, ord)-import Data.List                     (foldl', sortBy)-import Data.Monoid                   (Monoid (..))-import Data.String                   (IsString (..))-import Distribution.Compat.Semigroup (Semigroup (..))-import Prelude-       (Bool (..), Bounded (..), Char, Enum (..), Eq (..), Int, Maybe (..), Num (..), Ord (..), Show (..), String, concatMap, flip, fst, otherwise, showParen,-       showString, uncurry, ($), (.))--#if MIN_VERSION_containers(0,5,0)-import qualified Data.IntMap.Strict as IM-#else-import qualified Data.IntMap as IM-#endif---- | A set of 'Char's.------ We use range set, which works great with 'Char'.-newtype CharSet = CS { unCS :: IM.IntMap Int }-  deriving (Eq, Ord)--instance IsString CharSet where-    fromString = fromList--instance Show CharSet where-    showsPrec d cs-        | size cs < 20-        = showsPrec d (toList cs)-        | otherwise-        = showParen (d > 10)-        $ showString "CS "-        . showsPrec 11 (unCS cs)--instance Semigroup CharSet where-    (<>) = union--instance Monoid CharSet where-    mempty = empty-    mappend = (<>)---- | Empty character set.-empty :: CharSet-empty = CS IM.empty---- | universe-universe :: CharSet-universe = CS $ IM.singleton 0 0x10ffff---- | Check whether 'CharSet' is 'empty'.-null :: CharSet -> Bool-null (CS cs) = IM.null cs---- | Size of 'CharSet'------ >>> size $ fromIntervalList [('a','f'), ('0','9')]--- 16------ >>> length $ toList $ fromIntervalList [('a','f'), ('0','9')]--- 16----size :: CharSet -> Int-size (CS m) = foldl' (\ !acc (lo, hi) -> acc + (hi - lo) + 1) 0 (IM.toList m)---- | Singleton character set.-singleton :: Char -> CharSet-singleton c = CS (IM.singleton (ord c) (ord c))---- | Test whether character is in the set.-member :: Char -> CharSet -> Bool-#if MIN_VERSION_containers(0,5,0)-member c (CS m) = case IM.lookupLE i m of-    Nothing      -> False-    Just (_, hi) -> i <= hi-  where-#else-member c (CS m) = go (IM.toList m)-  where-    go [] = False-    go ((x,y):zs) = (x <= i && i <= y) || go zs-#endif-    i = ord c---- | Insert 'Char' into 'CharSet'.-insert :: Char -> CharSet -> CharSet-insert c (CS m) = normalise (IM.insert (ord c) (ord c) m)---- | Union of two 'CharSet's.-union :: CharSet -> CharSet -> CharSet-union (CS xs) (CS ys) = normalise (IM.unionWith max xs ys)---- | Intersection of two 'CharSet's-intersection :: CharSet -> CharSet -> CharSet-intersection (CS xs) (CS ys) = CS $-    IM.fromList (intersectRangeList (IM.toList xs) (IM.toList ys))---- | Compute the intersection.-intersectRangeList :: Ord a => [(a, a)] -> [(a, a)] -> [(a, a)]-intersectRangeList aset@((x,y):as) bset@((u,v):bs)-   | y < u     = intersectRangeList as bset-   | v < x     = intersectRangeList aset bs-   | y < v     = (max x u, y) : intersectRangeList as bset-   | otherwise = (max x u, v) : intersectRangeList aset bs-intersectRangeList _ [] = []-intersectRangeList [] _ = []---- | Complement of a CharSet-complement :: CharSet -> CharSet-complement (CS xs) = CS $ IM.fromList $ complementRangeList (IM.toList xs)---- | Compute the complement intersected with @[x,)@ assuming @x<u@.-complementRangeList' :: Int -> [(Int, Int)] -> [(Int, Int)]-complementRangeList' x ((u,v):s) = (x,pred u) : complementRangeList'' v s-complementRangeList' x []        = [(x,0x10ffff)]---- | Compute the complement intersected with @(x,)@.-complementRangeList'' :: Int -> [(Int, Int)] -> [(Int, Int)]-complementRangeList'' x s-    | x == 0x10ffff = []-    | otherwise     = complementRangeList' (succ x) s---- | Compute the complement.------ Note: we treat Ints as codepoints, i.e minBound is 0, and maxBound is 0x10ffff-complementRangeList :: [(Int, Int)] -> [(Int, Int)]-complementRangeList s@((x,y):s')-    | x == 0    = complementRangeList'' y s'-    | otherwise = complementRangeList' 0 s-complementRangeList [] = [(0, 0x10ffff)]---- | Difference of two 'CharSet's.-difference :: CharSet -> CharSet -> CharSet-difference xs ys = intersection xs (complement ys)---- | Make 'CharSet' from a list of characters, i.e. 'String'.-fromList :: String -> CharSet-fromList = normalise . foldl' (\ acc c -> IM.insert (ord c) (ord c) acc) IM.empty---- | Convert 'CharSet' to a list of characters i.e. 'String'.-toList :: CharSet -> String-toList = concatMap (uncurry enumFromTo) . toIntervalList---- | Convert to interval list------ >>> toIntervalList $ union "01234" "56789"--- [('0','9')]----toIntervalList :: CharSet -> [(Char, Char)]-toIntervalList (CS m) = [ (chr lo, chr hi) | (lo, hi) <- IM.toList m ]---- | Convert from interval pairs.------ >>> fromIntervalList []--- ""------ >>> fromIntervalList [('a','f'), ('0','9')]--- "0123456789abcdef"------ >>> fromIntervalList [('Z','A')]--- ""----fromIntervalList :: [(Char,Char)] -> CharSet-fromIntervalList xs = normalise' $ sortBy (\a b -> compare (fst a) (fst b))-    [ (ord lo, ord hi)-    | (lo, hi) <- xs-    , lo <= hi-    ]------------------------------------------------------------------------------------ Normalisation----------------------------------------------------------------------------------normalise :: IM.IntMap Int -> CharSet-normalise = normalise'. IM.toList--normalise' :: [(Int,Int)] -> CharSet-normalise' = CS . IM.fromList . go where-    go :: [(Int,Int)] -> [(Int,Int)]-    go []         = []-    go ((x,y):zs) = go' x y zs--    go' :: Int -> Int -> [(Int, Int)] -> [(Int, Int)]-    go' lo hi [] = [(lo, hi)]-    go' lo hi ws0@((u,v):ws)-        | u <= succ hi = go' lo (max v hi) ws-        | otherwise    = (lo,hi) : go ws0------------------------------------------------------------------------------------ Alpha Numeric character list------------------------------------------------------------------------------------ Computing this takes some time,--- but they are not used in-non testing in Cabal's normal operation.---- | Note: this set varies depending on @base@ version.----alpha :: CharSet-alpha = foldl' (flip insert) empty [ c | c <- [ minBound .. maxBound ], isAlpha c ]-{-# NOINLINE alpha #-}---- | Note: this set varies depending on @base@ version.----alphanum :: CharSet-alphanum = foldl' (flip insert) empty [ c | c <- [ minBound .. maxBound ], isAlphaNum c ]-{-# NOINLINE alphanum #-}---- | Note: this set varies depending on @base@ version.----upper :: CharSet-upper = foldl' (flip insert) empty [ c | c <- [ minBound .. maxBound ], isUpper c ]-{-# NOINLINE upper #-}

@@ -1,215 +0,0 @@-{-# LANGUAGE DeriveFoldable      #-}-{-# LANGUAGE DeriveFunctor       #-}-{-# LANGUAGE DeriveTraversable   #-}-{-# LANGUAGE OverloadedStrings   #-}-{-# LANGUAGE ScopedTypeVariables #-}-module Distribution.Utils.GrammarRegex (-    -- * Regular expressions-    GrammarRegex (..),-    reEps,-    reChar,-    reChars,-    reMunchCS,-    reMunch1CS,-    -- * Variables-    reVar0,-    reVar1,-    -- * Pretty-printing-    regexDoc,-    ) where--import Data.Char                     (isAlphaNum, isControl, ord)-import Data.Foldable                 (Foldable)-import Data.Maybe                    (fromMaybe)-import Data.Monoid                   (Monoid (..))-import Data.String                   (IsString (..))-import Data.Traversable              (Traversable)-import Data.Void                     (Void, vacuous)-import Distribution.Compat.Semigroup (Semigroup (..))-import Prelude                       (Bool (..), Char, Eq (..), Functor, Int, Maybe (..), Ord (..), Show, String, fmap, length, map, otherwise, ($), (++), (.))--import qualified Distribution.Utils.CharSet as CS-import qualified Text.PrettyPrint           as PP--(<<>>) :: PP.Doc -> PP.Doc -> PP.Doc-(<<>>) = (PP.<>)------------------------------------------------------------------------------------ GrammarRegex------------------------------------------------------------------------------------ | Recursive regular expressions tuned for 'Described' use-case.-data GrammarRegex a-    = REAppend  [GrammarRegex a]          -- ^ append @ab@-    | REUnion   [GrammarRegex a]          -- ^ union @a|b@--    -- repetition-    | REMunch   (GrammarRegex a) (GrammarRegex a)       -- ^ star @a*@, with a separator-    | REMunch1  (GrammarRegex a) (GrammarRegex a)       -- ^ plus @a+@, with a separator-    | REMunchR Int (GrammarRegex a) (GrammarRegex a)    -- ^ 1-n, with a separator-    | REOpt     (GrammarRegex a)                        -- ^ optional @r?@--    | REString  String                           -- ^ literal string @abcd@-    | RECharSet CS.CharSet                       -- ^ charset @[:alnum:]@-    | REVar     a                                -- ^ variable-    | RENamed   String (GrammarRegex a)          -- ^ named expression-    | RERec     String (GrammarRegex (Maybe a))  -- ^ recursive expressions--    -- cabal syntax specifics-    | RESpaces                            -- ^ zero-or-more spaces-    | RESpaces1                           -- ^ one-or-more spaces-    | RECommaList (GrammarRegex a)        -- ^ comma list (note, leading or trailing commas)-    | RECommaNonEmpty (GrammarRegex a)    -- ^ comma non-empty list (note, leading or trailing commas)-    | REOptCommaList (GrammarRegex a)     -- ^ opt comma list--    | RETodo                              -- ^ unspecified-  deriving (Eq, Ord, Show, Functor, Foldable, Traversable)------------------------------------------------------------------------------------ Instances----------------------------------------------------------------------------------instance IsString (GrammarRegex a)  where-    fromString = REString--instance Semigroup (GrammarRegex a) where-    x <> y = REAppend (unAppend x ++ unAppend y) where-        unAppend (REAppend rs) = rs-        unAppend r             = [r]--instance Monoid (GrammarRegex a) where-    mempty = REAppend []-    mappend = (<>)------------------------------------------------------------------------------------ Smart constructors----------------------------------------------------------------------------------reEps :: GrammarRegex a-reEps = REAppend []--reChar :: Char -> GrammarRegex a-reChar = RECharSet . CS.singleton--reChars :: [Char] -> GrammarRegex a-reChars = RECharSet . CS.fromList--reMunch1CS :: CS.CharSet -> GrammarRegex a-reMunch1CS = REMunch1 reEps . RECharSet--reMunchCS :: CS.CharSet -> GrammarRegex a-reMunchCS = REMunch reEps . RECharSet------------------------------------------------------------------------------------ Variables----------------------------------------------------------------------------------reVar0 :: GrammarRegex (Maybe a)-reVar0 = REVar Nothing--reVar1 :: GrammarRegex (Maybe (Maybe a))-reVar1 = REVar (Just Nothing)------------------------------------------------------------------------------------ Pretty-printing------------------------------------------------------------------------------------ |------ >>> regexDoc $ REString "True"--- \mathop{\mathord{``}\mathtt{True}\mathord{"}}------ Note: we don't simplify regexps yet:------ >>> regexDoc $ REString "foo" <> REString "bar"--- \mathop{\mathord{``}\mathtt{foo}\mathord{"}}\mathop{\mathord{``}\mathtt{bar}\mathord{"}}----regexDoc :: GrammarRegex Void -> PP.Doc-regexDoc = go 0 . vacuous where-    go :: Int -> GrammarRegex PP.Doc -> PP.Doc-    go _ (REAppend [])    = ""-    go d (REAppend rs)    = parensIf (d > 2) $ PP.hcat (map (go 2) rs)-    go d (REUnion [r])    = go d r-    go _ (REUnion rs)     = PP.hsep-        [ "\\left\\{"-        , if length rs < 4-          then PP.hcat (PP.punctuate (PP.text "\\mid") (map (go 0) rs))-          else "\\begin{gathered}" <<>>-               PP.hcat (PP.punctuate "\\\\" (map (go 0) rs)) <<>>-              "\\end{gathered}"-        , "\\right\\}" ]--    go d (REMunch sep r)  = parensIf (d > 3) $-        PP.text "{" <<>> go 4 r <<>> PP.text "}^\\ast_{" <<>> go 4 sep <<>> PP.text "}"-    go d (REMunch1 sep r) = parensIf (d > 3) $-        PP.text "{" <<>> go 4 r <<>> PP.text "}^+_{" <<>> go 4 sep <<>> PP.text "}"-    go d (REMunchR n sep r) = parensIf (d > 3) $-        PP.text "{" <<>> go 4 r <<>> PP.text "}^{\\in [0\\ldots" <<>> PP.int n <<>> "]}_{" <<>> go 4 sep <<>> PP.text "}"-    go d (REOpt r)        = parensIf (d > 3) $-        PP.text "{" <<>> go 4 r <<>> PP.text "}^?"--    go _ (REString s)     = PP.text "\\mathop{\\mathord{``}\\mathtt{" <<>> PP.hcat (map charDoc s) <<>> PP.text "}\\mathord{\"}}"-    go _ (RECharSet cs)   = charsetDoc cs--    go _ RESpaces         = "\\circ"-    go _ RESpaces1        = "\\bullet"--    go _ (RECommaList r)  =-        "\\mathrm{commalist}" <<>> go 4 r-    go _ (RECommaNonEmpty r)  =-        "\\mathrm{commanonempty}" <<>> go 4 r-    go _ (REOptCommaList r) =-        "\\mathrm{optcommalist}" <<>> go 4 r--    go _ (REVar a)         = a-    go _ (RENamed n _)     = terminalDoc n-    go d (RERec n r)       = parensIf (d > 0) $-        "\\mathbf{fix}\\;" <<>> n' <<>> "\\;\\mathbf{in}\\;" <<>>-        go 0 (fmap (fromMaybe n') r)-      where-        n' = terminalDoc n--    go _ RETodo            = PP.text "\\mathsf{\\color{red}{TODO}}"--    parensIf :: Bool -> PP.Doc -> PP.Doc-    parensIf True  d = PP.text "\\left(" <<>> d <<>> PP.text "\\right)"-    parensIf False d = d--terminalDoc :: String -> PP.Doc-terminalDoc s = PP.text "\\mathop{\\mathit{" <<>> PP.hcat (map charDoc s) <<>> PP.text "}}"--charDoc :: Char -> PP.Doc-charDoc ' ' = PP.text "\\ "-charDoc '{' = PP.text "\\{"-charDoc '}' = PP.text "\\}"-charDoc '\\' = PP.text "\\text{\\\\}"-charDoc c-    | isAlphaNum c = PP.char c-    | isControl  c = PP.int (ord c) -- TODO: some syntax-    | otherwise    = PP.text ("\\text{" ++ c : "}")--inquotes :: PP.Doc -> PP.Doc-inquotes d = "\\mathop{\\mathord{``}" <<>> d <<>> "\\mathord{\"}}"--mathtt :: PP.Doc -> PP.Doc-mathtt d = "\\mathtt{" <<>> d <<>> "}"--charsetDoc :: CS.CharSet -> PP.Doc-charsetDoc acs-    | acs == CS.alpha    = terminalDoc "alpha"-    | acs == CS.alphanum = terminalDoc "alpha-num"-    | acs == CS.upper    = terminalDoc "upper"-charsetDoc acs = case CS.toIntervalList acs of-    []               -> "\\emptyset"-    [(x,y)] | x == y -> inquotes $ mathtt $ charDoc x-    rs-        | CS.size acs <= CS.size notAcs-        -> PP.brackets $ PP.hcat $ map rangeDoc rs-        | otherwise-        -> PP.braces $ PP.brackets (PP.hcat $ map rangeDoc (CS.toIntervalList notAcs)) <<>> PP.text "^c"-  where-    notAcs = CS.complement acs--    rangeDoc :: (Char, Char) -> PP.Doc-    rangeDoc (x, y) | x == y    = inquotes (mathtt $ charDoc x)-                    | otherwise = inquotes (mathtt $ charDoc x) <<>> PP.text "\\cdots" <<>> inquotes (mathtt $ charDoc y)

@@ -1,135 +0,0 @@-{-# LANGUAGE CPP #-}-#if __GLASGOW_HASKELL__ >= 800-{-# OPTIONS_GHC -freduction-depth=0 #-}-#else-{-# OPTIONS_GHC -fcontext-stack=151 #-}-#endif-{-# OPTIONS_GHC -fno-warn-orphans #-}-module Data.TreeDiff.Instances.Cabal () where--import Data.TreeDiff--import Data.TreeDiff.Instances.CabalLanguage ()-import Data.TreeDiff.Instances.CabalSPDX ()-import Data.TreeDiff.Instances.CabalVersion ()-----------------------------------------------------------------------------------import Distribution.Backpack                       (OpenModule, OpenUnitId)-import Distribution.CabalSpecVersion               (CabalSpecVersion)-import Distribution.Compiler                       (CompilerFlavor, CompilerId, PerCompilerFlavor)-import Distribution.InstalledPackageInfo           (AbiDependency, ExposedModule, InstalledPackageInfo)-import Distribution.ModuleName                     (ModuleName)-import Distribution.PackageDescription-import Distribution.Simple.Compiler                (DebugInfoLevel, OptimisationLevel, ProfDetailLevel)-import Distribution.Simple.Flag                    (Flag)-import Distribution.Simple.InstallDirs-import Distribution.Simple.InstallDirs.Internal-import Distribution.Simple.Setup                   (HaddockTarget, TestShowDetails)-import Distribution.System-import Distribution.Types.AbiHash                  (AbiHash)-import Distribution.Types.ComponentId              (ComponentId)-import Distribution.Types.IncludeRenaming          (IncludeRenaming)-import Distribution.Types.Mixin-import Distribution.Types.ModuleReexport-import Distribution.Types.ModuleRenaming-import Distribution.Types.PackageVersionConstraint-import Distribution.Types.PkgconfigName            (PkgconfigName)-import Distribution.Types.PkgconfigVersion         (PkgconfigVersion)-import Distribution.Types.PkgconfigVersionRange    (PkgconfigVersionRange)-import Distribution.Types.UnitId                   (DefUnitId, UnitId)-import Distribution.Utils.NubList                  (NubList)-import Distribution.Utils.ShortText                (ShortText, fromShortText)-import Distribution.Verbosity-import Distribution.Verbosity.Internal--import qualified Distribution.Compat.NonEmptySet as NES------------------------------------------------------------------------------------ instances----------------------------------------------------------------------------------instance (Eq a, Show a) => ToExpr (Condition a) where toExpr = defaultExprViaShow-instance (Show a, ToExpr b, ToExpr c, Show b, Show c, Eq a, Eq c, Eq b) => ToExpr (CondTree a b c)-instance (Show a, ToExpr b, ToExpr c, Show b, Show c, Eq a, Eq c, Eq b) => ToExpr (CondBranch a b c)-instance (ToExpr a) => ToExpr (NubList a)-instance (ToExpr a) => ToExpr (Flag a)-instance ToExpr a => ToExpr (NES.NonEmptySet a) where-    toExpr xs = App "NonEmptySet.fromNonEmpty" [toExpr $ NES.toNonEmpty xs]--instance ToExpr a => ToExpr (PerCompilerFlavor a)--instance ToExpr Dependency where-    toExpr d@(Dependency pn vr cs)-        | cs == mainLibSet = App "Dependency" [toExpr pn, toExpr vr, App "mainLibSet" []]-        | otherwise        = genericToExpr d--instance ToExpr AbiDependency-instance ToExpr AbiHash-instance ToExpr Arch-instance ToExpr Benchmark-instance ToExpr BenchmarkInterface-instance ToExpr BenchmarkType-instance ToExpr BuildInfo-instance ToExpr BuildType-instance ToExpr CabalSpecVersion-instance ToExpr CompilerFlavor-instance ToExpr CompilerId-instance ToExpr ComponentId-instance ToExpr DebugInfoLevel-instance ToExpr DefUnitId-instance ToExpr ExeDependency-instance ToExpr Executable-instance ToExpr ExecutableScope-instance ToExpr ExposedModule-instance ToExpr FlagAssignment-instance ToExpr FlagName-instance ToExpr ForeignLib-instance ToExpr ForeignLibOption-instance ToExpr ForeignLibType-instance ToExpr GenericPackageDescription-instance ToExpr HaddockTarget-instance ToExpr IncludeRenaming-instance ToExpr InstalledPackageInfo-instance ToExpr KnownRepoType-instance ToExpr LegacyExeDependency-instance ToExpr LibVersionInfo-instance ToExpr Library-instance ToExpr LibraryName-instance ToExpr LibraryVisibility-instance ToExpr Mixin-instance ToExpr ModuleName-instance ToExpr ModuleReexport-instance ToExpr ModuleRenaming-instance ToExpr OS-instance ToExpr OpenModule-instance ToExpr OpenUnitId-instance ToExpr OptimisationLevel-instance ToExpr PackageDescription-instance ToExpr PackageFlag-instance ToExpr PackageIdentifier-instance ToExpr PackageName-instance ToExpr PackageVersionConstraint-instance ToExpr PathComponent-instance ToExpr PathTemplate-instance ToExpr PathTemplateVariable-instance ToExpr PkgconfigDependency-instance ToExpr PkgconfigName-instance ToExpr PkgconfigVersion-instance ToExpr PkgconfigVersionRange-instance ToExpr ProfDetailLevel-instance ToExpr RepoKind-instance ToExpr RepoType-instance ToExpr SetupBuildInfo-instance ToExpr SourceRepo-instance ToExpr TestShowDetails-instance ToExpr TestSuite-instance ToExpr TestSuiteInterface-instance ToExpr TestType-instance ToExpr UnitId-instance ToExpr UnqualComponentName-instance ToExpr Verbosity-instance ToExpr VerbosityFlag-instance ToExpr VerbosityLevel--instance ToExpr ShortText where toExpr = toExpr . fromShortText

@@ -1,17 +0,0 @@-{-# LANGUAGE CPP #-}-#if __GLASGOW_HASKELL__ >= 800-{-# OPTIONS_GHC -freduction-depth=0 #-}-#else-{-# OPTIONS_GHC -fcontext-stack=151 #-}-#endif-{-# OPTIONS_GHC -fno-warn-orphans #-}-module Data.TreeDiff.Instances.CabalLanguage () where--import Data.TreeDiff-import Language.Haskell.Extension (Extension, KnownExtension, Language)---- These are big enums, so they are in separate file.----instance ToExpr Extension-instance ToExpr KnownExtension-instance ToExpr Language

@@ -1,28 +0,0 @@-{-# LANGUAGE CPP #-}-#if __GLASGOW_HASKELL__ >= 800-{-# OPTIONS_GHC -freduction-depth=0 #-}-#else-{-# OPTIONS_GHC -fcontext-stack=151 #-}-#endif-{-# OPTIONS_GHC -fno-warn-orphans #-}-module Data.TreeDiff.Instances.CabalSPDX () where--import Data.TreeDiff-import Distribution.License (License)--import Data.TreeDiff.Instances.CabalVersion ()--import qualified Distribution.SPDX as SPDX---- 'License' almost belongs here.--instance ToExpr License---- Generics instance is too heavy-instance ToExpr SPDX.LicenseId where toExpr = defaultExprViaShow-instance ToExpr SPDX.LicenseExceptionId where toExpr = defaultExprViaShow--instance ToExpr SPDX.License-instance ToExpr SPDX.LicenseExpression-instance ToExpr SPDX.LicenseRef-instance ToExpr SPDX.SimpleLicenseExpression

@@ -1,14 +0,0 @@-{-# LANGUAGE CPP #-}-#if __GLASGOW_HASKELL__ >= 800-{-# OPTIONS_GHC -freduction-depth=0 #-}-#else-{-# OPTIONS_GHC -fcontext-stack=151 #-}-#endif-{-# OPTIONS_GHC -fno-warn-orphans #-}-module Data.TreeDiff.Instances.CabalVersion where--import Data.TreeDiff-import Distribution.Version (Version, VersionRange, versionNumbers)--instance ToExpr Version where toExpr v = App "mkVersion" [toExpr $ versionNumbers v]-instance ToExpr VersionRange

@@ -1,7 +1,7 @@ cabal-version: >=1.10 name:          Cabal-version:       3.4.1.0-copyright:     2003-2020, Cabal Development Team (see AUTHORS file)+version:       3.6.0.0+copyright:     2003-2021, Cabal Development Team (see AUTHORS file) license:       BSD3 license-file:  LICENSE author:        Cabal Development Team <cabal-devel@haskell.org>@@ -22,286 +22,7 @@ -- we can bootstrap.  extra-source-files:-  README.md tests/README.md ChangeLog.md-  doc/bugs-and-stability.rst doc/concepts-and-development.rst-  doc/conf.py doc/config-and-install.rst doc/developing-packages.rst-  doc/images/Cabal-dark.png doc/index.rst doc/installing-packages.rst-  doc/intro.rst doc/misc.rst doc/nix-local-build-overview.rst-  doc/nix-local-build.rst doc/file-format-changelog.rst doc/README.md-  doc/references.inc--  -- Generated with 'make gen-extra-source-files'-  -- Do NOT edit this section manually; instead, run the script.-  -- BEGIN gen-extra-source-files-  tests/ParserTests/errors/MiniAgda.cabal-  tests/ParserTests/errors/MiniAgda.errors-  tests/ParserTests/errors/anynone.cabal-  tests/ParserTests/errors/anynone.errors-  tests/ParserTests/errors/big-version.cabal-  tests/ParserTests/errors/big-version.errors-  tests/ParserTests/errors/common1.cabal-  tests/ParserTests/errors/common1.errors-  tests/ParserTests/errors/common2.cabal-  tests/ParserTests/errors/common2.errors-  tests/ParserTests/errors/common3.cabal-  tests/ParserTests/errors/common3.errors-  tests/ParserTests/errors/forward-compat.cabal-  tests/ParserTests/errors/forward-compat.errors-  tests/ParserTests/errors/forward-compat2.cabal-  tests/ParserTests/errors/forward-compat2.errors-  tests/ParserTests/errors/forward-compat3.cabal-  tests/ParserTests/errors/forward-compat3.errors-  tests/ParserTests/errors/issue-5055-2.cabal-  tests/ParserTests/errors/issue-5055-2.errors-  tests/ParserTests/errors/issue-5055.cabal-  tests/ParserTests/errors/issue-5055.errors-  tests/ParserTests/errors/leading-comma-2.cabal-  tests/ParserTests/errors/leading-comma-2.errors-  tests/ParserTests/errors/leading-comma-2b.cabal-  tests/ParserTests/errors/leading-comma-2b.errors-  tests/ParserTests/errors/leading-comma-2c.cabal-  tests/ParserTests/errors/leading-comma-2c.errors-  tests/ParserTests/errors/leading-comma.cabal-  tests/ParserTests/errors/leading-comma.errors-  tests/ParserTests/errors/libpq1.cabal-  tests/ParserTests/errors/libpq1.errors-  tests/ParserTests/errors/libpq2.cabal-  tests/ParserTests/errors/libpq2.errors-  tests/ParserTests/errors/mixin-1.cabal-  tests/ParserTests/errors/mixin-1.errors-  tests/ParserTests/errors/mixin-2.cabal-  tests/ParserTests/errors/mixin-2.errors-  tests/ParserTests/errors/multiple-libs.cabal-  tests/ParserTests/errors/multiple-libs.errors-  tests/ParserTests/errors/noVersion.cabal-  tests/ParserTests/errors/noVersion.errors-  tests/ParserTests/errors/noVersion2.cabal-  tests/ParserTests/errors/noVersion2.errors-  tests/ParserTests/errors/range-ge-wild.cabal-  tests/ParserTests/errors/range-ge-wild.errors-  tests/ParserTests/errors/removed-fields.cabal-  tests/ParserTests/errors/removed-fields.errors-  tests/ParserTests/errors/spdx-1.cabal-  tests/ParserTests/errors/spdx-1.errors-  tests/ParserTests/errors/spdx-2.cabal-  tests/ParserTests/errors/spdx-2.errors-  tests/ParserTests/errors/spdx-3.cabal-  tests/ParserTests/errors/spdx-3.errors-  tests/ParserTests/errors/undefined-flag.cabal-  tests/ParserTests/errors/undefined-flag.errors-  tests/ParserTests/errors/version-sets-1.cabal-  tests/ParserTests/errors/version-sets-1.errors-  tests/ParserTests/errors/version-sets-2.cabal-  tests/ParserTests/errors/version-sets-2.errors-  tests/ParserTests/errors/version-sets-3.cabal-  tests/ParserTests/errors/version-sets-3.errors-  tests/ParserTests/errors/version-sets-4.cabal-  tests/ParserTests/errors/version-sets-4.errors-  tests/ParserTests/ipi/Includes2.cabal-  tests/ParserTests/ipi/Includes2.expr-  tests/ParserTests/ipi/Includes2.format-  tests/ParserTests/ipi/internal-preprocessor-test.cabal-  tests/ParserTests/ipi/internal-preprocessor-test.expr-  tests/ParserTests/ipi/internal-preprocessor-test.format-  tests/ParserTests/ipi/issue-2276-ghc-9885.cabal-  tests/ParserTests/ipi/issue-2276-ghc-9885.expr-  tests/ParserTests/ipi/issue-2276-ghc-9885.format-  tests/ParserTests/ipi/transformers.cabal-  tests/ParserTests/ipi/transformers.expr-  tests/ParserTests/ipi/transformers.format-  tests/ParserTests/regressions/Octree-0.5.cabal-  tests/ParserTests/regressions/Octree-0.5.expr-  tests/ParserTests/regressions/Octree-0.5.format-  tests/ParserTests/regressions/anynone.cabal-  tests/ParserTests/regressions/anynone.expr-  tests/ParserTests/regressions/anynone.format-  tests/ParserTests/regressions/assoc-cpp-options.cabal-  tests/ParserTests/regressions/assoc-cpp-options.check-  tests/ParserTests/regressions/bad-glob-syntax.cabal-  tests/ParserTests/regressions/bad-glob-syntax.check-  tests/ParserTests/regressions/big-version.cabal-  tests/ParserTests/regressions/big-version.expr-  tests/ParserTests/regressions/big-version.format-  tests/ParserTests/regressions/cc-options-with-optimization.cabal-  tests/ParserTests/regressions/cc-options-with-optimization.check-  tests/ParserTests/regressions/common-conditional.cabal-  tests/ParserTests/regressions/common-conditional.expr-  tests/ParserTests/regressions/common-conditional.format-  tests/ParserTests/regressions/common.cabal-  tests/ParserTests/regressions/common.expr-  tests/ParserTests/regressions/common.format-  tests/ParserTests/regressions/common2.cabal-  tests/ParserTests/regressions/common2.expr-  tests/ParserTests/regressions/common2.format-  tests/ParserTests/regressions/common3.cabal-  tests/ParserTests/regressions/common3.expr-  tests/ParserTests/regressions/common3.format-  tests/ParserTests/regressions/cxx-options-with-optimization.cabal-  tests/ParserTests/regressions/cxx-options-with-optimization.check-  tests/ParserTests/regressions/denormalised-paths.cabal-  tests/ParserTests/regressions/denormalised-paths.check-  tests/ParserTests/regressions/elif.cabal-  tests/ParserTests/regressions/elif.expr-  tests/ParserTests/regressions/elif.format-  tests/ParserTests/regressions/elif2.cabal-  tests/ParserTests/regressions/elif2.expr-  tests/ParserTests/regressions/elif2.format-  tests/ParserTests/regressions/encoding-0.8.cabal-  tests/ParserTests/regressions/encoding-0.8.expr-  tests/ParserTests/regressions/encoding-0.8.format-  tests/ParserTests/regressions/extensions-paths-5054.cabal-  tests/ParserTests/regressions/extensions-paths-5054.check-  tests/ParserTests/regressions/generics-sop.cabal-  tests/ParserTests/regressions/generics-sop.expr-  tests/ParserTests/regressions/generics-sop.format-  tests/ParserTests/regressions/ghc-option-j.cabal-  tests/ParserTests/regressions/ghc-option-j.check-  tests/ParserTests/regressions/haddock-api-2.18.1-check.cabal-  tests/ParserTests/regressions/haddock-api-2.18.1-check.check-  tests/ParserTests/regressions/hasktorch.cabal-  tests/ParserTests/regressions/hasktorch.expr-  tests/ParserTests/regressions/hasktorch.format-  tests/ParserTests/regressions/hidden-main-lib.cabal-  tests/ParserTests/regressions/hidden-main-lib.expr-  tests/ParserTests/regressions/hidden-main-lib.format-  tests/ParserTests/regressions/indentation.cabal-  tests/ParserTests/regressions/indentation.expr-  tests/ParserTests/regressions/indentation.format-  tests/ParserTests/regressions/indentation2.cabal-  tests/ParserTests/regressions/indentation2.expr-  tests/ParserTests/regressions/indentation2.format-  tests/ParserTests/regressions/indentation3.cabal-  tests/ParserTests/regressions/indentation3.expr-  tests/ParserTests/regressions/indentation3.format-  tests/ParserTests/regressions/issue-5055.cabal-  tests/ParserTests/regressions/issue-5055.expr-  tests/ParserTests/regressions/issue-5055.format-  tests/ParserTests/regressions/issue-5846.cabal-  tests/ParserTests/regressions/issue-5846.expr-  tests/ParserTests/regressions/issue-5846.format-  tests/ParserTests/regressions/issue-6083-a.cabal-  tests/ParserTests/regressions/issue-6083-a.expr-  tests/ParserTests/regressions/issue-6083-a.format-  tests/ParserTests/regressions/issue-6083-b.cabal-  tests/ParserTests/regressions/issue-6083-b.expr-  tests/ParserTests/regressions/issue-6083-b.format-  tests/ParserTests/regressions/issue-6083-c.cabal-  tests/ParserTests/regressions/issue-6083-c.expr-  tests/ParserTests/regressions/issue-6083-c.format-  tests/ParserTests/regressions/issue-6083-pkg-pkg.cabal-  tests/ParserTests/regressions/issue-6083-pkg-pkg.expr-  tests/ParserTests/regressions/issue-6083-pkg-pkg.format-  tests/ParserTests/regressions/issue-6288-a.cabal-  tests/ParserTests/regressions/issue-6288-a.check-  tests/ParserTests/regressions/issue-6288-b.cabal-  tests/ParserTests/regressions/issue-6288-b.check-  tests/ParserTests/regressions/issue-6288-c.cabal-  tests/ParserTests/regressions/issue-6288-c.check-  tests/ParserTests/regressions/issue-6288-d.cabal-  tests/ParserTests/regressions/issue-6288-d.check-  tests/ParserTests/regressions/issue-6288-e.cabal-  tests/ParserTests/regressions/issue-6288-e.check-  tests/ParserTests/regressions/issue-6288-f.cabal-  tests/ParserTests/regressions/issue-6288-f.check-  tests/ParserTests/regressions/issue-774.cabal-  tests/ParserTests/regressions/issue-774.check-  tests/ParserTests/regressions/issue-774.expr-  tests/ParserTests/regressions/issue-774.format-  tests/ParserTests/regressions/jaeger-flamegraph.cabal-  tests/ParserTests/regressions/jaeger-flamegraph.expr-  tests/ParserTests/regressions/jaeger-flamegraph.format-  tests/ParserTests/regressions/leading-comma-2.cabal-  tests/ParserTests/regressions/leading-comma-2.expr-  tests/ParserTests/regressions/leading-comma-2.format-  tests/ParserTests/regressions/leading-comma.cabal-  tests/ParserTests/regressions/leading-comma.expr-  tests/ParserTests/regressions/leading-comma.format-  tests/ParserTests/regressions/libpq1.cabal-  tests/ParserTests/regressions/libpq1.expr-  tests/ParserTests/regressions/libpq1.format-  tests/ParserTests/regressions/libpq2.cabal-  tests/ParserTests/regressions/libpq2.expr-  tests/ParserTests/regressions/libpq2.format-  tests/ParserTests/regressions/mixin-1.cabal-  tests/ParserTests/regressions/mixin-1.expr-  tests/ParserTests/regressions/mixin-1.format-  tests/ParserTests/regressions/mixin-2.cabal-  tests/ParserTests/regressions/mixin-2.expr-  tests/ParserTests/regressions/mixin-2.format-  tests/ParserTests/regressions/mixin-3.cabal-  tests/ParserTests/regressions/mixin-3.expr-  tests/ParserTests/regressions/mixin-3.format-  tests/ParserTests/regressions/monad-param.cabal-  tests/ParserTests/regressions/monad-param.expr-  tests/ParserTests/regressions/monad-param.format-  tests/ParserTests/regressions/multiple-libs-2.cabal-  tests/ParserTests/regressions/multiple-libs-2.check-  tests/ParserTests/regressions/multiple-libs-2.expr-  tests/ParserTests/regressions/multiple-libs-2.format-  tests/ParserTests/regressions/noVersion.cabal-  tests/ParserTests/regressions/noVersion.expr-  tests/ParserTests/regressions/noVersion.format-  tests/ParserTests/regressions/nothing-unicode.cabal-  tests/ParserTests/regressions/nothing-unicode.check-  tests/ParserTests/regressions/nothing-unicode.expr-  tests/ParserTests/regressions/nothing-unicode.format-  tests/ParserTests/regressions/pre-1.6-glob.cabal-  tests/ParserTests/regressions/pre-1.6-glob.check-  tests/ParserTests/regressions/pre-2.4-globstar.cabal-  tests/ParserTests/regressions/pre-2.4-globstar.check-  tests/ParserTests/regressions/public-multilib-1.cabal-  tests/ParserTests/regressions/public-multilib-1.check-  tests/ParserTests/regressions/public-multilib-2.cabal-  tests/ParserTests/regressions/public-multilib-2.check-  tests/ParserTests/regressions/shake.cabal-  tests/ParserTests/regressions/shake.expr-  tests/ParserTests/regressions/shake.format-  tests/ParserTests/regressions/spdx-1.cabal-  tests/ParserTests/regressions/spdx-1.expr-  tests/ParserTests/regressions/spdx-1.format-  tests/ParserTests/regressions/spdx-2.cabal-  tests/ParserTests/regressions/spdx-2.expr-  tests/ParserTests/regressions/spdx-2.format-  tests/ParserTests/regressions/spdx-3.cabal-  tests/ParserTests/regressions/spdx-3.expr-  tests/ParserTests/regressions/spdx-3.format-  tests/ParserTests/regressions/th-lift-instances.cabal-  tests/ParserTests/regressions/th-lift-instances.expr-  tests/ParserTests/regressions/th-lift-instances.format-  tests/ParserTests/regressions/version-sets.cabal-  tests/ParserTests/regressions/version-sets.expr-  tests/ParserTests/regressions/version-sets.format-  tests/ParserTests/regressions/wl-pprint-indef.cabal-  tests/ParserTests/regressions/wl-pprint-indef.expr-  tests/ParserTests/regressions/wl-pprint-indef.format-  tests/ParserTests/warnings/bom.cabal-  tests/ParserTests/warnings/bool.cabal-  tests/ParserTests/warnings/deprecatedfield.cabal-  tests/ParserTests/warnings/doubledash.cabal-  tests/ParserTests/warnings/extratestmodule.cabal-  tests/ParserTests/warnings/gluedop.cabal-  tests/ParserTests/warnings/multiplesingular.cabal-  tests/ParserTests/warnings/nbsp.cabal-  tests/ParserTests/warnings/newsyntax.cabal-  tests/ParserTests/warnings/oldsyntax.cabal-  tests/ParserTests/warnings/operator.cabal-  tests/ParserTests/warnings/specversion-a.cabal-  tests/ParserTests/warnings/specversion-b.cabal-  tests/ParserTests/warnings/specversion-c.cabal-  tests/ParserTests/warnings/subsection.cabal-  tests/ParserTests/warnings/tab.cabal-  tests/ParserTests/warnings/trailingfield.cabal-  tests/ParserTests/warnings/unknownfield.cabal-  tests/ParserTests/warnings/unknownsection.cabal-  tests/ParserTests/warnings/utf8.cabal-  tests/ParserTests/warnings/versiontag.cabal-  tests/ParserTests/warnings/wildcard.cabal-  tests/cbits/rpmvercmp.c-  tests/hackage/check.sh-  tests/hackage/download.sh-  tests/hackage/unpack.sh-  tests/misc/ghc-supported-languages.hs-  -- END gen-extra-source-files+  README.md ChangeLog.md  source-repository head   type:     git@@ -312,17 +33,20 @@   default: False  library+  default-language: Haskell2010+  hs-source-dirs: src+   build-depends:     array      >= 0.4.0.1  && < 0.6,-    base       >= 4.6      && < 4.16,-    bytestring >= 0.10.0.0 && < 0.11,+    base       >= 4.6      && < 5,+    bytestring >= 0.10.0.0 && < 0.12,     containers >= 0.5.0.0  && < 0.7,     deepseq    >= 1.3.0.1  && < 1.5,     directory  >= 1.2      && < 1.4,     filepath   >= 1.3.0.1  && < 1.5,     pretty     >= 1.1.1    && < 1.2,     process    >= 1.1.0.2  && < 1.7,-    time       >= 1.4.0.1  && < 1.11+    time       >= 1.4.0.1  && < 1.12    if flag(bundled-binary-generic)     build-depends: binary >= 0.5.1.1 && < 0.7@@ -330,11 +54,11 @@     build-depends: binary >= 0.7 && < 0.9    if os(windows)-    build-depends: Win32 >= 2.3.0.0 && < 2.11+    build-depends: Win32 >= 2.3.0.0 && < 2.13   else     build-depends: unix  >= 2.6.0.0 && < 2.8 -  ghc-options: -Wall -fno-ignore-asserts -fwarn-tabs -fwarn-incomplete-uni-patterns+  ghc-options: -Wall -fno-ignore-asserts -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates   if impl(ghc >= 8.0)     ghc-options: -Wcompat -Wnoncanonical-monad-instances @@ -366,6 +90,7 @@     Distribution.Backpack.PreModuleShape     Distribution.CabalSpecVersion     Distribution.Utils.IOData+    Distribution.Utils.Path     Distribution.Utils.LogProgress     Distribution.Utils.MapAccum     Distribution.Utils.MD5@@ -419,7 +144,6 @@     Distribution.Simple.GHC     Distribution.Simple.GHCJS     Distribution.Simple.Haddock-    Distribution.Simple.Doctest     Distribution.Simple.Glob     Distribution.Simple.HaskellSuite     Distribution.Simple.Hpc@@ -526,6 +250,7 @@     Distribution.Types.VersionRange     Distribution.Types.VersionRange.Internal     Distribution.Types.VersionInterval+    Distribution.Types.VersionInterval.Legacy     Distribution.Types.GivenComponent     Distribution.Types.PackageVersionConstraint     Distribution.Utils.Generic@@ -608,6 +333,7 @@     Distribution.Lex     Distribution.Utils.String     Distribution.Simple.Build.Macros.Z+    Distribution.Simple.Build.PathsModule.Z     Distribution.Simple.GHC.EnvironmentParser     Distribution.Simple.GHC.Internal     Distribution.Simple.GHC.ImplInfo@@ -620,7 +346,6 @@       Distribution.Compat.Binary.Class       Distribution.Compat.Binary.Generic -  default-language: Haskell2010   other-extensions:     BangPatterns     CPP@@ -650,205 +375,3 @@    if impl(ghc >= 7.11)     other-extensions: PatternSynonyms---- Small, fast running tests.-test-suite unit-tests-  type: exitcode-stdio-1.0-  hs-source-dirs: tests-  other-modules:-    Test.Laws-    Test.QuickCheck.Utils-    UnitTests.Distribution.CabalSpecVersion-    UnitTests.Distribution.Compat.CreatePipe-    UnitTests.Distribution.Compat.Graph-    UnitTests.Distribution.Compat.Time-    UnitTests.Distribution.Described-    UnitTests.Distribution.Simple.Glob-    UnitTests.Distribution.Simple.Program.GHC-    UnitTests.Distribution.Simple.Program.Internal-    UnitTests.Distribution.Simple.Utils-    UnitTests.Distribution.SPDX-    UnitTests.Distribution.System-    UnitTests.Distribution.Types.GenericPackageDescription-    UnitTests.Distribution.Utils.CharSet-    UnitTests.Distribution.Utils.Generic-    UnitTests.Distribution.Utils.NubList-    UnitTests.Distribution.Utils.ShortText-    UnitTests.Distribution.Utils.Structured-    UnitTests.Distribution.Version-    UnitTests.Distribution.PkgconfigVersion-    UnitTests.Orphans--  -- Cabal-quickcheck-  hs-source-dirs: Cabal-QuickCheck/src-  other-modules:-    Test.QuickCheck.GenericArbitrary-    Test.QuickCheck.Instances.Cabal--  -- Cabal-described-  hs-source-dirs: Cabal-described/src-  other-modules:-    Distribution.Described-    Distribution.Utils.CharSet-    Distribution.Utils.GrammarRegex-    -  main-is: UnitTests.hs-  build-depends:-    array,-    async >= 2.2.2 && <2.3,-    base,-    binary,-    bytestring,-    containers,-    deepseq,-    directory,-    filepath,-    integer-logarithms >= 1.0.2 && <1.1,-    pretty,-    rere >=0.1 && <0.3,-    tagged,-    tasty >= 1.2.3 && < 1.4,-    tasty-hunit,-    tasty-quickcheck,-    temporary,-    text,-    transformers,-    Diff >=0.4 && <0.5,-    QuickCheck >= 2.14 && < 2.15,-    Cabal-  ghc-options: -Wall-  default-language: Haskell2010--  if !impl(ghc >= 7.10)-    build-depends: void--  if !impl(ghc >= 8.0)-    build-depends: semigroups--test-suite parser-tests-  type: exitcode-stdio-1.0-  hs-source-dirs: tests-  main-is: ParserTests.hs-  build-depends:-    base,-    base-compat >=0.11.0 && <0.12,-    bytestring,-    directory,-    filepath,-    tasty >= 1.2.3 && < 1.4,-    tasty-hunit,-    tasty-quickcheck,-    tasty-golden >=2.3.1.1 && <2.4,-    Diff >=0.4 && <0.5,-    Cabal-  ghc-options: -Wall-  default-language: Haskell2010--  if !impl(ghc >= 8.0)-    build-depends: semigroups--  if impl(ghc >= 7.8)-    build-depends:-      tree-diff      >= 0.1 && <0.2-    hs-source-dirs: Cabal-tree-diff/src-    other-modules:-      Data.TreeDiff.Instances.Cabal-      Data.TreeDiff.Instances.CabalLanguage-      Data.TreeDiff.Instances.CabalSPDX-      Data.TreeDiff.Instances.CabalVersion--test-suite check-tests-  type: exitcode-stdio-1.0-  hs-source-dirs: tests-  main-is: CheckTests.hs-  build-depends:-    base,-    bytestring,-    directory,-    filepath,-    tasty >= 1.2.3 && < 1.4,-    tasty-golden >=2.3.1.1 && <2.4,-    Diff >=0.4 && <0.5,-    Cabal-  ghc-options: -Wall-  default-language: Haskell2010-  if !impl(ghc >= 8.0)-    build-depends:  semigroups--test-suite custom-setup-tests-  type: exitcode-stdio-1.0-  hs-source-dirs: tests/custom-setup-  main-is: CustomSetupTests.hs-  other-modules:-    CabalDoctestSetup-    IdrisSetup-  build-depends:-    Cabal,-    base,-    directory,-    filepath,-    process-  default-language: Haskell2010--test-suite hackage-tests-  type: exitcode-stdio-1.0-  main-is: HackageTests.hs--  -- TODO: need to get 01-index.tar on appveyor-  if os(windows)-    buildable: False--  hs-source-dirs: tests--  build-depends:-    base,-    Cabal,-    bytestring,-    deepseq,-    containers,-    directory,-    filepath--  build-depends:-    base-compat          >=0.11.0   && <0.12,-    base-orphans         >=0.6      && <0.9,-    clock                >=0.8      && <0.9,-    optparse-applicative >=0.13.2.0 && <0.17,-    stm                  >=2.4.5.0  && <2.6,-    tar                  >=0.5.0.3  && <0.6--  if impl(ghc >= 7.8)-    build-depends:-      tree-diff      >= 0.1 && <0.2-    hs-source-dirs: Cabal-tree-diff/src-    other-modules:-      Data.TreeDiff.Instances.Cabal-      Data.TreeDiff.Instances.CabalLanguage-      Data.TreeDiff.Instances.CabalSPDX-      Data.TreeDiff.Instances.CabalVersion--  ghc-options: -Wall -rtsopts -threaded-  default-extensions: CPP-  default-language: Haskell2010--test-suite rpmvercmp-  type: exitcode-stdio-1.0-  main-is: RPMVerCmp.hs--  hs-source-dirs: tests-  build-depends:-    base,-    Cabal,-    bytestring--  build-depends:-    tasty >= 1.2.3 && < 1.4,-    tasty-hunit,-    tasty-quickcheck,-    QuickCheck--  c-sources: tests/cbits/rpmvercmp.c-  cc-options: -Wall--  ghc-options: -Wall-  default-language: Haskell2010

@@ -1,7 +1,7 @@-# 3.4.1.0 [Emily Pillmore](mailto:emilypi@cohomolo.gy) October 2021-  * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.4.1.0.md+# 3.6.0.0 [Emily Pillmore](mailgo:emilypi@cohomolo.gy) August 2021+  * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.6.0.0.md -# 3.4.0.0 [Oleg Grenrus](mailto:oleg.grnerus@iki.fi) February 2021+# 3.4.0.0 [Oleg Grenrus](mailgo:oleg.grnerus@iki.fi) February 2021   * See https://github.com/haskell/cabal/blob/master/release-notes/Cabal-3.4.0.0.md  # 3.2.1.0 [Oleg Grenrus](mailto:oleg.grenris@iki.fi) October 2020@@ -14,7 +14,7 @@  # 3.2.0.0 [Herbert Valerio Riedel](mailto:hvr@gnu.org) April 2020   * Change free text `String` fields to use `ShortText` in package description-    and installed packge info.+    and installed package info.   * Split `Distribution.Types.Flag` and `Distribution.Types.ConfVar`     `Distribution.Types.GenericPackageDescription`.   * Add GHC-8.10 support, including new extensions to@@ -38,26 +38,11 @@ # 3.0.1.0 [Herbert Valerio Riedel](mailto:hvr@gnu.org) April 2020   * Add GHC-8.8 flags to `normaliseGhcFlags`     ([#6379](https://github.com/haskell/cabal/pull/6379)).-    `Language.Haskell.Extension`-  * Use more `NonEmpty` instead of ordinary lists-  * Add `Distribution.Utils.Structured` for fingeprinting `Binary` blobs-  * Add `null`, `length` and `unsafeFromUTF8BS` to `Distribution.Utils.ShortText`-  * Refactor `Distribution.Utils.IOData` module-  * Rename `Distribution.Compat.MD5` to `Distribution.Utils.MD5`-  * Add `safeHead`, `safeTail`, `safeLast` to `Distribution.Utils.Generic`-  * Add `unsnoc` and `unsnocNE` to `Distribution.Utils.Generic`-  * Add `Set'` modifier to `Distribution.Parsec.Newtypes`-  * Add `Distribution.Compat.Async`-  * Add `Distribution.Compat.Process` with `enableProcessJobs`--# 3.0.1.0 TBW-  * Add GHC-8.8 flags to normaliseGhcFlags-    ([#6379](https://github.com/haskell/cabal/pull/6379))   * Typo fixes     ([#6372](https://github.com/haskell/cabal/pull/6372)).   * Limit version number parts to contain at most 9 digits     ([#6386](https://github.com/haskell/cabal/pull/6386)).-  * Fix boundless sublibrary depedency parse failure+  * Fix boundless sublibrary dependency parse failure     ([#5846](https://github.com/haskell/cabal/issues/5846)).   * `cabal check` verifies `cpp-options` more pedantically, allowing only     options starting with `-D` and `-U`.@@ -194,7 +179,7 @@       [#784](https://github.com/haskell/cabal/issues/784),       [#5057](https://github.com/haskell/cabal/issues/5057)).     * Wildcard syntax errors (misplaced `*`, etc), wildcards that-      refer to missing directoies, and wildcards that do not match+      refer to missing directories, and wildcards that do not match       anything are now all detected by `cabal check`.     * Wildcard ('globbing') functions have been moved from       `Distribution.Simple.Utils` to `Distribution.Simple.Glob` and@@ -655,7 +640,7 @@   * Support for finding installed packages for hugs   * Cabal version macros now have proper parenthesis   * Reverted change to filter out deps of non-buildable components-  * Fix for registering implace when using a specific package db+  * Fix for registering inplace when using a specific package db   * Fix mismatch between $os and $arch path template variables   * Fix for finding ar.exe on Windows, always pick ghc's version   * Fix for intra-package dependencies with ghc-6.12@@ -817,7 +802,7 @@ # 1.2.0  [Duncan Coutts](mailto:duncan.coutts@worc.ox.ac.uk) Sept 2007   * To be included in GHC 6.8.x   * New configurations feature-  * Can make haddock docs link to hilighted sources (with hscolour)+  * Can make haddock docs link to highlighted sources (with hscolour)   * New flag to allow linking to haddock docs on the web   * Supports pkg-config   * New field `build-tools` for tool dependencies@@ -857,7 +842,7 @@    * Released with GHC 6.6   * Added support for hoogle-  * Allow profiling and normal builds of libs to be chosen indepentantly+  * Allow profiling and normal builds of libs to be chosen independently   * Default installation directories on Win32 changed   * Register haddock docs with ghc-pkg   * Get haddock to make hyperlinks to dependent package docs@@ -937,7 +922,7 @@   * Lots of bug fixes   * spaces can sometimes be used instead of commas   * A user manual has appeared (Thanks, ross!)-  * for ghc 6.4, configures versionsed depends properly+  * for ghc 6.4, configures versioned depends properly   * more features to `./setup haddock`  ----

@@ -1,269 +0,0 @@-{-# LANGUAGE DeriveDataTypeable         #-}-{-# LANGUAGE DeriveGeneric              #-}-{-# LANGUAGE FlexibleInstances          #-}-{-# LANGUAGE GeneralizedNewtypeDeriving #-}-{-# LANGUAGE PatternGuards              #-}-{-# LANGUAGE RankNTypes                 #-}---- | This module defines the core data types for Backpack.  For more--- details, see:------  <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>--module Distribution.Backpack (-    -- * OpenUnitId-    OpenUnitId(..),-    openUnitIdFreeHoles,-    mkOpenUnitId,--    -- * DefUnitId-    DefUnitId,-    unDefUnitId,-    mkDefUnitId,--    -- * OpenModule-    OpenModule(..),-    openModuleFreeHoles,--    -- * OpenModuleSubst-    OpenModuleSubst,-    dispOpenModuleSubst,-    dispOpenModuleSubstEntry,-    parsecOpenModuleSubst,-    parsecOpenModuleSubstEntry,-    openModuleSubstFreeHoles,--    -- * Conversions to 'UnitId'-    abstractUnitId,-    hashModuleSubst,-) where--import Distribution.Compat.Prelude hiding (mod)-import Distribution.Parsec-import Distribution.Pretty-import Prelude ()-import Text.PrettyPrint            (hcat)--import qualified Distribution.Compat.CharParsing as P-import qualified Text.PrettyPrint                as Disp--import Distribution.ModuleName-import Distribution.Types.ComponentId-import Distribution.Types.Module-import Distribution.Types.UnitId-import Distribution.Utils.Base62--import qualified Data.Map as Map-import qualified Data.Set as Set---------------------------------------------------------------------------- OpenUnitId---- | An 'OpenUnitId' describes a (possibly partially) instantiated--- Backpack component, with a description of how the holes are filled--- in.  Unlike 'OpenUnitId', the 'ModuleSubst' is kept in a structured--- form that allows for substitution (which fills in holes.) This form--- of unit cannot be installed. It must first be converted to a--- 'UnitId'.------ In the absence of Backpack, there are no holes to fill, so any such--- component always has an empty module substitution; thus we can lossly--- represent it as an 'OpenUnitId uid'.------ For a source component using Backpack, however, there is more--- structure as components may be parametrized over some signatures, and--- these \"holes\" may be partially or wholly filled.------ OpenUnitId plays an important role when we are mix-in linking,--- and is recorded to the installed packaged database for indefinite--- packages; however, for compiled packages that are fully instantiated,--- we instantiate 'OpenUnitId' into 'UnitId'.------ For more details see the Backpack spec--- <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-----data OpenUnitId-    -- | Identifies a component which may have some unfilled holes;-    -- specifying its 'ComponentId' and its 'OpenModuleSubst'.-    -- TODO: Invariant that 'OpenModuleSubst' is non-empty?-    -- See also the Text instance.-    = IndefFullUnitId ComponentId OpenModuleSubst-    -- | Identifies a fully instantiated component, which has-    -- been compiled and abbreviated as a hash.  The embedded 'UnitId'-    -- MUST NOT be for an indefinite component; an 'OpenUnitId'-    -- is guaranteed not to have any holes.-    | DefiniteUnitId DefUnitId-  deriving (Generic, Read, Show, Eq, Ord, Typeable, Data)--- TODO: cache holes?--instance Binary OpenUnitId-instance Structured OpenUnitId -instance NFData OpenUnitId where-    rnf (IndefFullUnitId cid subst) = rnf cid `seq` rnf subst-    rnf (DefiniteUnitId uid) = rnf uid--instance Pretty OpenUnitId where-    pretty (IndefFullUnitId cid insts)-        -- TODO: arguably a smart constructor to enforce invariant would be-        -- better-        | Map.null insts = pretty cid-        | otherwise      = pretty cid <<>> Disp.brackets (dispOpenModuleSubst insts)-    pretty (DefiniteUnitId uid) = pretty uid---- |------ >>> eitherParsec "foobar" :: Either String OpenUnitId---Right (DefiniteUnitId (DefUnitId {unDefUnitId = UnitId "foobar"}))------ >>> eitherParsec "foo[Str=text-1.2.3:Data.Text.Text]" :: Either String OpenUnitId--- Right (IndefFullUnitId (ComponentId "foo") (fromList [(ModuleName "Str",OpenModule (DefiniteUnitId (DefUnitId {unDefUnitId = UnitId "text-1.2.3"})) (ModuleName "Data.Text.Text"))]))----instance Parsec OpenUnitId where-    parsec = P.try parseOpenUnitId <|> fmap DefiniteUnitId parsec-      where-        parseOpenUnitId = do-            cid <- parsec-            insts <- P.between (P.char '[') (P.char ']')-                       parsecOpenModuleSubst-            return (IndefFullUnitId cid insts)---- | Get the set of holes ('ModuleVar') embedded in a 'UnitId'.-openUnitIdFreeHoles :: OpenUnitId -> Set ModuleName-openUnitIdFreeHoles (IndefFullUnitId _ insts) = openModuleSubstFreeHoles insts-openUnitIdFreeHoles _ = Set.empty---- | Safe constructor from a UnitId.  The only way to do this safely--- is if the instantiation is provided.-mkOpenUnitId :: UnitId -> ComponentId -> OpenModuleSubst -> OpenUnitId-mkOpenUnitId uid cid insts =-    if Set.null (openModuleSubstFreeHoles insts)-        then DefiniteUnitId (unsafeMkDefUnitId uid) -- invariant holds!-        else IndefFullUnitId cid insts---------------------------------------------------------------------------- DefUnitId---- | Create a 'DefUnitId' from a 'ComponentId' and an instantiation--- with no holes.-mkDefUnitId :: ComponentId -> Map ModuleName Module -> DefUnitId-mkDefUnitId cid insts =-    unsafeMkDefUnitId (mkUnitId-        (unComponentId cid ++ maybe "" ("+"++) (hashModuleSubst insts)))-        -- impose invariant!---------------------------------------------------------------------------- OpenModule---- | Unlike a 'Module', an 'OpenModule' is either an ordinary--- module from some unit, OR an 'OpenModuleVar', representing a--- hole that needs to be filled in.  Substitutions are over--- module variables.-data OpenModule-    = OpenModule OpenUnitId ModuleName-    | OpenModuleVar ModuleName-  deriving (Generic, Read, Show, Eq, Ord, Typeable, Data)--instance Binary OpenModule-instance Structured OpenModule--instance NFData OpenModule where-    rnf (OpenModule uid mod_name) = rnf uid `seq` rnf mod_name-    rnf (OpenModuleVar mod_name) = rnf mod_name--instance Pretty OpenModule where-    pretty (OpenModule uid mod_name) =-        hcat [pretty uid, Disp.text ":", pretty mod_name]-    pretty (OpenModuleVar mod_name) =-        hcat [Disp.char '<', pretty mod_name, Disp.char '>']---- |------ >>> eitherParsec "Includes2-0.1.0.0-inplace-mysql:Database.MySQL" :: Either String OpenModule--- Right (OpenModule (DefiniteUnitId (DefUnitId {unDefUnitId = UnitId "Includes2-0.1.0.0-inplace-mysql"})) (ModuleName "Database.MySQL"))----instance Parsec OpenModule where-    parsec = parsecModuleVar <|> parsecOpenModule-      where-        parsecOpenModule = do-            uid <- parsec-            _ <- P.char ':'-            mod_name <- parsec-            return (OpenModule uid mod_name)--        parsecModuleVar = do-            _ <- P.char '<'-            mod_name <- parsec-            _ <- P.char '>'-            return (OpenModuleVar mod_name)---- | Get the set of holes ('ModuleVar') embedded in a 'Module'.-openModuleFreeHoles :: OpenModule -> Set ModuleName-openModuleFreeHoles (OpenModuleVar mod_name) = Set.singleton mod_name-openModuleFreeHoles (OpenModule uid _n) = openUnitIdFreeHoles uid---------------------------------------------------------------------------- OpenModuleSubst---- | An explicit substitution on modules.------ NB: These substitutions are NOT idempotent, for example, a--- valid substitution is (A -> B, B -> A).-type OpenModuleSubst = Map ModuleName OpenModule---- | Pretty-print the entries of a module substitution, suitable--- for embedding into a 'OpenUnitId' or passing to GHC via @--instantiate-with@.-dispOpenModuleSubst :: OpenModuleSubst -> Disp.Doc-dispOpenModuleSubst subst-    = Disp.hcat-    . Disp.punctuate Disp.comma-    $ map dispOpenModuleSubstEntry (Map.toAscList subst)---- | Pretty-print a single entry of a module substitution.-dispOpenModuleSubstEntry :: (ModuleName, OpenModule) -> Disp.Doc-dispOpenModuleSubstEntry (k, v) = pretty k <<>> Disp.char '=' <<>> pretty v---- | Inverse to 'dispModSubst'.------ @since 2.2-parsecOpenModuleSubst :: CabalParsing m => m OpenModuleSubst-parsecOpenModuleSubst = fmap Map.fromList-      . flip P.sepBy (P.char ',')-      $ parsecOpenModuleSubstEntry---- | Inverse to 'dispModSubstEntry'.------ @since 2.2-parsecOpenModuleSubstEntry :: CabalParsing m => m (ModuleName, OpenModule)-parsecOpenModuleSubstEntry =-    do k <- parsec-       _ <- P.char '='-       v <- parsec-       return (k, v)---- | Get the set of holes ('ModuleVar') embedded in a 'OpenModuleSubst'.--- This is NOT the domain of the substitution.-openModuleSubstFreeHoles :: OpenModuleSubst -> Set ModuleName-openModuleSubstFreeHoles insts = Set.unions (map openModuleFreeHoles (Map.elems insts))---------------------------------------------------------------------------- Conversions to UnitId---- | When typechecking, we don't demand that a freshly instantiated--- 'IndefFullUnitId' be compiled; instead, we just depend on the--- installed indefinite unit installed at the 'ComponentId'.-abstractUnitId :: OpenUnitId -> UnitId-abstractUnitId (DefiniteUnitId def_uid) = unDefUnitId def_uid-abstractUnitId (IndefFullUnitId cid _) = newSimpleUnitId cid---- | Take a module substitution and hash it into a string suitable for--- 'UnitId'.  Note that since this takes 'Module', not 'OpenModule',--- you are responsible for recursively converting 'OpenModule'--- into 'Module'.  See also "Distribution.Backpack.ReadyComponent".-hashModuleSubst :: Map ModuleName Module -> Maybe String-hashModuleSubst subst-  | Map.null subst = Nothing-  | otherwise =-      Just . hashToBase62 $-        concat [ prettyShow mod_name ++ "=" ++ prettyShow m ++ "\n"-               | (mod_name, m) <- Map.toList subst]

@@ -1,97 +0,0 @@--- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-module Distribution.Backpack.ComponentsGraph (-    ComponentsGraph,-    ComponentsWithDeps,-    mkComponentsGraph,-    componentsGraphToList,-    dispComponentsWithDeps,-    componentCycleMsg-) where--import Prelude ()-import Distribution.Compat.Prelude--import Distribution.Package-import Distribution.PackageDescription-import Distribution.Simple.BuildToolDepends-import Distribution.Simple.LocalBuildInfo-import Distribution.Types.ComponentRequestedSpec-import Distribution.Compat.Graph (Graph, Node(..))-import qualified Distribution.Compat.Graph as Graph-import qualified Distribution.Compat.NonEmptySet as NES-import Distribution.Utils.Generic--import Distribution.Pretty (pretty)-import Text.PrettyPrint----------------------------------------------------------------------------------- Components graph----------------------------------------------------------------------------------- | A graph of source-level components by their source-level--- dependencies----type ComponentsGraph = Graph (Node ComponentName Component)---- | A list of components associated with the source level--- dependencies between them.----type ComponentsWithDeps = [(Component, [ComponentName])]---- | Pretty-print 'ComponentsWithDeps'.----dispComponentsWithDeps :: ComponentsWithDeps -> Doc-dispComponentsWithDeps graph =-    vcat [ hang (text "component" <+> pretty (componentName c)) 4-                (vcat [ text "dependency" <+> pretty cdep | cdep <- cdeps ])-         | (c, cdeps) <- graph ]---- | Create a 'Graph' of 'Component', or report a cycle if there is a--- problem.----mkComponentsGraph :: ComponentRequestedSpec-                  -> PackageDescription-                  -> Either [ComponentName] ComponentsGraph-mkComponentsGraph enabled pkg_descr =-    let g = Graph.fromDistinctList-                           [ N c (componentName c) (componentDeps c)-                           | c <- pkgBuildableComponents pkg_descr-                           , componentEnabled enabled c ]-    in case Graph.cycles g of-          []     -> Right g-          ccycles -> Left  [ componentName c | N c _ _ <- concat ccycles ]-  where-    -- The dependencies for the given component-    componentDeps component =-        toolDependencies ++ libDependencies-      where-        bi = componentBuildInfo component--        toolDependencies = CExeName <$> getAllInternalToolDependencies pkg_descr bi--        libDependencies = do-            Dependency pkgname _ lns <- targetBuildDepends bi-            guard (pkgname == packageName pkg_descr)--            ln <- NES.toList lns-            return (CLibName ln)---- | Given the package description and a 'PackageDescription' (used--- to determine if a package name is internal or not), sort the--- components in dependency order (fewest dependencies first).  This is--- NOT necessarily the build order (although it is in the absence of--- Backpack.)----componentsGraphToList :: ComponentsGraph-                      -> ComponentsWithDeps-componentsGraphToList =-    map (\(N c _ cs) -> (c, cs)) . Graph.revTopSort---- | Error message when there is a cycle; takes the SCC of components.-componentCycleMsg :: PackageIdentifier -> [ComponentName] -> Doc-componentCycleMsg pn cnames =-    text "Components in the package" <+> pretty pn <+> text "depend on each other in a cyclic way:"-    $$-    text (intercalate " depends on "-            [ "'" ++ showComponentName cname ++ "'"-            | cname <- cnames ++ maybeToList (safeHead cnames) ])

@@ -1,359 +0,0 @@-{-# LANGUAGE DeriveDataTypeable #-}-{-# LANGUAGE OverloadedStrings #-}-{-# LANGUAGE RecordWildCards #-}-{-# LANGUAGE ScopedTypeVariables #-}-{-# LANGUAGE PatternGuards #-}-{-# LANGUAGE TypeFamilies #-}-{-# LANGUAGE NoMonoLocalBinds #-}-{-# LANGUAGE NondecreasingIndentation #-}---- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>------ WARNING: The contents of this module are HIGHLY experimental.--- We may refactor it under you.-module Distribution.Backpack.Configure (-    configureComponentLocalBuildInfos,-) where--import Prelude ()-import Distribution.Compat.Prelude hiding ((<>))--import Distribution.Backpack-import Distribution.Backpack.FullUnitId-import Distribution.Backpack.PreExistingComponent-import Distribution.Backpack.ConfiguredComponent-import Distribution.Backpack.LinkedComponent-import Distribution.Backpack.ReadyComponent-import Distribution.Backpack.ComponentsGraph-import Distribution.Backpack.Id--import Distribution.Simple.Compiler-import Distribution.Package-import qualified Distribution.InstalledPackageInfo as Installed-import Distribution.InstalledPackageInfo (InstalledPackageInfo-                                         ,emptyInstalledPackageInfo)-import qualified Distribution.Simple.PackageIndex as PackageIndex-import Distribution.Simple.PackageIndex (InstalledPackageIndex)-import Distribution.PackageDescription-import Distribution.ModuleName-import Distribution.Simple.Setup as Setup-import Distribution.Simple.LocalBuildInfo-import Distribution.Types.AnnotatedId-import Distribution.Types.ComponentRequestedSpec-import Distribution.Types.ComponentInclude-import Distribution.Types.MungedPackageName-import Distribution.Verbosity-import qualified Distribution.Compat.Graph as Graph-import Distribution.Compat.Graph (Graph, IsNode(..))-import Distribution.Utils.LogProgress--import Data.Either-    ( lefts )-import qualified Data.Set as Set-import qualified Data.Map as Map-import Distribution.Pretty-import Text.PrettyPrint----------------------------------------------------------------------------------- Pipeline---------------------------------------------------------------------------------configureComponentLocalBuildInfos-    :: Verbosity-    -> Bool                   -- use_external_internal_deps-    -> ComponentRequestedSpec-    -> Bool                   -- deterministic-    -> Flag String            -- configIPID-    -> Flag ComponentId       -- configCID-    -> PackageDescription-    -> [PreExistingComponent]-    -> FlagAssignment         -- configConfigurationsFlags-    -> [(ModuleName, Module)] -- configInstantiateWith-    -> InstalledPackageIndex-    -> Compiler-    -> LogProgress ([ComponentLocalBuildInfo], InstalledPackageIndex)-configureComponentLocalBuildInfos-    verbosity use_external_internal_deps enabled deterministic ipid_flag cid_flag pkg_descr-    prePkgDeps flagAssignment instantiate_with installedPackageSet comp = do-    -- NB: In single component mode, this returns a *single* component.-    -- In this graph, the graph is NOT closed.-    graph0 <- case mkComponentsGraph enabled pkg_descr of-                Left ccycle -> dieProgress (componentCycleMsg (package pkg_descr) ccycle)-                Right g -> return (componentsGraphToList g)-    infoProgress $ hang (text "Source component graph:") 4-                        (dispComponentsWithDeps graph0)--    let conf_pkg_map = Map.fromListWith Map.union-            [(pc_pkgname pkg,-                Map.singleton (pc_compname pkg)-                              (AnnotatedId {-                                ann_id = pc_cid pkg,-                                ann_pid = packageId pkg,-                                ann_cname = pc_compname pkg-                              }))-            | pkg <- prePkgDeps]-    graph1 <- toConfiguredComponents use_external_internal_deps-                    flagAssignment-                    deterministic ipid_flag cid_flag pkg_descr-                    conf_pkg_map (map fst graph0)-    infoProgress $ hang (text "Configured component graph:") 4-                        (vcat (map dispConfiguredComponent graph1))--    let shape_pkg_map = Map.fromList-            [ (pc_cid pkg, (pc_open_uid pkg, pc_shape pkg))-            | pkg <- prePkgDeps]-        uid_lookup def_uid-            | Just pkg <- PackageIndex.lookupUnitId installedPackageSet uid-            = FullUnitId (Installed.installedComponentId pkg)-                 (Map.fromList (Installed.instantiatedWith pkg))-            | otherwise = error ("uid_lookup: " ++ prettyShow uid)-          where uid = unDefUnitId def_uid-    graph2 <- toLinkedComponents verbosity uid_lookup-                    (package pkg_descr) shape_pkg_map graph1--    infoProgress $-        hang (text "Linked component graph:") 4-             (vcat (map dispLinkedComponent graph2))--    let pid_map = Map.fromList $-            [ (pc_uid pkg, pc_munged_id pkg)-            | pkg <- prePkgDeps] ++-            [ (Installed.installedUnitId pkg, mungedId pkg)-            | (_, Module uid _) <- instantiate_with-            , Just pkg <- [PackageIndex.lookupUnitId-                                installedPackageSet (unDefUnitId uid)] ]-        subst = Map.fromList instantiate_with-        graph3 = toReadyComponents pid_map subst graph2-        graph4 = Graph.revTopSort (Graph.fromDistinctList graph3)--    infoProgress $ hang (text "Ready component graph:") 4-                        (vcat (map dispReadyComponent graph4))--    toComponentLocalBuildInfos comp installedPackageSet pkg_descr prePkgDeps graph4----------------------------------------------------------------------------------- ComponentLocalBuildInfo---------------------------------------------------------------------------------toComponentLocalBuildInfos-    :: Compiler-    -> InstalledPackageIndex -- FULL set-    -> PackageDescription-    -> [PreExistingComponent] -- external package deps-    -> [ReadyComponent]-    -> LogProgress ([ComponentLocalBuildInfo],-                    InstalledPackageIndex) -- only relevant packages-toComponentLocalBuildInfos-    comp installedPackageSet pkg_descr externalPkgDeps graph = do-    -- Check and make sure that every instantiated component exists.-    -- We have to do this now, because prior to linking/instantiating-    -- we don't actually know what the full set of 'UnitId's we need-    -- are.-    let -- TODO: This is actually a bit questionable performance-wise,-        -- since we will pay for the ALL installed packages even if-        -- they are not related to what we are building.  This was true-        -- in the old configure code.-        external_graph :: Graph (Either InstalledPackageInfo ReadyComponent)-        external_graph = Graph.fromDistinctList-                       . map Left-                       $ PackageIndex.allPackages installedPackageSet-        internal_graph :: Graph (Either InstalledPackageInfo ReadyComponent)-        internal_graph = Graph.fromDistinctList-                       . map Right-                       $ graph-        combined_graph = Graph.unionRight external_graph internal_graph-        local_graph = fromMaybe (error "toComponentLocalBuildInfos: closure returned Nothing")-                    $ Graph.closure combined_graph (map nodeKey graph)-        -- The database of transitively reachable installed packages that the-        -- external components the package (as a whole) depends on.  This will be-        -- used in several ways:-        ---        --      * We'll use it to do a consistency check so we're not depending-        --        on multiple versions of the same package (TODO: someday relax-        --        this for private dependencies.)  See right below.-        ---        --      * We'll pass it on in the LocalBuildInfo, where preprocessors-        --        and other things will incorrectly use it to determine what-        --        the include paths and everything should be.-        ---        packageDependsIndex = PackageIndex.fromList (lefts local_graph)-        fullIndex = Graph.fromDistinctList local_graph-    case Graph.broken fullIndex of-        [] -> return ()-        broken ->-          -- TODO: ppr this-          dieProgress . text $-                "The following packages are broken because other"-             ++ " packages they depend on are missing. These broken "-             ++ "packages must be rebuilt before they can be used.\n"-             -- TODO: Undupe.-             ++ unlines [ "installed package "-                       ++ prettyShow (packageId pkg)-                       ++ " is broken due to missing package "-                       ++ intercalate ", " (map prettyShow deps)-                        | (Left pkg, deps) <- broken ]-             ++ unlines [ "planned package "-                       ++ prettyShow (packageId pkg)-                       ++ " is broken due to missing package "-                       ++ intercalate ", " (map prettyShow deps)-                        | (Right pkg, deps) <- broken ]--    -- In this section, we'd like to look at the 'packageDependsIndex'-    -- and see if we've picked multiple versions of the same-    -- installed package (this is bad, because it means you might-    -- get an error could not match foo-0.1:Type with foo-0.2:Type).-    ---    -- What is pseudoTopPkg for? I have no idea.  It was used-    -- in the very original commit which introduced checking for-    -- inconsistencies 5115bb2be4e13841ea07dc9166b9d9afa5f0d012,-    -- and then moved out of PackageIndex and put here later.-    -- TODO: Try this code without it...-    ---    -- TODO: Move this into a helper function-    ---    -- TODO: This is probably wrong for Backpack-    let pseudoTopPkg :: InstalledPackageInfo-        pseudoTopPkg = emptyInstalledPackageInfo {-            Installed.installedUnitId = mkLegacyUnitId (packageId pkg_descr),-            Installed.sourcePackageId = packageId pkg_descr,-            Installed.depends = map pc_uid externalPkgDeps-          }-    case PackageIndex.dependencyInconsistencies-       . PackageIndex.insert pseudoTopPkg-       $ packageDependsIndex of-      [] -> return ()-      inconsistencies ->-        warnProgress $-          hang (text "This package indirectly depends on multiple versions of the same" <+>-                text "package. This is very likely to cause a compile failure.") 2-               (vcat [ text "package" <+> pretty (packageName user) <+>-                       parens (pretty (installedUnitId user)) <+> text "requires" <+>-                       pretty inst-                     | (_dep_key, insts) <- inconsistencies-                     , (inst, users) <- insts-                     , user <- users ])-    let clbis = mkLinkedComponentsLocalBuildInfo comp graph-    -- forM clbis $ \(clbi,deps) -> info verbosity $ "UNIT" ++ hashUnitId (componentUnitId clbi) ++ "\n" ++ intercalate "\n" (map hashUnitId deps)-    return (clbis, packageDependsIndex)---- Build ComponentLocalBuildInfo for each component we are going--- to build.------ This conversion is lossy; we lose some invariants from ReadyComponent-mkLinkedComponentsLocalBuildInfo-    :: Compiler-    -> [ReadyComponent]-    -> [ComponentLocalBuildInfo]-mkLinkedComponentsLocalBuildInfo comp rcs = map go rcs-  where-    internalUnits = Set.fromList (map rc_uid rcs)-    isInternal x = Set.member x internalUnits-    go rc =-      case rc_component rc of-      CLib lib ->-        let convModuleExport (modname', (Module uid modname))-              | this_uid == unDefUnitId uid-              , modname' == modname-              = Installed.ExposedModule modname' Nothing-              | otherwise-              = Installed.ExposedModule modname'-                  (Just (OpenModule (DefiniteUnitId uid) modname))-            convOpenModuleExport (modname', modu@(OpenModule uid modname))-              | uid == this_open_uid-              , modname' == modname-              = Installed.ExposedModule modname' Nothing-              | otherwise-              = Installed.ExposedModule modname' (Just modu)-            convOpenModuleExport (_, OpenModuleVar _)-                = error "convOpenModuleExport: top-level modvar"-            exports =-                -- Loses invariants-                case rc_i rc of-                    Left indefc -> map convOpenModuleExport-                                 $ Map.toList (indefc_provides indefc)-                    Right instc -> map convModuleExport-                                 $ Map.toList (instc_provides instc)-            insts =-                case rc_i rc of-                    Left indefc -> [ (m, OpenModuleVar m) | m <- indefc_requires indefc ]-                    Right instc -> [ (m, OpenModule (DefiniteUnitId uid') m')-                                   | (m, Module uid' m') <- instc_insts instc ]--            compat_name = MungedPackageName (packageName rc) (libName lib)-            compat_key = computeCompatPackageKey comp compat_name (packageVersion rc) this_uid--        in LibComponentLocalBuildInfo {-          componentPackageDeps = cpds,-          componentUnitId = this_uid,-          componentComponentId = this_cid,-          componentInstantiatedWith = insts,-          componentIsIndefinite_ = is_indefinite,-          componentLocalName = cname,-          componentInternalDeps = internal_deps,-          componentExeDeps = exe_deps,-          componentIncludes = includes,-          componentExposedModules = exports,-          componentIsPublic = rc_public rc,-          componentCompatPackageKey = compat_key,-          componentCompatPackageName = compat_name-        }-      CFLib _ ->-        FLibComponentLocalBuildInfo {-          componentUnitId = this_uid,-          componentComponentId = this_cid,-          componentLocalName = cname,-          componentPackageDeps = cpds,-          componentExeDeps = exe_deps,-          componentInternalDeps = internal_deps,-          componentIncludes = includes-        }-      CExe _ ->-        ExeComponentLocalBuildInfo {-          componentUnitId = this_uid,-          componentComponentId = this_cid,-          componentLocalName = cname,-          componentPackageDeps = cpds,-          componentExeDeps = exe_deps,-          componentInternalDeps = internal_deps,-          componentIncludes = includes-        }-      CTest _ ->-        TestComponentLocalBuildInfo {-          componentUnitId = this_uid,-          componentComponentId = this_cid,-          componentLocalName = cname,-          componentPackageDeps = cpds,-          componentExeDeps = exe_deps,-          componentInternalDeps = internal_deps,-          componentIncludes = includes-        }-      CBench _ ->-        BenchComponentLocalBuildInfo {-          componentUnitId = this_uid,-          componentComponentId = this_cid,-          componentLocalName = cname,-          componentPackageDeps = cpds,-          componentExeDeps = exe_deps,-          componentInternalDeps = internal_deps,-          componentIncludes = includes-        }-     where-      this_uid      = rc_uid rc-      this_open_uid = rc_open_uid rc-      this_cid      = rc_cid rc-      cname = componentName (rc_component rc)-      cpds = rc_depends rc-      exe_deps = map ann_id $ rc_exe_deps rc-      is_indefinite =-        case rc_i rc of-            Left _ -> True-            Right _ -> False-      includes =-        map (\ci -> (ci_id ci, ci_renaming ci)) $-            case rc_i rc of-                Left indefc ->-                    indefc_includes indefc-                Right instc ->-                    map (\ci -> ci { ci_ann_id = fmap DefiniteUnitId (ci_ann_id ci) })-                        (instc_includes instc)-      internal_deps = filter isInternal (nodeNeighbors rc)

@@ -1,308 +0,0 @@-{-# LANGUAGE PatternGuards #-}--- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-module Distribution.Backpack.ConfiguredComponent (-    ConfiguredComponent(..),-    cc_name,-    cc_cid,-    cc_pkgid,-    toConfiguredComponent,-    toConfiguredComponents,-    dispConfiguredComponent,--    ConfiguredComponentMap,-    extendConfiguredComponentMap,--    -- TODO: Should go somewhere else-    newPackageDepsBehaviour-) where--import Prelude ()-import Distribution.Compat.Prelude hiding ((<>))--import Distribution.Backpack.Id--import Distribution.CabalSpecVersion-import Distribution.Types.AnnotatedId-import Distribution.Types.Dependency-import Distribution.Types.ExeDependency-import Distribution.Types.IncludeRenaming-import Distribution.Types.ComponentId-import Distribution.Types.PackageId-import Distribution.Types.PackageName-import Distribution.Types.Mixin-import Distribution.Types.ComponentName-import Distribution.Types.LibraryName-import Distribution.Types.ComponentInclude-import Distribution.Package-import Distribution.PackageDescription-import Distribution.Simple.BuildToolDepends-import Distribution.Simple.Setup as Setup-import Distribution.Simple.LocalBuildInfo-import Distribution.Utils.LogProgress-import Distribution.Utils.MapAccum-import Distribution.Utils.Generic--import Control.Monad-import qualified Data.Set as Set-import qualified Distribution.Compat.NonEmptySet as NonEmptySet-import qualified Data.Map as Map-import Distribution.Pretty-import Text.PrettyPrint (Doc, hang, text, vcat, hsep, quotes, ($$))-import qualified Text.PrettyPrint as PP---- | A configured component, we know exactly what its 'ComponentId' is,--- and the 'ComponentId's of the things it depends on.-data ConfiguredComponent-    = ConfiguredComponent {-        -- | Unique identifier of component, plus extra useful info.-        cc_ann_id :: AnnotatedId ComponentId,-        -- | The fragment of syntax from the Cabal file describing this-        -- component.-        cc_component :: Component,-        -- | Is this the public library component of the package?-        -- (If we invoke Setup with an instantiation, this is the-        -- component the instantiation applies to.)-        -- Note that in one-component configure mode, this is-        -- always True, because any component is the "public" one.)-        cc_public :: Bool,-        -- | Dependencies on executables from @build-tools@ and-        -- @build-tool-depends@.-        cc_exe_deps :: [AnnotatedId ComponentId],-        -- | The mixins of this package, including both explicit (from-        -- the @mixins@ field) and implicit (from @build-depends@).  Not-        -- mix-in linked yet; component configuration only looks at-        -- 'ComponentId's.-        cc_includes :: [ComponentInclude ComponentId IncludeRenaming]-      }----- | Uniquely identifies a configured component.-cc_cid :: ConfiguredComponent -> ComponentId-cc_cid = ann_id . cc_ann_id---- | The package this component came from.-cc_pkgid :: ConfiguredComponent -> PackageId-cc_pkgid = ann_pid . cc_ann_id---- | The 'ComponentName' of a component; this uniquely identifies--- a fragment of syntax within a specified Cabal file describing the--- component.-cc_name :: ConfiguredComponent -> ComponentName-cc_name = ann_cname . cc_ann_id---- | Pretty-print a 'ConfiguredComponent'.-dispConfiguredComponent :: ConfiguredComponent -> Doc-dispConfiguredComponent cc =-    hang (text "component" <+> pretty (cc_cid cc)) 4-         (vcat [ hsep $ [ text "include"-                        , pretty (ci_id incl), pretty (ci_renaming incl) ]-               | incl <- cc_includes cc-               ])---- | Construct a 'ConfiguredComponent', given that the 'ComponentId'--- and library/executable dependencies are known.  The primary--- work this does is handling implicit @backpack-include@ fields.-mkConfiguredComponent-    :: PackageDescription-    -> ComponentId-    -> [AnnotatedId ComponentId] -- lib deps-    -> [AnnotatedId ComponentId] -- exe deps-    -> Component-    -> LogProgress ConfiguredComponent-mkConfiguredComponent pkg_descr this_cid lib_deps exe_deps component = do-    -- Resolve each @mixins@ into the actual dependency-    -- from @lib_deps@.-    explicit_includes <- forM (mixins bi) $ \(Mixin pn ln rns) -> do-        aid <- case Map.lookup (pn, CLibName ln) deps_map of-                Nothing ->-                    dieProgress $-                    text "Mix-in refers to non-existent library" <+>-                    quotes (pretty pn <<>> prettyLN ln) $$-                    text "(did you forget to add the package to build-depends?)"-                Just r  -> return r-        return ComponentInclude {-                ci_ann_id   = aid,-                ci_renaming = rns,-                ci_implicit = False-            }--        -- Any @build-depends@ which is not explicitly mentioned in-        -- @backpack-include@ is converted into an "implicit" include.-    let used_explicitly = Set.fromList (map ci_id explicit_includes)-        implicit_includes-            = map (\aid -> ComponentInclude {-                                ci_ann_id = aid,-                                ci_renaming = defaultIncludeRenaming,-                                ci_implicit = True-                            })-            $ filter (flip Set.notMember used_explicitly . ann_id) lib_deps--    return ConfiguredComponent {-            cc_ann_id = AnnotatedId {-                    ann_id = this_cid,-                    ann_pid = package pkg_descr,-                    ann_cname = componentName component-                },-            cc_component = component,-            cc_public = is_public,-            cc_exe_deps = exe_deps,-            cc_includes = explicit_includes ++ implicit_includes-        }-  where-    bi :: BuildInfo-    bi = componentBuildInfo component--    prettyLN :: LibraryName -> Doc-    prettyLN LMainLibName    = PP.empty-    prettyLN (LSubLibName n) = PP.colon <<>> pretty n--    deps_map :: Map (PackageName, ComponentName) (AnnotatedId ComponentId)-    deps_map = Map.fromList [ ((packageName dep, ann_cname dep), dep)-                            | dep <- lib_deps ]--    is_public = componentName component == CLibName LMainLibName--type ConfiguredComponentMap =-        Map PackageName (Map ComponentName (AnnotatedId ComponentId))--toConfiguredComponent-    :: PackageDescription-    -> ComponentId-    -> ConfiguredComponentMap-    -> ConfiguredComponentMap-    -> Component-    -> LogProgress ConfiguredComponent-toConfiguredComponent pkg_descr this_cid lib_dep_map exe_dep_map component = do-    lib_deps <--        if newPackageDepsBehaviour pkg_descr-            then fmap concat $ forM (targetBuildDepends bi) $-                 \(Dependency name _ sublibs) -> do-                    pkg <- case Map.lookup name lib_dep_map of-                        Nothing ->-                            dieProgress $-                                text "Dependency on unbuildable" <+>-                                text "package" <+> pretty name-                        Just p -> return p-                    -- Return all library components-                    forM (NonEmptySet.toList sublibs) $ \lib ->-                        let comp = CLibName lib in-                        case Map.lookup comp pkg of-                            Nothing ->-                                dieProgress $-                                    text "Dependency on unbuildable" <+>-                                    text (showLibraryName lib) <+>-                                    text "from" <+> pretty name-                            Just v -> return v-            else return old_style_lib_deps-    mkConfiguredComponent-       pkg_descr this_cid-       lib_deps exe_deps component-  where-    bi = componentBuildInfo component-    -- lib_dep_map contains a mix of internal and external deps.-    -- We want all the public libraries (dep_cn == CLibName)-    -- of all external deps (dep /= pn).  Note that this-    -- excludes the public library of the current package:-    -- this is not supported by old-style deps behavior-    -- because it would imply a cyclic dependency for the-    -- library itself.-    old_style_lib_deps = [ e-                         | (pn, comp_map) <- Map.toList lib_dep_map-                         , pn /= packageName pkg_descr-                         , (cn, e) <- Map.toList comp_map-                         , cn == CLibName LMainLibName ]-    -- We have to nub here, because 'getAllToolDependencies' may return-    -- duplicates (see #4986).  (NB: This is not needed for lib_deps,-    -- since those elaborate into includes, for which there explicitly-    -- may be multiple instances of a package)-    exe_deps = ordNub $-        [ exe-        | ExeDependency pn cn _ <- getAllToolDependencies pkg_descr bi-        -- The error suppression here is important, because in general-        -- we won't know about external dependencies (e.g., 'happy')-        -- which the package is attempting to use (those deps are only-        -- fed in when cabal-install uses this codepath.)-        -- TODO: Let cabal-install request errors here-        , Just exe <- [Map.lookup (CExeName cn) =<< Map.lookup pn exe_dep_map]-        ]---- | Also computes the 'ComponentId', and sets cc_public if necessary.--- This is Cabal-only; cabal-install won't use this.-toConfiguredComponent'-    :: Bool -- use_external_internal_deps-    -> FlagAssignment-    -> PackageDescription-    -> Bool -- deterministic-    -> Flag String      -- configIPID (todo: remove me)-    -> Flag ComponentId -- configCID-    -> ConfiguredComponentMap-    -> Component-    -> LogProgress ConfiguredComponent-toConfiguredComponent' use_external_internal_deps flags-                pkg_descr deterministic ipid_flag cid_flag-                dep_map component = do-    cc <- toConfiguredComponent-                pkg_descr this_cid-                dep_map dep_map component-    return $ if use_external_internal_deps-                then cc { cc_public = True }-                else cc-  where-    -- TODO: pass component names to it too!-    this_cid = computeComponentId deterministic ipid_flag cid_flag-                (package pkg_descr) (componentName component) (Just (deps, flags))-    deps = [ ann_id aid | m <- Map.elems dep_map-                        , aid <- Map.elems m ]--extendConfiguredComponentMap-    :: ConfiguredComponent-    -> ConfiguredComponentMap-    -> ConfiguredComponentMap-extendConfiguredComponentMap cc =-    Map.insertWith Map.union-        (pkgName (cc_pkgid cc))-        (Map.singleton (cc_name cc) (cc_ann_id cc))---- Compute the 'ComponentId's for a graph of 'Component's.  The--- list of internal components must be topologically sorted--- based on internal package dependencies, so that any internal--- dependency points to an entry earlier in the list.------ TODO: This function currently restricts the input configured components to--- one version per package, by using the type ConfiguredComponentMap.  It cannot--- be used to configure a component that depends on one version of a package for--- a library and another version for a build-tool.-toConfiguredComponents-    :: Bool -- use_external_internal_deps-    -> FlagAssignment-    -> Bool -- deterministic-    -> Flag String -- configIPID-    -> Flag ComponentId -- configCID-    -> PackageDescription-    -> ConfiguredComponentMap-    -> [Component]-    -> LogProgress [ConfiguredComponent]-toConfiguredComponents-    use_external_internal_deps flags deterministic ipid_flag cid_flag pkg_descr-    dep_map comps-    = fmap snd (mapAccumM go dep_map comps)-  where-    go m component = do-        cc <- toConfiguredComponent'-                        use_external_internal_deps flags pkg_descr-                        deterministic ipid_flag cid_flag-                        m component-        return (extendConfiguredComponentMap cc m, cc)--newPackageDepsBehaviourMinVersion :: CabalSpecVersion-newPackageDepsBehaviourMinVersion = CabalSpecV1_8----- In older cabal versions, there was only one set of package dependencies for--- the whole package. In this version, we can have separate dependencies per--- target, but we only enable this behaviour if the minimum cabal version--- specified is >= a certain minimum. Otherwise, for compatibility we use the--- old behaviour.-newPackageDepsBehaviour :: PackageDescription -> Bool-newPackageDepsBehaviour pkg =-   specVersion pkg >= newPackageDepsBehaviourMinVersion

@@ -1,61 +0,0 @@-{-# LANGUAGE FlexibleContexts #-}-{-# LANGUAGE Rank2Types       #-}-module Distribution.Backpack.DescribeUnitId where--import Distribution.Compat.Prelude-import Prelude ()--import Distribution.Compat.Stack-import Distribution.ModuleName-import Distribution.Pretty-import Distribution.Simple.Utils-import Distribution.Types.ComponentName-import Distribution.Types.PackageId-import Distribution.Verbosity--import Text.PrettyPrint---- Unit identifiers have a well defined, machine-readable format,--- but this format isn't very user-friendly for users.  This--- module defines some functions for solving common rendering--- problems one has for displaying these.------ There are three basic problems we tackle:------  - Users don't want to see pkg-0.5-inplace-libname,---    they want to see "library 'libname' from 'pkg-0.5'"------  - Users don't want to see the raw component identifier, which---    usually contains a wordy hash that doesn't matter.------  - Users don't want to see a hash of the instantiation: they---    want to see the actual instantiation, and they want it in---    interpretable form.------- | Print a Setup message stating (1) what operation we are doing,--- for (2) which component (with enough details to uniquely identify--- the build in question.)----setupMessage' :: Pretty a => Verbosity-             -> String            -- ^ Operation being done (capitalized), on:-             -> PackageIdentifier -- ^ Package-             -> ComponentName     -- ^ Component name-             -> Maybe [(ModuleName, a)] -- ^ Instantiation, if available.-                                        -- Polymorphic to take-                                        -- 'OpenModule' or 'Module'-             -> IO ()-setupMessage' verbosity msg pkgid cname mb_insts = withFrozenCallStack $ do-    noticeDoc verbosity $-      case mb_insts of-        Just insts | not (null insts) ->-          hang (msg_doc <+> text "instantiated with") 2-               (vcat [ pretty k <+> text "=" <+> pretty v-                     | (k,v) <- insts ]) $$-          for_doc-        _ ->-          msg_doc <+> for_doc--  where-    msg_doc = text msg <+> text (showComponentName cname)-    for_doc = text "for" <+> pretty pkgid <<>> text ".."

@@ -1,26 +0,0 @@-{-# LANGUAGE DeriveGeneric #-}-module Distribution.Backpack.FullUnitId (-    FullUnitId(..),-    FullDb,-    expandOpenUnitId,-    expandUnitId-) where--import Distribution.Backpack-import Distribution.Types.ComponentId-import Distribution.Compat.Prelude---- Unlike OpenUnitId, which could direct to a UnitId.-data FullUnitId = FullUnitId ComponentId OpenModuleSubst-    deriving (Show, Generic)--type FullDb = DefUnitId -> FullUnitId--expandOpenUnitId :: FullDb -> OpenUnitId -> FullUnitId-expandOpenUnitId _db (IndefFullUnitId cid subst)-    = FullUnitId cid subst-expandOpenUnitId db (DefiniteUnitId uid)-    = expandUnitId db uid--expandUnitId :: FullDb -> DefUnitId -> FullUnitId-expandUnitId db uid = db uid

@@ -1,145 +0,0 @@-{-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE RankNTypes #-}-{-# LANGUAGE PatternGuards #-}--- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-module Distribution.Backpack.Id(-    computeComponentId,-    computeCompatPackageKey,-) where--import Prelude ()-import Distribution.Compat.Prelude--import Distribution.Types.UnqualComponentName-import Distribution.Simple.Compiler-import Distribution.PackageDescription-import Distribution.Simple.Setup as Setup-import qualified Distribution.Simple.InstallDirs as InstallDirs-import Distribution.Simple.LocalBuildInfo-import Distribution.Types.ComponentId-import Distribution.Types.UnitId-import Distribution.Types.MungedPackageName-import Distribution.Utils.Base62-import Distribution.Version--import Distribution.Pretty-    ( prettyShow )-import Distribution.Parsec ( simpleParsec )---- | This method computes a default, "good enough" 'ComponentId'--- for a package.  The intent is that cabal-install (or the user) will--- specify a more detailed IPID via the @--ipid@ flag if necessary.-computeComponentId-    :: Bool -- deterministic mode-    -> Flag String-    -> Flag ComponentId-    -> PackageIdentifier-    -> ComponentName-    -- This is used by cabal-install's legacy codepath-    -> Maybe ([ComponentId], FlagAssignment)-    -> ComponentId-computeComponentId deterministic mb_ipid mb_cid pid cname mb_details =-    -- show is found to be faster than intercalate and then replacement of-    -- special character used in intercalating. We cannot simply hash by-    -- doubly concating list, as it just flatten out the nested list, so-    -- different sources can produce same hash-    let hash_suffix-            | Just (dep_ipids, flags) <- mb_details-            = "-" ++ hashToBase62-                -- For safety, include the package + version here-                -- for GHC 7.10, where just the hash is used as-                -- the package key-                    (    prettyShow pid-                      ++ show dep_ipids-                      ++ show flags     )-            | otherwise = ""-        generated_base = prettyShow pid ++ hash_suffix-        explicit_base cid0 = fromPathTemplate (InstallDirs.substPathTemplate env-                                                    (toPathTemplate cid0))-            -- Hack to reuse install dirs machinery-            -- NB: no real IPID available at this point-          where env = packageTemplateEnv pid (mkUnitId "")-        actual_base = case mb_ipid of-                        Flag ipid0 -> explicit_base ipid0-                        NoFlag | deterministic -> prettyShow pid-                               | otherwise     -> generated_base-    in case mb_cid of-          Flag cid -> cid-          NoFlag -> mkComponentId $ actual_base-                        ++ (case componentNameString cname of-                                Nothing -> ""-                                Just s -> "-" ++ unUnqualComponentName s)---- | In GHC 8.0, the string we pass to GHC to use for symbol--- names for a package can be an arbitrary, IPID-compatible string.--- However, prior to GHC 8.0 there are some restrictions on what--- format this string can be (due to how ghc-pkg parsed the key):------      1. In GHC 7.10, the string had either be of the form---      foo_ABCD, where foo is a non-semantic alphanumeric/hyphenated---      prefix and ABCD is two base-64 encoded 64-bit integers,---      or a GHC 7.8 style identifier.------      2. In GHC 7.8, the string had to be a valid package identifier---      like foo-0.1.------ So, the problem is that Cabal, in general, has a general IPID,--- but needs to figure out a package key / package ID that the--- old ghc-pkg will actually accept.  But there's an EVERY WORSE--- problem: if ghc-pkg decides to parse an identifier foo-0.1-xxx--- as if it were a package identifier, which means it will SILENTLY--- DROP the "xxx" (because it's a tag, and Cabal does not allow tags.)--- So we must CONNIVE to ensure that we don't pick something that--- looks like this.------ So this function attempts to define a mapping into the old formats.------ The mapping for GHC 7.8 and before:------      * We use the *compatibility* package name and version.  For---        public libraries this is just the package identifier; for---        internal libraries, it's something like "z-pkgname-z-libname-0.1".---        See 'computeCompatPackageName' for more details.------ The mapping for GHC 7.10:------      * For CLibName:---          If the IPID is of the form foo-0.1-ABCDEF where foo_ABCDEF would---          validly parse as a package key, we pass "ABCDEF".  (NB: not---          all hashes parse this way, because GHC 7.10 mandated that---          these hashes be two base-62 encoded 64 bit integers),---          but hashes that Cabal generated using 'computeComponentId'---          are guaranteed to have this form.------          If it is not of this form, we rehash the IPID into the---          correct form and pass that.------      * For sub-components, we rehash the IPID into the correct format---        and pass that.----computeCompatPackageKey-    :: Compiler-    -> MungedPackageName-    -> Version-    -> UnitId-    -> String-computeCompatPackageKey comp pkg_name pkg_version uid-    | not (packageKeySupported comp || unitIdSupported comp)-    = prettyShow pkg_name ++ "-" ++ prettyShow pkg_version-    | not (unifiedIPIDRequired comp) =-        let str = unUnitId uid -- assume no Backpack support-            mb_verbatim_key-                = case simpleParsec str :: Maybe PackageId of-                    -- Something like 'foo-0.1', use it verbatim.-                    -- (NB: hash tags look like tags, so they are parsed,-                    -- so the extra equality check tests if a tag was dropped.)-                    Just pid0 | prettyShow pid0 == str -> Just str-                    _ -> Nothing-            mb_truncated_key-                = let cand = reverse (takeWhile isAlphaNum (reverse str))-                  in if length cand == 22 && all isAlphaNum cand-                        then Just cand-                        else Nothing-            rehashed_key = hashToBase62 str-        in fromMaybe rehashed_key (mb_verbatim_key `mplus` mb_truncated_key)-    | otherwise = prettyShow uid

@@ -1,396 +0,0 @@-{-# LANGUAGE ScopedTypeVariables #-}-{-# LANGUAGE TypeFamilies #-}--- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-module Distribution.Backpack.LinkedComponent (-    LinkedComponent(..),-    lc_insts,-    lc_uid,-    lc_cid,-    lc_pkgid,-    toLinkedComponent,-    toLinkedComponents,-    dispLinkedComponent,-    LinkedComponentMap,-    extendLinkedComponentMap,-) where--import Prelude ()-import Distribution.Compat.Prelude hiding ((<>))--import Distribution.Backpack-import Distribution.Backpack.FullUnitId-import Distribution.Backpack.ConfiguredComponent-import Distribution.Backpack.ModuleShape-import Distribution.Backpack.PreModuleShape-import Distribution.Backpack.ModuleScope-import Distribution.Backpack.UnifyM-import Distribution.Backpack.MixLink-import Distribution.Utils.MapAccum--import Distribution.Types.AnnotatedId-import Distribution.Types.ComponentName-import Distribution.Types.ModuleReexport-import Distribution.Types.ModuleRenaming-import Distribution.Types.IncludeRenaming-import Distribution.Types.ComponentInclude-import Distribution.Types.ComponentId-import Distribution.Types.PackageId-import Distribution.Package-import Distribution.PackageDescription-import Distribution.ModuleName-import Distribution.Simple.LocalBuildInfo-import Distribution.Verbosity-import Distribution.Utils.LogProgress--import qualified Data.Set as Set-import qualified Data.Map as Map-import Distribution.Pretty (pretty)-import Text.PrettyPrint (Doc, hang, text, vcat, ($+$), hsep, quotes)---- | A linked component is a component that has been mix-in linked, at--- which point we have determined how all the dependencies of the--- component are explicitly instantiated (in the form of an OpenUnitId).--- 'ConfiguredComponent' is mix-in linked into 'LinkedComponent', which--- is then instantiated into 'ReadyComponent'.-data LinkedComponent-    = LinkedComponent {-        -- | Uniquely identifies linked component-        lc_ann_id :: AnnotatedId ComponentId,-        -- | Corresponds to 'cc_component'.-        lc_component :: Component,-        -- | @build-tools@ and @build-tool-depends@ dependencies.-        -- Corresponds to 'cc_exe_deps'.-        lc_exe_deps :: [AnnotatedId OpenUnitId],-        -- | Is this the public library of a package?  Corresponds to-        -- 'cc_public'.-        lc_public :: Bool,-        -- | Corresponds to 'cc_includes', but (1) this does not contain-        -- includes of signature packages (packages with no exports),-        -- and (2) the 'ModuleRenaming' for requirements (stored in-        -- 'IncludeRenaming') has been removed, as it is reflected in-        -- 'OpenUnitId'.)-        lc_includes :: [ComponentInclude OpenUnitId ModuleRenaming],-        -- | Like 'lc_includes', but this specifies includes on-        -- signature packages which have no exports.-        lc_sig_includes :: [ComponentInclude OpenUnitId ModuleRenaming],-        -- | The module shape computed by mix-in linking.  This is-        -- newly computed from 'ConfiguredComponent'-        lc_shape :: ModuleShape-      }---- | Uniquely identifies a 'LinkedComponent'.  Corresponds to--- 'cc_cid'.-lc_cid :: LinkedComponent -> ComponentId-lc_cid = ann_id . lc_ann_id---- | Corresponds to 'cc_pkgid'.-lc_pkgid :: LinkedComponent -> PackageId-lc_pkgid = ann_pid . lc_ann_id---- | The 'OpenUnitId' of this component in the "default" instantiation.--- See also 'lc_insts'.  'LinkedComponent's cannot be instantiated--- (e.g., there is no 'ModSubst' instance for them).-lc_uid :: LinkedComponent -> OpenUnitId-lc_uid lc = IndefFullUnitId (lc_cid lc) . Map.fromList $ lc_insts lc---- | The instantiation of 'lc_uid'; this always has the invariant--- that it is a mapping from a module name @A@ to @<A>@ (the hole A).-lc_insts :: LinkedComponent -> [(ModuleName, OpenModule)]-lc_insts lc = [ (req, OpenModuleVar req)-              | req <- Set.toList (modShapeRequires (lc_shape lc)) ]--dispLinkedComponent :: LinkedComponent -> Doc-dispLinkedComponent lc =-    hang (text "unit" <+> pretty (lc_uid lc)) 4 $-         vcat [ text "include" <+> pretty (ci_id incl) <+> pretty (ci_renaming incl)-              | incl <- lc_includes lc ]-            $+$-         vcat [ text "signature include" <+> pretty (ci_id incl)-              | incl <- lc_sig_includes lc ]-            $+$ dispOpenModuleSubst (modShapeProvides (lc_shape lc))--instance Package LinkedComponent where-    packageId = lc_pkgid--toLinkedComponent-    :: Verbosity-    -> FullDb-    -> PackageId-    -> LinkedComponentMap-    -> ConfiguredComponent-    -> LogProgress LinkedComponent-toLinkedComponent verbosity db this_pid pkg_map ConfiguredComponent {-    cc_ann_id = aid@AnnotatedId { ann_id = this_cid },-    cc_component = component,-    cc_exe_deps = exe_deps,-    cc_public = is_public,-    cc_includes = cid_includes-   } = do-    let-        -- The explicitly specified requirements, provisions and-        -- reexports from the Cabal file.  These are only non-empty for-        -- libraries; everything else is trivial.-        (src_reqs      :: [ModuleName],-         src_provs     :: [ModuleName],-         src_reexports :: [ModuleReexport]) =-            case component of-                CLib lib -> (signatures lib,-                             exposedModules lib,-                             reexportedModules lib)-                _ -> ([], [], [])-        src_hidden = otherModules (componentBuildInfo component)--        -- Take each included ComponentId and resolve it into an-        -- *unlinked* unit identity.  We will use unification (relying-        -- on the ModuleShape) to resolve these into linked identities.-        unlinked_includes :: [ComponentInclude (OpenUnitId, ModuleShape) IncludeRenaming]-        unlinked_includes = [ ComponentInclude (fmap lookupUid dep_aid) rns i-                            | ComponentInclude dep_aid rns i <- cid_includes ]--        lookupUid :: ComponentId -> (OpenUnitId, ModuleShape)-        lookupUid cid = fromMaybe (error "linkComponent: lookupUid")-                                    (Map.lookup cid pkg_map)--    let orErr (Right x) = return x-        orErr (Left [err]) = dieProgress err-        orErr (Left errs) = do-            dieProgress (vcat (intersperse (text "") -- double newline!-                                [ hang (text "-") 2 err | err <- errs]))--    -- Pre-shaping-    let pre_shape = mixLinkPreModuleShape $-            PreModuleShape {-                preModShapeProvides = Set.fromList (src_provs ++ src_hidden),-                preModShapeRequires = Set.fromList src_reqs-            } : [ renamePreModuleShape (toPreModuleShape sh) rns-                | ComponentInclude (AnnotatedId { ann_id = (_, sh) }) rns _ <- unlinked_includes ]-        reqs  = preModShapeRequires pre_shape-        insts = [ (req, OpenModuleVar req)-                | req <- Set.toList reqs ]-        this_uid = IndefFullUnitId this_cid . Map.fromList $ insts--    -- OK, actually do unification-    -- TODO: the unification monad might return errors, in which-    -- case we have to deal.  Use monadic bind for now.-    (linked_shape0  :: ModuleScope,-     linked_includes0 :: [ComponentInclude OpenUnitId ModuleRenaming],-     linked_sig_includes0 :: [ComponentInclude OpenUnitId ModuleRenaming])-      <- orErr $ runUnifyM verbosity this_cid db $ do-        -- The unification monad is implemented using mutable-        -- references.  Thus, we must convert our *pure* data-        -- structures into mutable ones to perform unification.--        let convertMod :: (ModuleName -> ModuleSource) -> ModuleName -> UnifyM s (ModuleScopeU s)-            convertMod from m = do-                m_u <- convertModule (OpenModule this_uid m)-                return (Map.singleton m [WithSource (from m) m_u], Map.empty)-        -- Handle 'exposed-modules'-        exposed_mod_shapes_u <- traverse (convertMod FromExposedModules) src_provs-        -- Handle 'other-modules'-        other_mod_shapes_u <- traverse (convertMod FromOtherModules) src_hidden--        -- Handle 'signatures'-        let convertReq :: ModuleName -> UnifyM s (ModuleScopeU s)-            convertReq req = do-                req_u <- convertModule (OpenModuleVar req)-                return (Map.empty, Map.singleton req [WithSource (FromSignatures req) req_u])-        req_shapes_u <- traverse convertReq src_reqs--        -- Handle 'mixins'-        (incl_shapes_u, all_includes_u) <- fmap unzip (traverse convertInclude unlinked_includes)--        failIfErrs -- Prevent error cascade-        -- Mix-in link everything!  mixLink is the real workhorse.-        shape_u <- mixLink $ exposed_mod_shapes_u-                          ++ other_mod_shapes_u-                          ++ req_shapes_u-                          ++ incl_shapes_u--        -- src_reqs_u <- traverse convertReq src_reqs-        -- Read out all the final results by converting back-        -- into a pure representation.-        let convertIncludeU (ComponentInclude dep_aid rns i) = do-                uid <- convertUnitIdU (ann_id dep_aid)-                return (ComponentInclude {-                            ci_ann_id = dep_aid { ann_id = uid },-                            ci_renaming = rns,-                            ci_implicit = i-                        })-        shape <- convertModuleScopeU shape_u-        let (includes_u, sig_includes_u) = partitionEithers all_includes_u-        incls <- traverse convertIncludeU includes_u-        sig_incls <- traverse convertIncludeU sig_includes_u-        return (shape, incls, sig_incls)--    let isNotLib (CLib _) = False-        isNotLib _        = True-    when (not (Set.null reqs) && isNotLib component) $-        dieProgress $-            hang (text "Non-library component has unfilled requirements:")-                4 (vcat [pretty req | req <- Set.toList reqs])--    -- NB: do NOT include hidden modules here: GHC 7.10's ghc-pkg-    -- won't allow it (since someone could directly synthesize-    -- an 'InstalledPackageInfo' that violates abstraction.)-    -- Though, maybe it should be relaxed?-    let src_hidden_set = Set.fromList src_hidden-        linked_shape = linked_shape0 {-            modScopeProvides =-                -- Would rather use withoutKeys but need BC-                Map.filterWithKey-                    (\k _ -> not (k `Set.member` src_hidden_set))-                    (modScopeProvides linked_shape0)-            }--    -- OK, compute the reexports-    -- TODO: This code reports the errors for reexports one reexport at-    -- a time.  Better to collect them all up and report them all at-    -- once.-    let hdl :: [Either Doc a] -> LogProgress [a]-        hdl es =-            case partitionEithers es of-                ([], rs) -> return rs-                (ls, _) ->-                    dieProgress $-                     hang (text "Problem with module re-exports:") 2-                        (vcat [hang (text "-") 2 l | l <- ls])-    reexports_list <- hdl . (flip map) src_reexports $ \reex@(ModuleReexport mb_pn from to) -> do-      case Map.lookup from (modScopeProvides linked_shape) of-        Just cands@(x0:xs0) -> do-          -- Make sure there is at least one candidate-          (x, xs) <--            case mb_pn of-              Just pn ->-                let matches_pn (FromMixins pn' _ _)     = pn == pn'-                    matches_pn (FromBuildDepends pn' _) = pn == pn'-                    matches_pn (FromExposedModules _) = pn == packageName this_pid-                    matches_pn (FromOtherModules _)   = pn == packageName this_pid-                    matches_pn (FromSignatures _)     = pn == packageName this_pid-                in case filter (matches_pn . getSource) cands of-                    (x1:xs1) -> return (x1, xs1)-                    _ -> Left (brokenReexportMsg reex)-              Nothing -> return (x0, xs0)-          -- Test that all the candidates are consistent-          case filter (\x' -> unWithSource x /= unWithSource x') xs of-            [] -> return ()-            _ -> Left $ ambiguousReexportMsg reex x xs-          return (to, unWithSource x)-        _ ->-          Left (brokenReexportMsg reex)--    -- TODO: maybe check this earlier; it's syntactically obvious.-    let build_reexports m (k, v)-            | Map.member k m =-                dieProgress $ hsep-                    [ text "Module name ", pretty k, text " is exported multiple times." ]-            | otherwise = return (Map.insert k v m)-    provs <- foldM build_reexports Map.empty $-                -- TODO: doublecheck we have checked for-                -- src_provs duplicates already!-                [ (mod_name, OpenModule this_uid mod_name) | mod_name <- src_provs ] ++-                reexports_list--    let final_linked_shape = ModuleShape provs (Map.keysSet (modScopeRequires linked_shape))--    -- See Note Note [Signature package special case]-    let (linked_includes, linked_sig_includes)-            | Set.null reqs = (linked_includes0 ++ linked_sig_includes0, [])-            | otherwise     = (linked_includes0, linked_sig_includes0)--    return $ LinkedComponent {-                lc_ann_id = aid,-                lc_component = component,-                lc_public = is_public,-                -- These must be executables-                lc_exe_deps = map (fmap (\cid -> IndefFullUnitId cid Map.empty)) exe_deps,-                lc_shape = final_linked_shape,-                lc_includes = linked_includes,-                lc_sig_includes = linked_sig_includes-           }---- Note [Signature package special case]--- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--- Suppose we have p-indef, which depends on str-sig and inherits--- the hole from that signature package.  When we instantiate p-indef,--- it's a bit pointless to also go ahead and build str-sig, because--- str-sig cannot possibly have contributed any code to the package--- in question.  Furthermore, because the signature was inherited to--- p-indef, if we test matching against p-indef, we also have tested--- matching against p-sig.  In fact, skipping p-sig is *mandatory*,--- because p-indef may have thinned it (so that an implementation may--- match p-indef but not p-sig.)------ However, suppose that we have a package which mixes together str-sig--- and str-bytestring, with the intent of *checking* that str-sig is--- implemented by str-bytestring.  Here, it's quite important to--- build an instantiated str-sig, since that is the only way we will--- actually end up testing if the matching works.  Note that this--- admonition only applies if the package has NO requirements; if it--- has any requirements, we will typecheck it as an indefinite--- package, at which point the signature includes will be passed to--- GHC who will in turn actually do the checking to make sure they--- are instantiated correctly.---- Handle mix-in linking for components.  In the absence of Backpack,--- every ComponentId gets converted into a UnitId by way of SimpleUnitId.-toLinkedComponents-    :: Verbosity-    -> FullDb-    -> PackageId-    -> LinkedComponentMap-    -> [ConfiguredComponent]-    -> LogProgress [LinkedComponent]-toLinkedComponents verbosity db this_pid lc_map0 comps-   = fmap snd (mapAccumM go lc_map0 comps)- where-  go :: Map ComponentId (OpenUnitId, ModuleShape)-     -> ConfiguredComponent-     -> LogProgress (Map ComponentId (OpenUnitId, ModuleShape), LinkedComponent)-  go lc_map cc = do-    lc <- addProgressCtx (text "In the stanza" <+> text (componentNameStanza (cc_name cc))) $-            toLinkedComponent verbosity db this_pid lc_map cc-    return (extendLinkedComponentMap lc lc_map, lc)--type LinkedComponentMap = Map ComponentId (OpenUnitId, ModuleShape)--extendLinkedComponentMap :: LinkedComponent-                         -> LinkedComponentMap-                         -> LinkedComponentMap-extendLinkedComponentMap lc m =-    Map.insert (lc_cid lc) (lc_uid lc, lc_shape lc) m--brokenReexportMsg :: ModuleReexport -> Doc-brokenReexportMsg (ModuleReexport (Just pn) from _to) =-  vcat [ text "The package" <+> quotes (pretty pn)-       , text "does not export a module" <+> quotes (pretty from) ]-brokenReexportMsg (ModuleReexport Nothing from _to) =-  vcat [ text "The module" <+> quotes (pretty from)-       , text "is not exported by any suitable package."-       , text "It occurs in neither the 'exposed-modules' of this package,"-       , text "nor any of its 'build-depends' dependencies." ]--ambiguousReexportMsg :: ModuleReexport -> ModuleWithSource -> [ModuleWithSource] -> Doc-ambiguousReexportMsg (ModuleReexport mb_pn from _to) y1 ys =-  vcat [ text "Ambiguous reexport" <+> quotes (pretty from)-       , hang (text "It could refer to either:") 2-            (vcat (msg : msgs))-       , help_msg mb_pn ]-  where-    msg  = text "  " <+> displayModuleWithSource y1-    msgs = [text "or" <+> displayModuleWithSource y | y <- ys]-    help_msg Nothing =-      -- TODO: This advice doesn't help if the ambiguous exports-      -- come from a package named the same thing-      vcat [ text "The ambiguity can be resolved by qualifying the"-           , text "re-export with a package name."-           , text "The syntax is 'packagename:ModuleName [as NewName]'." ]-    -- Qualifying won't help that much.-    help_msg (Just _) =-      vcat [ text "The ambiguity can be resolved by using the"-           , text "mixins field to rename one of the module"-           , text "names differently." ]-    displayModuleWithSource y-      = vcat [ quotes (pretty (unWithSource y))-             , text "brought into scope by" <+>-                dispModuleSource (getSource y)-             ]

@@ -1,185 +0,0 @@-{-# LANGUAGE NondecreasingIndentation #-}--- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-module Distribution.Backpack.MixLink (-    mixLink,-) where--import Prelude ()-import Distribution.Compat.Prelude hiding (mod)--import Distribution.Backpack-import Distribution.Backpack.UnifyM-import Distribution.Backpack.FullUnitId-import Distribution.Backpack.ModuleScope--import qualified Distribution.Utils.UnionFind as UnionFind-import Distribution.ModuleName-import Distribution.Pretty-import Distribution.Types.ComponentId--import Text.PrettyPrint-import Control.Monad-import qualified Data.Map as Map-import qualified Data.Foldable as F---------------------------------------------------------------------------- Linking---- | Given to scopes of provisions and requirements, link them together.-mixLink :: [ModuleScopeU s] -> UnifyM s (ModuleScopeU s)-mixLink scopes = do-    let provs = Map.unionsWith (++) (map fst scopes)-        -- Invariant: any identically named holes refer to same mutable cell-        reqs  = Map.unionsWith (++) (map snd scopes)-        filled = Map.intersectionWithKey linkProvision provs reqs-    F.sequenceA_ filled-    let remaining = Map.difference reqs filled-    return (provs, remaining)---- | Link a list of possibly provided modules to a single--- requirement.  This applies a side-condition that all--- of the provided modules at the same name are *actually*--- the same module.-linkProvision :: ModuleName-              -> [ModuleWithSourceU s] -- provs-              -> [ModuleWithSourceU s] -- reqs-              -> UnifyM s [ModuleWithSourceU s]-linkProvision mod_name ret@(prov:provs) (req:reqs) = do-    -- TODO: coalesce all the non-unifying modules together-    forM_ provs $ \prov' -> do-        -- Careful: read it out BEFORE unifying, because the-        -- unification algorithm preemptively unifies modules-        mod  <- convertModuleU (unWithSource prov)-        mod' <- convertModuleU (unWithSource prov')-        r <- unify prov prov'-        case r of-            Just () -> return ()-            Nothing -> do-                addErr $-                  text "Ambiguous module" <+> quotes (pretty mod_name) $$-                  text "It could refer to" <+>-                    ( text "  " <+> (quotes (pretty mod)  $$ in_scope_by (getSource prov)) $$-                      text "or" <+> (quotes (pretty mod') $$ in_scope_by (getSource prov')) ) $$-                  link_doc-    mod <- convertModuleU (unWithSource prov)-    req_mod <- convertModuleU (unWithSource req)-    self_cid <- fmap unify_self_cid getUnifEnv-    case mod of-      OpenModule (IndefFullUnitId cid _) _-        | cid == self_cid -> addErr $-            text "Cannot instantiate requirement" <+> quotes (pretty mod_name) <+>-                in_scope_by (getSource req) $$-            text "with locally defined module" <+> in_scope_by (getSource prov) $$-            text "as this would create a cyclic dependency, which GHC does not support." $$-            text "Try moving this module to a separate library, e.g.," $$-            text "create a new stanza: library 'sublib'."-      _ -> return ()-    r <- unify prov req-    case r of-        Just () -> return ()-        Nothing -> do-            -- TODO: Record and report WHERE the bad constraint came from-            addErr $ text "Could not instantiate requirement" <+> quotes (pretty mod_name) $$-                     nest 4 (text "Expected:" <+> pretty mod $$-                             text "Actual:  " <+> pretty req_mod) $$-                     parens (text "This can occur if an exposed module of" <+>-                             text "a libraries shares a name with another module.") $$-                     link_doc-    return ret-  where-    unify s1 s2 = tryM $ addErrContext short_link_doc-                       $ unifyModule (unWithSource s1) (unWithSource s2)-    in_scope_by s = text "brought into scope by" <+> dispModuleSource s-    short_link_doc = text "While filling requirement" <+> quotes (pretty mod_name)-    link_doc = text "While filling requirements of" <+> reqs_doc-    reqs_doc-      | null reqs = dispModuleSource (getSource req)-      | otherwise =  (       text "   " <+> dispModuleSource (getSource req)  $$-                      vcat [ text "and" <+> dispModuleSource (getSource r) | r <- reqs])-linkProvision _ _ _ = error "linkProvision"------------------------------------------------------------------------------ The unification algorithm---- This is based off of https://gist.github.com/amnn/559551517d020dbb6588--- which is a translation from Huet's thesis.--unifyUnitId :: UnitIdU s -> UnitIdU s -> UnifyM s ()-unifyUnitId uid1_u uid2_u-    | uid1_u == uid2_u = return ()-    | otherwise = do-        xuid1 <- liftST $ UnionFind.find uid1_u-        xuid2 <- liftST $ UnionFind.find uid2_u-        case (xuid1, xuid2) of-            (UnitIdThunkU u1, UnitIdThunkU u2)-                | u1 == u2  -> return ()-                | otherwise ->-                    failWith $ hang (text "Couldn't match unit IDs:") 4-                               (text "   " <+> pretty u1 $$-                                text "and" <+> pretty u2)-            (UnitIdThunkU uid1, UnitIdU _ cid2 insts2)-                -> unifyThunkWith cid2 insts2 uid2_u uid1 uid1_u-            (UnitIdU _ cid1 insts1, UnitIdThunkU uid2)-                -> unifyThunkWith cid1 insts1 uid1_u uid2 uid2_u-            (UnitIdU _ cid1 insts1, UnitIdU _ cid2 insts2)-                -> unifyInner cid1 insts1 uid1_u cid2 insts2 uid2_u--unifyThunkWith :: ComponentId-               -> Map ModuleName (ModuleU s)-               -> UnitIdU s-               -> DefUnitId-               -> UnitIdU s-               -> UnifyM s ()-unifyThunkWith cid1 insts1 uid1_u uid2 uid2_u = do-    db <- fmap unify_db getUnifEnv-    let FullUnitId cid2 insts2' = expandUnitId db uid2-    insts2 <- convertModuleSubst insts2'-    unifyInner cid1 insts1 uid1_u cid2 insts2 uid2_u--unifyInner :: ComponentId-           -> Map ModuleName (ModuleU s)-           -> UnitIdU s-           -> ComponentId-           -> Map ModuleName (ModuleU s)-           -> UnitIdU s-           -> UnifyM s ()-unifyInner cid1 insts1 uid1_u cid2 insts2 uid2_u = do-    when (cid1 /= cid2) $-        -- TODO: if we had a package identifier, could be an-        -- easier to understand error message.-        failWith $-            hang (text "Couldn't match component IDs:") 4-                 (text "   " <+> pretty cid1 $$-                  text "and" <+> pretty cid2)-    -- The KEY STEP which makes this a Huet-style unification-    -- algorithm.  (Also a payoff of using union-find.)-    -- We can build infinite unit IDs this way, which is necessary-    -- for support mutual recursion. NB: union keeps the SECOND-    -- descriptor, so we always arrange for a UnitIdThunkU to live-    -- there.-    liftST $ UnionFind.union uid1_u uid2_u-    F.sequenceA_ $ Map.intersectionWith unifyModule insts1 insts2---- | Imperatively unify two modules.-unifyModule :: ModuleU s -> ModuleU s -> UnifyM s ()-unifyModule mod1_u mod2_u-    | mod1_u == mod2_u = return ()-    | otherwise = do-        mod1 <- liftST $ UnionFind.find mod1_u-        mod2 <- liftST $ UnionFind.find mod2_u-        case (mod1, mod2) of-            (ModuleVarU _, _) -> liftST $ UnionFind.union mod1_u mod2_u-            (_, ModuleVarU _) -> liftST $ UnionFind.union mod2_u mod1_u-            (ModuleU uid1 mod_name1, ModuleU uid2 mod_name2) -> do-                when (mod_name1 /= mod_name2) $-                    failWith $-                        hang (text "Cannot match module names") 4 $-                            text "   " <+> pretty mod_name1 $$-                            text "and" <+> pretty mod_name2-                -- NB: this is not actually necessary (because we'll-                -- detect loops eventually in 'unifyUnitId'), but it-                -- seems harmless enough-                liftST $ UnionFind.union mod1_u mod2_u-                unifyUnitId uid1 uid2

@@ -1,52 +0,0 @@-{-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE PatternGuards #-}---- | A type class 'ModSubst' for objects which can have 'ModuleSubst'--- applied to them.------ See also <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>--module Distribution.Backpack.ModSubst (-    ModSubst(..),-) where--import Prelude ()-import Distribution.Compat.Prelude hiding (mod)--import Distribution.Backpack-import Distribution.ModuleName--import qualified Data.Map as Map-import qualified Data.Set as Set---- | Applying module substitutions to semantic objects.-class ModSubst a where-    -- In notation, substitution is postfix, which implies-    -- putting it on the right hand side, but for partial-    -- application it's more convenient to have it on the left-    -- hand side.-    modSubst :: OpenModuleSubst -> a -> a--instance ModSubst OpenModule where-    modSubst subst (OpenModule cid mod_name) = OpenModule (modSubst subst cid) mod_name-    modSubst subst mod@(OpenModuleVar mod_name)-        | Just mod' <- Map.lookup mod_name subst = mod'-        | otherwise = mod--instance ModSubst OpenUnitId where-    modSubst subst (IndefFullUnitId cid insts) = IndefFullUnitId cid (modSubst subst insts)-    modSubst _subst uid = uid--instance ModSubst (Set ModuleName) where-    modSubst subst reqs-        = Set.union (Set.difference reqs (Map.keysSet subst))-                    (openModuleSubstFreeHoles subst)---- Substitutions are functorial.  NB: this means that--- there is an @instance 'ModSubst' 'ModuleSubst'@!-instance ModSubst a => ModSubst (Map k a) where-    modSubst subst = fmap (modSubst subst)-instance ModSubst a => ModSubst [a] where-    modSubst subst = fmap (modSubst subst)-instance ModSubst a => ModSubst (k, a) where-    modSubst subst (x,y) = (x, modSubst subst y)

@@ -1,132 +0,0 @@-{-# LANGUAGE DeriveFunctor #-}-{-# LANGUAGE DeriveTraversable #-}-{-# LANGUAGE DeriveFoldable #-}--- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-module Distribution.Backpack.ModuleScope (-    -- * Module scopes-    ModuleScope(..),-    ModuleProvides,-    ModuleRequires,-    ModuleSource(..),-    dispModuleSource,-    WithSource(..),-    unWithSource,-    getSource,-    ModuleWithSource,-    emptyModuleScope,-) where--import Prelude ()-import Distribution.Compat.Prelude--import Distribution.ModuleName-import Distribution.Types.IncludeRenaming-import Distribution.Types.PackageName-import Distribution.Types.ComponentName-import Distribution.Types.LibraryName-import Distribution.Pretty--import Distribution.Backpack-import Distribution.Backpack.ModSubst--import qualified Data.Map as Map-import Text.PrettyPrint----------------------------------------------------------------------------- Module scopes---- Why is ModuleProvides so complicated?  The basic problem is that--- we want to support this:------  package p where---      include q (A)---      include r (A)---      module B where---          import "q" A---          import "r" A------ Specifically, in Cabal today it is NOT an error have two modules in--- scope with the same identifier.  So we need to preserve this for--- Backpack.  The modification is that an ambiguous module name is--- OK... as long as it is NOT used to fill a requirement!------ So as a first try, we might try deferring unifying provisions that--- are being glommed together, and check for equality after the fact.--- But this doesn't work, because what if a multi-module provision--- is used to fill a requirement?!  So you do the equality test--- IMMEDIATELY before a requirement fill happens... or never at all.------ Alternate strategy: go ahead and unify, and then if it is revealed--- that some requirements got filled "out-of-thin-air", error.----- | A 'ModuleScope' describes the modules and requirements that--- are in-scope as we are processing a Cabal package.  Unlike--- a 'ModuleShape', there may be multiple modules in scope at--- the same 'ModuleName'; this is only an error if we attempt--- to use those modules to fill a requirement.  A 'ModuleScope'--- can influence the 'ModuleShape' via a reexport.-data ModuleScope = ModuleScope {-    modScopeProvides :: ModuleProvides,-    modScopeRequires :: ModuleRequires-    }---- | An empty 'ModuleScope'.-emptyModuleScope :: ModuleScope-emptyModuleScope = ModuleScope Map.empty Map.empty---- | Every 'Module' in scope at a 'ModuleName' is annotated with--- the 'PackageName' it comes from.-type ModuleProvides = Map ModuleName [ModuleWithSource]--- | INVARIANT: entries for ModuleName m, have msrc_module is OpenModuleVar m-type ModuleRequires = Map ModuleName [ModuleWithSource]--- TODO: consider newtping the two types above.---- | Description of where a module participating in mixin linking came--- from.-data ModuleSource-    = FromMixins         PackageName ComponentName IncludeRenaming-    | FromBuildDepends   PackageName ComponentName-    | FromExposedModules ModuleName-    | FromOtherModules   ModuleName-    | FromSignatures     ModuleName--- We don't have line numbers, but if we did, we'd want to record that--- too---- TODO: Deduplicate this with Distribution.Backpack.UnifyM.ci_msg-dispModuleSource :: ModuleSource -> Doc-dispModuleSource (FromMixins pn cn incls)-  = text "mixins:" <+> dispComponent pn cn <+> pretty incls-dispModuleSource (FromBuildDepends pn cn)-  = text "build-depends:" <+> dispComponent pn cn-dispModuleSource (FromExposedModules m)-  = text "exposed-modules:" <+> pretty m-dispModuleSource (FromOtherModules m)-  = text "other-modules:" <+> pretty m-dispModuleSource (FromSignatures m)-  = text "signatures:" <+> pretty m---- Dependency-dispComponent :: PackageName -> ComponentName -> Doc-dispComponent pn cn =-    -- NB: This syntax isn't quite the source syntax, but it-    -- should be clear enough.  To do source syntax, we'd-    -- need to know what the package we're linking is.-    case cn of-        CLibName LMainLibName -> pretty pn-        CLibName (LSubLibName ucn) -> pretty pn <<>> colon <<>> pretty ucn-        -- Case below shouldn't happen-        _ -> pretty pn <+> parens (pretty cn)---- | An 'OpenModule', annotated with where it came from in a Cabal file.-data WithSource a = WithSource ModuleSource a-    deriving (Functor, Foldable, Traversable)-unWithSource :: WithSource a -> a-unWithSource (WithSource _ x) = x-getSource :: WithSource a -> ModuleSource-getSource (WithSource s _) = s-type ModuleWithSource = WithSource OpenModule--instance ModSubst a => ModSubst (WithSource a) where-    modSubst subst (WithSource s m) = WithSource s (modSubst subst m)

@@ -1,84 +0,0 @@-{-# LANGUAGE DeriveDataTypeable #-}-{-# LANGUAGE DeriveGeneric #-}--- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-module Distribution.Backpack.ModuleShape (-    -- * Module shapes-    ModuleShape(..),-    emptyModuleShape,-    shapeInstalledPackage,-) where--import Prelude ()-import Distribution.Compat.Prelude hiding (mod)--import Distribution.ModuleName-import Distribution.InstalledPackageInfo as IPI--import Distribution.Backpack.ModSubst-import Distribution.Backpack--import qualified Data.Map as Map-import qualified Data.Set as Set---------------------------------------------------------------------------- Module shapes---- | A 'ModuleShape' describes the provisions and requirements of--- a library.  We can extract a 'ModuleShape' from an--- 'InstalledPackageInfo'.-data ModuleShape = ModuleShape {-    modShapeProvides :: OpenModuleSubst,-    modShapeRequires :: Set ModuleName-    }-    deriving (Eq, Show, Generic, Typeable)--instance Binary ModuleShape-instance Structured ModuleShape--instance ModSubst ModuleShape where-    modSubst subst (ModuleShape provs reqs)-        = ModuleShape (modSubst subst provs) (modSubst subst reqs)---- | The default module shape, with no provisions and no requirements.-emptyModuleShape :: ModuleShape-emptyModuleShape = ModuleShape Map.empty Set.empty---- Food for thought: suppose we apply the Merkel tree optimization.--- Imagine this situation:------      component p---          signature H---          module P---      component h---          module H---      component a---          signature P---          module A---      component q(P)---          include p---          include h---      component r---          include q (P)---          include p (P) requires (H)---          include h (H)---          include a (A) requires (P)------ Component r should not have any conflicts, since after mix-in linking--- the two P imports will end up being the same, so we can properly--- instantiate it.  But to know that q's P is p:P instantiated with h:H,--- we have to be able to expand its unit id.  Maybe we can expand it--- lazily but in some cases it will need to be expanded.------ FWIW, the way that GHC handles this is by improving unit IDs as--- soon as it sees an improved one in the package database.  This--- is a bit disgusting.-shapeInstalledPackage :: IPI.InstalledPackageInfo -> ModuleShape-shapeInstalledPackage ipi = ModuleShape (Map.fromList provs) reqs-  where-    uid = installedOpenUnitId ipi-    provs = map shapeExposedModule (IPI.exposedModules ipi)-    reqs = requiredSignatures ipi-    shapeExposedModule (IPI.ExposedModule mod_name Nothing)-        = (mod_name, OpenModule uid mod_name)-    shapeExposedModule (IPI.ExposedModule mod_name (Just mod))-        = (mod_name, mod)

@@ -1,67 +0,0 @@--- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-module Distribution.Backpack.PreExistingComponent (-    PreExistingComponent(..),-    ipiToPreExistingComponent,-) where--import Prelude ()-import Distribution.Compat.Prelude--import Distribution.Backpack.ModuleShape-import Distribution.Backpack-import Distribution.Types.ComponentId-import Distribution.Types.MungedPackageId-import Distribution.Types.PackageId-import Distribution.Types.UnitId-import Distribution.Types.ComponentName-import Distribution.Types.PackageName-import Distribution.Package--import qualified Data.Map as Map-import qualified Distribution.InstalledPackageInfo as Installed-import Distribution.InstalledPackageInfo (InstalledPackageInfo)---- | Stripped down version of 'LinkedComponent' for things--- we don't need to know how to build.-data PreExistingComponent-    = PreExistingComponent {-        -- | The actual name of the package. This may DISAGREE with 'pc_pkgid'-        -- for internal dependencies: e.g., an internal component @lib@ may be-        -- munged to @z-pkg-z-lib@, but we still want to use it when we see-        -- @lib@ in @build-depends@-        pc_pkgname :: PackageName,-        -- | The actual name of the component.-        pc_compname :: ComponentName,-        pc_munged_id :: MungedPackageId,-        pc_uid   :: UnitId,-        pc_cid   :: ComponentId,-        pc_open_uid :: OpenUnitId,-        pc_shape :: ModuleShape-    }---- | Convert an 'InstalledPackageInfo' into a 'PreExistingComponent',--- which was brought into scope under the 'PackageName' (important for--- a package qualified reference.)-ipiToPreExistingComponent :: InstalledPackageInfo -> PreExistingComponent-ipiToPreExistingComponent ipi =-    PreExistingComponent {-        pc_pkgname = packageName ipi,-        pc_compname = CLibName $ Installed.sourceLibName ipi,-        pc_munged_id = mungedId ipi,-        pc_uid   = Installed.installedUnitId ipi,-        pc_cid   = Installed.installedComponentId ipi,-        pc_open_uid =-            IndefFullUnitId (Installed.installedComponentId ipi)-                            (Map.fromList (Installed.instantiatedWith ipi)),-        pc_shape = shapeInstalledPackage ipi-    }--instance HasMungedPackageId PreExistingComponent where-  mungedId = pc_munged_id--instance Package PreExistingComponent where-  packageId pec = PackageIdentifier (pc_pkgname pec) v-    where MungedPackageId _ v = pc_munged_id pec--instance HasUnitId PreExistingComponent where-  installedUnitId = pc_uid

@@ -1,44 +0,0 @@-{-# LANGUAGE DeriveDataTypeable #-}-{-# LANGUAGE DeriveGeneric #-}--module Distribution.Backpack.PreModuleShape (-    PreModuleShape(..),-    toPreModuleShape,-    renamePreModuleShape,-    mixLinkPreModuleShape,-) where--import Prelude ()-import Distribution.Compat.Prelude--import qualified Data.Set as Set-import qualified Data.Map as Map--import Distribution.Backpack.ModuleShape-import Distribution.Types.IncludeRenaming-import Distribution.Types.ModuleRenaming-import Distribution.ModuleName--data PreModuleShape = PreModuleShape {-        preModShapeProvides :: Set ModuleName,-        preModShapeRequires :: Set ModuleName-    }-    deriving (Eq, Show, Generic)--toPreModuleShape :: ModuleShape -> PreModuleShape-toPreModuleShape (ModuleShape provs reqs) = PreModuleShape (Map.keysSet provs) reqs--renamePreModuleShape :: PreModuleShape -> IncludeRenaming -> PreModuleShape-renamePreModuleShape (PreModuleShape provs reqs) (IncludeRenaming prov_rn req_rn) =-    PreModuleShape-        (Set.fromList (mapMaybe prov_fn (Set.toList provs)))-        (Set.map req_fn reqs)-  where-    prov_fn = interpModuleRenaming prov_rn-    req_fn k = fromMaybe k (interpModuleRenaming req_rn k)--mixLinkPreModuleShape :: [PreModuleShape] -> PreModuleShape-mixLinkPreModuleShape shapes = PreModuleShape provs (Set.difference reqs provs)-  where-    provs = Set.unions (map preModShapeProvides shapes)-    reqs  = Set.unions (map preModShapeRequires shapes)

@@ -1,376 +0,0 @@-{-# LANGUAGE TypeFamilies #-}-{-# LANGUAGE PatternGuards #-}--- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-module Distribution.Backpack.ReadyComponent (-    ReadyComponent(..),-    InstantiatedComponent(..),-    IndefiniteComponent(..),-    rc_depends,-    rc_uid,-    rc_pkgid,-    dispReadyComponent,-    toReadyComponents,-) where--import Prelude ()-import Distribution.Compat.Prelude hiding ((<>))--import Distribution.Backpack-import Distribution.Backpack.LinkedComponent-import Distribution.Backpack.ModuleShape--import Distribution.Types.AnnotatedId-import Distribution.Types.ModuleRenaming-import Distribution.Types.Component-import Distribution.Types.ComponentInclude-import Distribution.Types.ComponentId-import Distribution.Types.ComponentName-import Distribution.Types.PackageId-import Distribution.Types.PackageName.Magic-import Distribution.Types.UnitId-import Distribution.Compat.Graph (IsNode(..))-import Distribution.Types.Module-import Distribution.Types.MungedPackageId-import Distribution.Types.MungedPackageName-import Distribution.Types.Library-import Distribution.Types.LibraryName--import Distribution.ModuleName-import Distribution.Package-import Distribution.Simple.Utils--import Control.Monad-import Text.PrettyPrint-import qualified Data.Map as Map-import qualified Data.Set as Set--import Distribution.Version-import Distribution.Pretty---- | A 'ReadyComponent' is one that we can actually generate build--- products for.  We have a ready component for the typecheck-only--- products of every indefinite package, as well as a ready component--- for every way these packages can be fully instantiated.----data ReadyComponent-    = ReadyComponent {-        rc_ann_id       :: AnnotatedId UnitId,-        -- | The 'OpenUnitId' for this package.  At the moment, this-        -- is used in only one case, which is to determine if an-        -- export is of a module from this library (indefinite-        -- libraries record these exports as 'OpenModule');-        -- 'rc_open_uid' can be conveniently used to test for-        -- equality, whereas 'UnitId' cannot always be used in this-        -- case.-        rc_open_uid     :: OpenUnitId,-        -- | Corresponds to 'lc_cid'.  Invariant: if 'rc_open_uid'-        -- records a 'ComponentId', it coincides with this one.-        rc_cid          :: ComponentId,-        -- | Corresponds to 'lc_component'.-        rc_component    :: Component,-        -- | Corresponds to 'lc_exe_deps'.-        -- Build-tools don't participate in mix-in linking.-        -- (but what if they could?)-        rc_exe_deps     :: [AnnotatedId UnitId],-        -- | Corresponds to 'lc_public'.-        rc_public       :: Bool,-        -- | Extra metadata depending on whether or not this is an-        -- indefinite library (typechecked only) or an instantiated-        -- component (can be compiled).-        rc_i            :: Either IndefiniteComponent InstantiatedComponent-    }---- | The final, string 'UnitId' that will uniquely identify--- the compilation products of this component.-rc_uid          :: ReadyComponent -> UnitId-rc_uid = ann_id . rc_ann_id---- | Corresponds to 'lc_pkgid'.-rc_pkgid        :: ReadyComponent -> PackageId-rc_pkgid = ann_pid . rc_ann_id---- | An 'InstantiatedComponent' is a library which is fully instantiated--- (or, possibly, has no requirements at all.)-data InstantiatedComponent-    = InstantiatedComponent {-        -- | How this library was instantiated.-        instc_insts    :: [(ModuleName, Module)],-        -- | Dependencies induced by 'instc_insts'.  These are recorded-        -- here because there isn't a convenient way otherwise to get-        -- the 'PackageId' we need to fill 'componentPackageDeps' as needed.-        instc_insts_deps :: [(UnitId, MungedPackageId)],-        -- | The modules exported/reexported by this library.-        instc_provides :: Map ModuleName Module,-        -- | The dependencies which need to be passed to the compiler-        -- to bring modules into scope.  These always refer to installed-        -- fully instantiated libraries.-        instc_includes :: [ComponentInclude DefUnitId ModuleRenaming]-    }---- | An 'IndefiniteComponent' is a library with requirements--- which we will typecheck only.-data IndefiniteComponent-    = IndefiniteComponent {-        -- | The requirements of the library.-        indefc_requires :: [ModuleName],-        -- | The modules exported/reexported by this library.-        indefc_provides :: Map ModuleName OpenModule,-        -- | The dependencies which need to be passed to the compiler-        -- to bring modules into scope.  These are 'OpenUnitId' because-        -- these may refer to partially instantiated libraries.-        indefc_includes :: [ComponentInclude OpenUnitId ModuleRenaming]-    }---- | Compute the dependencies of a 'ReadyComponent' that should--- be recorded in the @depends@ field of 'InstalledPackageInfo'.-rc_depends :: ReadyComponent -> [(UnitId, MungedPackageId)]-rc_depends rc = ordNub $-    case rc_i rc of-        Left indefc ->-            map (\ci -> (abstractUnitId $ ci_id ci, toMungedPackageId ci))-                (indefc_includes indefc)-        Right instc ->-            map (\ci -> (unDefUnitId $ ci_id ci, toMungedPackageId ci))-                (instc_includes instc)-              ++ instc_insts_deps instc-  where-    toMungedPackageId :: Pretty id => ComponentInclude id rn -> MungedPackageId-    toMungedPackageId ci =-        computeCompatPackageId-            (ci_pkgid ci)-            (case ci_cname ci of-                CLibName name -> name-                _ -> error $ prettyShow (rc_cid rc) ++-                        " depends on non-library " ++ prettyShow (ci_id ci))---- | Get the 'MungedPackageId' of a 'ReadyComponent' IF it is--- a library.-rc_munged_id :: ReadyComponent -> MungedPackageId-rc_munged_id rc =-    computeCompatPackageId-        (rc_pkgid rc)-        (case rc_component rc of-            CLib lib -> libName lib-            _ -> error "rc_munged_id: not library")--instance Package ReadyComponent where-    packageId = rc_pkgid--instance HasUnitId ReadyComponent where-    installedUnitId = rc_uid--instance IsNode ReadyComponent where-    type Key ReadyComponent = UnitId-    nodeKey = rc_uid-    nodeNeighbors rc =-      (case rc_i rc of-        Right inst | [] <- instc_insts inst-                   -> []-                   | otherwise-                   -> [newSimpleUnitId (rc_cid rc)]-        _ -> []) ++-      ordNub (map fst (rc_depends rc)) ++-      map ann_id (rc_exe_deps rc)--dispReadyComponent :: ReadyComponent -> Doc-dispReadyComponent rc =-    hang (text (case rc_i rc of-                    Left  _ -> "indefinite"-                    Right _ -> "definite")-            <+> pretty (nodeKey rc)-            {- <+> dispModSubst (Map.fromList (lc_insts lc)) -} ) 4 $-        vcat [ text "depends" <+> pretty uid-             | uid <- nodeNeighbors rc ]---- | The state of 'InstM'; a mapping from 'UnitId's to their--- ready component, or @Nothing@ if its an external--- component which we don't know how to build.-type InstS = Map UnitId (Maybe ReadyComponent)---- | A state monad for doing instantiations (can't use actual--- State because that would be an extra dependency.)-newtype InstM a = InstM { runInstM :: InstS -> (a, InstS) }--instance Functor InstM where-    fmap f (InstM m) = InstM $ \s -> let (x, s') = m s-                                     in (f x, s')--instance Applicative InstM where-    pure a = InstM $ \s -> (a, s)-    InstM f <*> InstM x = InstM $ \s -> let (f', s') = f s-                                            (x', s'') = x s'-                                        in (f' x', s'')--instance Monad InstM where-    return = pure-    InstM m >>= f = InstM $ \s -> let (x, s') = m s-                                  in runInstM (f x) s'---- | Given a list of 'LinkedComponent's, expand the module graph--- so that we have an instantiated graph containing all of the--- instantiated components we need to build.------ Instantiation intuitively follows the following algorithm:------      instantiate a definite unit id p[S]:---          recursively instantiate each module M in S---          recursively instantiate modules exported by this unit---          recursively instantiate dependencies substituted by S------ The implementation is a bit more involved to memoize instantiation--- if we have done it already.------ We also call 'improveUnitId' during this process, so that fully--- instantiated components are given 'HashedUnitId'.----toReadyComponents-    :: Map UnitId MungedPackageId-    -> Map ModuleName Module -- subst for the public component-    -> [LinkedComponent]-    -> [ReadyComponent]-toReadyComponents pid_map subst0 comps-    = catMaybes (Map.elems ready_map)-  where-    cmap = Map.fromList [ (lc_cid lc, lc) | lc <- comps ]--    instantiateUnitId :: ComponentId -> Map ModuleName Module-                      -> InstM DefUnitId-    instantiateUnitId cid insts = InstM $ \s ->-        case Map.lookup uid s of-            Nothing ->-                -- Knot tied-                let (r, s') = runInstM (instantiateComponent uid cid insts)-                                       (Map.insert uid r s)-                in (def_uid, Map.insert uid r s')-            Just _ -> (def_uid, s)-      where-        -- The mkDefUnitId here indicates that we assume-        -- that Cabal handles unit id hash allocation.-        -- Good thing about hashing here: map is only on string.-        -- Bad thing: have to repeatedly hash.-        def_uid = mkDefUnitId cid insts-        uid = unDefUnitId def_uid--    instantiateComponent-        :: UnitId -> ComponentId -> Map ModuleName Module-        -> InstM (Maybe ReadyComponent)-    instantiateComponent uid cid insts-      | Just lc <- Map.lookup cid cmap = do-            provides <- traverse (substModule insts) (modShapeProvides (lc_shape lc))-            -- NB: lc_sig_includes is omitted here, because we don't-            -- need them to build-            includes <- forM (lc_includes lc) $ \ci -> do-                uid' <- substUnitId insts (ci_id ci)-                return ci { ci_ann_id = fmap (const uid') (ci_ann_id ci) }-            exe_deps <- traverse (substExeDep insts) (lc_exe_deps lc)-            s <- InstM $ \s -> (s, s)-            let getDep (Module dep_def_uid _)-                    | let dep_uid = unDefUnitId dep_def_uid-                    -- Lose DefUnitId invariant for rc_depends-                    = [(dep_uid,-                          fromMaybe err_pid $-                            Map.lookup dep_uid pid_map <|>-                            fmap rc_munged_id (join (Map.lookup dep_uid s)))]-                  where-                    err_pid = MungedPackageId-                        (MungedPackageName nonExistentPackageThisIsCabalBug LMainLibName)-                        (mkVersion [0])-                instc = InstantiatedComponent {-                            instc_insts = Map.toList insts,-                            instc_insts_deps = concatMap getDep (Map.elems insts),-                            instc_provides = provides,-                            instc_includes = includes-                            -- NB: there is no dependency on the-                            -- indefinite version of this instantiated package here,-                            -- as (1) it doesn't go in depends in the-                            -- IPI: it's not a run time dep, and (2)-                            -- we don't have to tell GHC about it, it-                            -- will match up the ComponentId-                            -- automatically-                        }-            return $ Just ReadyComponent {-                    rc_ann_id       = (lc_ann_id lc) { ann_id = uid },-                    rc_open_uid     = DefiniteUnitId (unsafeMkDefUnitId uid),-                    rc_cid          = lc_cid lc,-                    rc_component    = lc_component lc,-                    rc_exe_deps     = exe_deps,-                    rc_public       = lc_public lc,-                    rc_i            = Right instc-                   }-      | otherwise = return Nothing--    substUnitId :: Map ModuleName Module -> OpenUnitId -> InstM DefUnitId-    substUnitId _ (DefiniteUnitId uid) =-        return uid-    substUnitId subst (IndefFullUnitId cid insts) = do-        insts' <- substSubst subst insts-        instantiateUnitId cid insts'--    -- NB: NOT composition-    substSubst :: Map ModuleName Module-               -> Map ModuleName OpenModule-               -> InstM (Map ModuleName Module)-    substSubst subst insts = traverse (substModule subst) insts--    substModule :: Map ModuleName Module -> OpenModule -> InstM Module-    substModule subst (OpenModuleVar mod_name)-        | Just m <- Map.lookup mod_name subst = return m-        | otherwise = error "substModule: non-closing substitution"-    substModule subst (OpenModule uid mod_name) = do-        uid' <- substUnitId subst uid-        return (Module uid' mod_name)--    substExeDep :: Map ModuleName Module-                -> AnnotatedId OpenUnitId -> InstM (AnnotatedId UnitId)-    substExeDep insts exe_aid = do-        exe_uid' <- substUnitId insts (ann_id exe_aid)-        return exe_aid { ann_id = unDefUnitId exe_uid' }--    indefiniteUnitId :: ComponentId -> InstM UnitId-    indefiniteUnitId cid = do-        let uid = newSimpleUnitId cid-        r <- indefiniteComponent uid cid-        InstM $ \s -> (uid, Map.insert uid r s)--    indefiniteComponent :: UnitId -> ComponentId -> InstM (Maybe ReadyComponent)-    indefiniteComponent uid cid-      | Just lc <- Map.lookup cid cmap = do-            -- We're going to process includes, in case some of them-            -- are fully definite even without any substitution.  We-            -- want to build those too; see #5634.-            inst_includes <- forM (lc_includes lc) $ \ci ->-                if Set.null (openUnitIdFreeHoles (ci_id ci))-                    then do uid' <- substUnitId Map.empty (ci_id ci)-                            return $ ci { ci_ann_id = fmap (const (DefiniteUnitId uid')) (ci_ann_id ci) }-                    else return ci-            exe_deps <- traverse (substExeDep Map.empty) (lc_exe_deps lc)-            let indefc = IndefiniteComponent {-                        indefc_requires = map fst (lc_insts lc),-                        indefc_provides = modShapeProvides (lc_shape lc),-                        indefc_includes = inst_includes ++ lc_sig_includes lc-                    }-            return $ Just ReadyComponent {-                    rc_ann_id       = (lc_ann_id lc) { ann_id = uid },-                    rc_cid          = lc_cid lc,-                    rc_open_uid     = lc_uid lc,-                    rc_component    = lc_component lc,-                    -- It's always fully built-                    rc_exe_deps     = exe_deps,-                    rc_public       = lc_public lc,-                    rc_i            = Left indefc-                }-      | otherwise = return Nothing--    ready_map = snd $ runInstM work Map.empty--    work-        -- Top-level instantiation per subst0-        | not (Map.null subst0)-        , [lc] <- filter lc_public (Map.elems cmap)-        = do _ <- instantiateUnitId (lc_cid lc) subst0-             return ()-        | otherwise-        = forM_ (Map.elems cmap) $ \lc ->-            if null (lc_insts lc)-                then instantiateUnitId (lc_cid lc) Map.empty >> return ()-                else indefiniteUnitId (lc_cid lc) >> return ()

@@ -1,627 +0,0 @@-{-# LANGUAGE Rank2Types #-}-{-# LANGUAGE ScopedTypeVariables #-}--- | See <https://github.com/ezyang/ghc-proposals/blob/backpack/proposals/0000-backpack.rst>-module Distribution.Backpack.UnifyM (-    -- * Unification monad-    UnifyM,-    runUnifyM,-    failWith,-    addErr,-    failIfErrs,-    tryM,-    addErrContext,-    addErrContextM,-    liftST,--    UnifEnv(..),-    getUnifEnv,--    -- * Modules and unit IDs-    ModuleU,-    ModuleU'(..),-    convertModule,-    convertModuleU,--    UnitIdU,-    UnitIdU'(..),-    convertUnitId,-    convertUnitIdU,--    ModuleSubstU,-    convertModuleSubstU,-    convertModuleSubst,--    ModuleScopeU,-    emptyModuleScopeU,-    convertModuleScopeU,--    ModuleWithSourceU,--    convertInclude,-    convertModuleProvides,-    convertModuleProvidesU,--) where--import Prelude ()-import Distribution.Compat.Prelude hiding (mod)--import Distribution.Backpack.ModuleShape-import Distribution.Backpack.ModuleScope-import Distribution.Backpack.ModSubst-import Distribution.Backpack.FullUnitId-import Distribution.Backpack--import qualified Distribution.Utils.UnionFind as UnionFind-import Distribution.ModuleName-import Distribution.Package-import Distribution.PackageDescription-import Distribution.Pretty-import Distribution.Types.IncludeRenaming-import Distribution.Types.ComponentInclude-import Distribution.Types.AnnotatedId-import Distribution.Types.ModuleRenaming-import Distribution.Verbosity--import Data.STRef-import Data.Traversable-import Control.Monad.ST-import qualified Data.Map as Map-import qualified Data.Set as Set-import Data.IntMap (IntMap)-import qualified Data.IntMap as IntMap-import Text.PrettyPrint---- TODO: more detailed trace output on high verbosity would probably--- be appreciated by users debugging unification errors.  Collect--- some good examples!--data ErrMsg = ErrMsg {-        err_msg :: Doc,-        err_ctx :: [Doc]-    }-type MsgDoc = Doc--renderErrMsg :: ErrMsg -> MsgDoc-renderErrMsg ErrMsg { err_msg = msg, err_ctx = ctx } =-    msg $$ vcat ctx---- | The unification monad, this monad encapsulates imperative--- unification.-newtype UnifyM s a = UnifyM { unUnifyM :: UnifEnv s -> ST s (Maybe a) }---- | Run a computation in the unification monad.-runUnifyM :: Verbosity -> ComponentId -> FullDb -> (forall s. UnifyM s a) -> Either [MsgDoc] a-runUnifyM verbosity self_cid db m-    = runST $ do i    <- newSTRef 0-                 hmap <- newSTRef Map.empty-                 errs <- newSTRef []-                 mb_r <- unUnifyM m UnifEnv {-                            unify_uniq = i,-                            unify_reqs = hmap,-                            unify_self_cid = self_cid,-                            unify_verbosity = verbosity,-                            unify_ctx = [],-                            unify_db = db,-                            unify_errs = errs }-                 final_errs <- readSTRef errs-                 case mb_r of-                    Just x | null final_errs -> return (Right x)-                    _ -> return (Left (map renderErrMsg (reverse final_errs)))--- NB: GHC 7.6 throws a hissy fit if you pattern match on 'm'.--type ErrCtx s = MsgDoc---- | The unification environment.-data UnifEnv s = UnifEnv {-        -- | A supply of unique integers to label 'UnitIdU'-        -- cells.  This is used to determine loops in unit-        -- identifiers (which can happen with mutual recursion.)-        unify_uniq :: UnifRef s UnitIdUnique,-        -- | The set of requirements in scope.  When-        -- a provision is brought into scope, we unify with-        -- the requirement at the same module name to fill it.-        -- This mapping grows monotonically.-        unify_reqs :: UnifRef s (Map ModuleName (ModuleU s)),-        -- | Component id of the unit we're linking.  We use this-        -- to detect if we fill a requirement with a local module,-        -- which in principle should be OK but is not currently-        -- supported by GHC.-        unify_self_cid :: ComponentId,-        -- | How verbose the error message should be-        unify_verbosity :: Verbosity,-        -- | The error reporting context-        unify_ctx :: [ErrCtx s],-        -- | The package index for expanding unit identifiers-        unify_db :: FullDb,-        -- | Accumulated errors-        unify_errs :: UnifRef s [ErrMsg]-    }--instance Functor (UnifyM s) where-    fmap f (UnifyM m) = UnifyM (fmap (fmap (fmap f)) m)--instance Applicative (UnifyM s) where-    pure = UnifyM . pure . pure . pure-    UnifyM f <*> UnifyM x = UnifyM $ \r -> do-        f' <- f r-        case f' of-          Nothing -> return Nothing-          Just f'' -> do-              x' <- x r-              case x' of-                  Nothing -> return Nothing-                  Just x'' -> return (Just (f'' x''))--instance Monad (UnifyM s) where-    return = pure-    UnifyM m >>= f = UnifyM $ \r -> do-        x <- m r-        case x of-            Nothing -> return Nothing-            Just x' -> unUnifyM (f x') r---- | Lift a computation from 'ST' monad to 'UnifyM' monad.--- Internal use only.-liftST :: ST s a -> UnifyM s a-liftST m = UnifyM $ \_ -> fmap Just m--addErr :: MsgDoc -> UnifyM s ()-addErr msg = do-    env <- getUnifEnv-    let err = ErrMsg {-                err_msg = msg,-                err_ctx = unify_ctx env-              }-    liftST $ modifySTRef (unify_errs env) (\errs -> err:errs)--failWith :: MsgDoc -> UnifyM s a-failWith msg = do-    addErr msg-    failM--failM :: UnifyM s a-failM = UnifyM $ \_ -> return Nothing--failIfErrs :: UnifyM s ()-failIfErrs = do-    env <- getUnifEnv-    errs <- liftST $ readSTRef (unify_errs env)-    when (not (null errs)) failM--tryM :: UnifyM s a -> UnifyM s (Maybe a)-tryM m =-    UnifyM (\env -> do-        mb_r <- unUnifyM m env-        return (Just mb_r))--{--otherFail :: ErrMsg -> UnifyM s a-otherFail s = UnifyM $ \_ -> return (Left s)--unifyFail :: ErrMsg -> UnifyM s a-unifyFail err = do-    env <- getUnifEnv-    msg <- case unify_ctx env of-        Nothing -> return (text "Unspecified unification error:" <+> err)-        Just (ctx, mod1, mod2)-            | unify_verbosity env > normal-            -> do mod1' <- convertModuleU mod1-                  mod2' <- convertModuleU mod2-                  let extra = " (was unifying " ++ display mod1'-                                     ++ " and " ++ display mod2' ++ ")"-                  return (ctx ++ err ++ extra)-            | otherwise-            -> return (ctx ++ err ++ " (for more information, pass -v flag)")-    UnifyM $ \_ -> return (Left msg)--}---- | A convenient alias for mutable references in the unification monad.-type UnifRef s a = STRef s a---- | Imperatively read a 'UnifRef'.-readUnifRef :: UnifRef s a -> UnifyM s a-readUnifRef = liftST . readSTRef---- | Imperatively write a 'UnifRef'.-writeUnifRef :: UnifRef s a -> a -> UnifyM s ()-writeUnifRef x = liftST . writeSTRef x---- | Get the current unification environment.-getUnifEnv :: UnifyM s (UnifEnv s)-getUnifEnv = UnifyM $ \r -> return (return r)---- | Add a fixed message to the error context.-addErrContext :: Doc -> UnifyM s a -> UnifyM s a-addErrContext ctx m = addErrContextM ctx m---- | Add a message to the error context.  It may make monadic queries.-addErrContextM :: ErrCtx s -> UnifyM s a -> UnifyM s a-addErrContextM ctx m =-    UnifyM $ \r -> unUnifyM m r { unify_ctx = ctx : unify_ctx r }----------------------------------------------------------------------------- The "unifiable" variants of the data types------ In order to properly do unification over infinite trees, we--- need to union find over 'Module's and 'UnitId's.  The pure--- representation is ill-equipped to do this, so we convert--- from the pure representation into one which is indirected--- through union-find.  'ModuleU' handles hole variables;--- 'UnitIdU' handles mu-binders.---- | Contents of a mutable 'ModuleU' reference.-data ModuleU' s-    = ModuleU (UnitIdU s) ModuleName-    | ModuleVarU ModuleName---- | Contents of a mutable 'UnitIdU' reference.-data UnitIdU' s-    = UnitIdU UnitIdUnique ComponentId (Map ModuleName (ModuleU s))-    | UnitIdThunkU DefUnitId---- | A mutable version of 'Module' which can be imperatively unified.-type ModuleU s = UnionFind.Point s (ModuleU' s)---- | A mutable version of 'UnitId' which can be imperatively unified.-type UnitIdU s = UnionFind.Point s (UnitIdU' s)---- | An integer for uniquely labeling 'UnitIdU' nodes.  We need--- these labels in order to efficiently serialize 'UnitIdU's into--- 'UnitId's (we use the label to check if any parent is the--- node in question, and if so insert a deBruijn index instead.)--- These labels must be unique across all 'UnitId's/'Module's which--- participate in unification!-type UnitIdUnique = Int----------------------------------------------------------------------------- Conversion to the unifiable data types---- An environment for tracking the mu-bindings in scope.--- The invariant for a state @(m, i)@ is that [0..i] are--- keys of @m@; in fact, the @i-k@th entry is the @k@th--- de Bruijn index (this saves us from having to shift as--- we enter mu-binders.)-type MuEnv s = (IntMap (UnitIdU s), Int)--extendMuEnv :: MuEnv s -> UnitIdU s -> MuEnv s-extendMuEnv (m, i) x =-    (IntMap.insert (i + 1) x m, i + 1)--{--lookupMuEnv :: MuEnv s -> Int {- de Bruijn index -} -> UnitIdU s-lookupMuEnv (m, i) k =-    case IntMap.lookup (i - k) m of-        -- Technically a user can trigger this by giving us a-        -- bad 'UnitId', so handle this better.-        Nothing -> error "lookupMuEnv: out of bounds (malformed de Bruijn index)"-        Just v -> v--}--emptyMuEnv :: MuEnv s-emptyMuEnv = (IntMap.empty, -1)---- The workhorse functions.  These share an environment:---   * @UnifRef s UnitIdUnique@ - the unique label supply for 'UnitIdU' nodes---   * @UnifRef s (Map ModuleName moduleU)@ - the (lazily initialized)---     environment containing the implicitly universally quantified---     @hole:A@ binders.---   * @MuEnv@ - the environment for mu-binders.--convertUnitId' :: MuEnv s-               -> OpenUnitId-               -> UnifyM s (UnitIdU s)--- TODO: this could be more lazy if we know there are no internal--- references-convertUnitId' _ (DefiniteUnitId uid) =-    liftST $ UnionFind.fresh (UnitIdThunkU uid)-convertUnitId' stk (IndefFullUnitId cid insts) = do-    fs <- fmap unify_uniq getUnifEnv-    x <- liftST $ UnionFind.fresh (error "convertUnitId") -- tie the knot later-    insts_u <- for insts $ convertModule' (extendMuEnv stk x)-    u <- readUnifRef fs-    writeUnifRef fs (u+1)-    y <- liftST $ UnionFind.fresh (UnitIdU u cid insts_u)-    liftST $ UnionFind.union x y-    return y--- convertUnitId' stk (UnitIdVar i) = return (lookupMuEnv stk i)--convertModule' :: MuEnv s-               -> OpenModule -> UnifyM s (ModuleU s)-convertModule' _stk (OpenModuleVar mod_name) = do-    hmap <- fmap unify_reqs getUnifEnv-    hm <- readUnifRef hmap-    case Map.lookup mod_name hm of-        Nothing -> do mod <- liftST $ UnionFind.fresh (ModuleVarU mod_name)-                      writeUnifRef hmap (Map.insert mod_name mod hm)-                      return mod-        Just mod -> return mod-convertModule' stk (OpenModule uid mod_name) = do-    uid_u <- convertUnitId' stk uid-    liftST $ UnionFind.fresh (ModuleU uid_u mod_name)--convertUnitId :: OpenUnitId -> UnifyM s (UnitIdU s)-convertUnitId = convertUnitId' emptyMuEnv--convertModule :: OpenModule -> UnifyM s (ModuleU s)-convertModule = convertModule' emptyMuEnv------------------------------------------------------------------------------ Substitutions---- | The mutable counterpart of a 'ModuleSubst' (not defined here).-type ModuleSubstU s = Map ModuleName (ModuleU s)---- | Conversion of 'ModuleSubst' to 'ModuleSubstU'-convertModuleSubst :: Map ModuleName OpenModule -> UnifyM s (Map ModuleName (ModuleU s))-convertModuleSubst = traverse convertModule---- | Conversion of 'ModuleSubstU' to 'ModuleSubst'-convertModuleSubstU :: ModuleSubstU s -> UnifyM s OpenModuleSubst-convertModuleSubstU = traverse convertModuleU---------------------------------------------------------------------------- Conversion from the unifiable data types---- An environment for tracking candidates for adding a mu-binding.--- The invariant for a state @(m, i)@, is that if we encounter a node--- labeled @k@ such that @m[k -> v]@, then we can replace this--- node with the de Bruijn index @i-v@ referring to an enclosing--- mu-binder; furthermore, @range(m) = [0..i]@.-type MooEnv = (IntMap Int, Int)--emptyMooEnv :: MooEnv-emptyMooEnv = (IntMap.empty, -1)--extendMooEnv :: MooEnv -> UnitIdUnique -> MooEnv-extendMooEnv (m, i) k = (IntMap.insert k (i + 1) m, i + 1)--lookupMooEnv :: MooEnv -> UnitIdUnique -> Maybe Int-lookupMooEnv (m, i) k =-    case IntMap.lookup k m of-        Nothing -> Nothing-        Just v -> Just (i-v) -- de Bruijn indexize---- The workhorse functions--convertUnitIdU' :: MooEnv -> UnitIdU s -> UnifyM s OpenUnitId-convertUnitIdU' stk uid_u = do-    x <- liftST $ UnionFind.find uid_u-    case x of-        UnitIdThunkU uid -> return (DefiniteUnitId uid)-        UnitIdU u cid insts_u ->-            case lookupMooEnv stk u of-                Just _i ->-                    failWith (text "Unsupported mutually recursive unit identifier")-                    -- return (UnitIdVar i)-                Nothing -> do-                    insts <- for insts_u $ convertModuleU' (extendMooEnv stk u)-                    return (IndefFullUnitId cid insts)--convertModuleU' :: MooEnv -> ModuleU s -> UnifyM s OpenModule-convertModuleU' stk mod_u = do-    mod <- liftST $ UnionFind.find mod_u-    case mod of-        ModuleVarU mod_name -> return (OpenModuleVar mod_name)-        ModuleU uid_u mod_name -> do-            uid <- convertUnitIdU' stk uid_u-            return (OpenModule uid mod_name)---- Helper functions--convertUnitIdU :: UnitIdU s -> UnifyM s OpenUnitId-convertUnitIdU = convertUnitIdU' emptyMooEnv--convertModuleU :: ModuleU s -> UnifyM s OpenModule-convertModuleU = convertModuleU' emptyMooEnv---- | An empty 'ModuleScopeU'.-emptyModuleScopeU :: ModuleScopeU s-emptyModuleScopeU = (Map.empty, Map.empty)----- | The mutable counterpart of 'ModuleScope'.-type ModuleScopeU s = (ModuleProvidesU s, ModuleRequiresU s)--- | The mutable counterpart of 'ModuleProvides'-type ModuleProvidesU s = Map ModuleName [ModuleWithSourceU s]-type ModuleRequiresU s = ModuleProvidesU s-type ModuleWithSourceU s = WithSource (ModuleU s)---- TODO: Deduplicate this with Distribution.Backpack.MixLink.dispSource-ci_msg :: ComponentInclude (OpenUnitId, ModuleShape) IncludeRenaming -> Doc-ci_msg ci-  | ci_implicit ci = text "build-depends:" <+> pp_pn-  | otherwise = text "mixins:" <+> pp_pn <+> pretty (ci_renaming ci)-  where-    pn = pkgName (ci_pkgid ci)-    pp_pn =-        case ci_cname ci of-            CLibName LMainLibName -> pretty pn-            CLibName (LSubLibName cn) -> pretty pn <<>> colon <<>> pretty cn-            -- Shouldn't happen-            cn -> pretty pn <+> parens (pretty cn)---- | Convert a 'ModuleShape' into a 'ModuleScopeU', so we can do--- unification on it.-convertInclude-    :: ComponentInclude (OpenUnitId, ModuleShape) IncludeRenaming-    -> UnifyM s (ModuleScopeU s,-                 Either (ComponentInclude (UnitIdU s) ModuleRenaming) {- normal -}-                        (ComponentInclude (UnitIdU s) ModuleRenaming) {- sig -})-convertInclude ci@(ComponentInclude {-                    ci_ann_id = AnnotatedId {-                            ann_id = (uid, ModuleShape provs reqs),-                            ann_pid = pid,-                            ann_cname = compname-                        },-                    ci_renaming = incl@(IncludeRenaming prov_rns req_rns),-                    ci_implicit = implicit-               }) = addErrContext (text "In" <+> ci_msg ci) $ do-    let pn = packageName pid-        the_source | implicit-                   = FromBuildDepends pn compname-                   | otherwise-                   = FromMixins pn compname incl-        source = WithSource the_source--    -- Suppose our package has two requirements A and B, and-    -- we include it with @requires (A as X)@-    -- There are three closely related things we compute based-    -- off of @reqs@ and @reqs_rns@:-    ---    --      1. The requirement renaming (A -> X)-    --      2. The requirement substitution (A -> <X>, B -> <B>)--    -- Requirement renaming.  This is read straight off the syntax:-    ---    --      [nothing]          ==>  [empty]-    --      requires (B as Y)  ==>  B -> Y-    ---    -- Requirement renamings are NOT injective: if two requirements-    -- are mapped to the same name, the intent is to merge them-    -- together.  But they are *functions*, so @B as X, B as Y@ is-    -- illegal.--    req_rename_list <--      case req_rns of-        DefaultRenaming -> return []-        HidingRenaming _ -> do-            -- Not valid here for requires!-            addErr $ text "Unsupported syntax" <+>-                     quotes (text "requires hiding (...)")-            return []-        ModuleRenaming rns -> return rns--    let req_rename_listmap :: Map ModuleName [ModuleName]-        req_rename_listmap =-            Map.fromListWith (++) [ (k,[v]) | (k,v) <- req_rename_list ]-    req_rename <- sequenceA . flip Map.mapWithKey req_rename_listmap $ \k vs0 ->-      case vs0 of-        []  -> error "req_rename"-        [v] -> return v-        v:vs -> do addErr $-                    text "Conflicting renamings of requirement" <+> quotes (pretty k) $$-                    text "Renamed to: " <+> vcat (map pretty (v:vs))-                   return v--    let req_rename_fn k = case Map.lookup k req_rename of-                            Nothing -> k-                            Just v  -> v--    -- Requirement substitution.-    ---    --      A -> X      ==>     A -> <X>-    let req_subst = fmap OpenModuleVar req_rename--    uid_u <- convertUnitId (modSubst req_subst uid)--    -- Requirement mapping.  This is just taking the range of the-    -- requirement substitution, and making a mapping so that it is-    -- convenient to merge things together.  It INCLUDES the implicit-    -- mappings.-    ---    --      A -> X      ==>     X -> <X>, B -> <B>-    reqs_u <- convertModuleRequires . Map.fromList $-                [ (k, [source (OpenModuleVar k)])-                | k <- map req_rename_fn (Set.toList reqs)-                ]--    -- Report errors if there were unused renamings-    let leftover = Map.keysSet req_rename `Set.difference` reqs-    unless (Set.null leftover) $-        addErr $-            hang (text "The" <+> text (showComponentName compname) <+>-                  text "from package" <+> quotes (pretty pid)-                  <+> text "does not require:") 4-                 (vcat (map pretty (Set.toList leftover)))--    -- Provision computation is more complex.-    -- For example, if we have:-    ---    --      include p (A as X) requires (B as Y)-    --          where A -> q[B=<B>]:A-    ---    -- Then we need:-    ---    --      X -> [("p", q[B=<B>]:A)]-    ---    -- There are a bunch of clever ways to present the algorithm-    -- but here is the simple one:-    ---    --      1. If we have a default renaming, apply req_subst-    --      to provs and use that.-    ---    --      2. Otherwise, build a map by successively looking-    --      up the referenced modules in the renaming in provs.-    ---    -- Importantly, overlapping rename targets get accumulated-    -- together.  It's not an (immediate) error.-    (pre_prov_scope, prov_rns') <--        case prov_rns of-            DefaultRenaming -> return (Map.toList provs, prov_rns)-            HidingRenaming hides ->-                let hides_set = Set.fromList hides-                in let r = [ (k,v)-                           | (k,v) <- Map.toList provs-                           , not (k `Set.member` hides_set) ]-                   -- GHC doesn't understand hiding, so expand it out!-                   in return (r, ModuleRenaming (map ((\x -> (x,x)).fst) r))-            ModuleRenaming rns -> do-              r <- sequence-                [ case Map.lookup from provs of-                    Just m -> return (to, m)-                    Nothing -> failWith $-                        text "Package" <+> quotes (pretty pid) <+>-                        text "does not expose the module" <+> quotes (pretty from)-                | (from, to) <- rns ]-              return (r, prov_rns)-    let prov_scope = modSubst req_subst-                   $ Map.fromListWith (++)-                   [ (k, [source v])-                   | (k, v) <- pre_prov_scope ]--    provs_u <- convertModuleProvides prov_scope--    -- TODO: Assert that provs_u is empty if provs was empty-    return ((provs_u, reqs_u),-                -- NB: We test that requirements is not null so that-                -- users can create packages with zero module exports-                -- that cause some C library to linked in, etc.-                (if Map.null provs && not (Set.null reqs)-                    then Right -- is sig-                    else Left) (ComponentInclude {-                                    ci_ann_id = AnnotatedId {-                                            ann_id = uid_u,-                                            ann_pid = pid,-                                            ann_cname = compname-                                        },-                                    ci_renaming = prov_rns',-                                    ci_implicit = ci_implicit ci-                                    }))---- | Convert a 'ModuleScopeU' to a 'ModuleScope'.-convertModuleScopeU :: ModuleScopeU s -> UnifyM s ModuleScope-convertModuleScopeU (provs_u, reqs_u) = do-    provs <- convertModuleProvidesU provs_u-    reqs  <- convertModuleRequiresU reqs_u-    -- TODO: Test that the requirements are still free. If they-    -- are not, they got unified, and that's dodgy at best.-    return (ModuleScope provs reqs)---- | Convert a 'ModuleProvides' to a 'ModuleProvidesU'-convertModuleProvides :: ModuleProvides -> UnifyM s (ModuleProvidesU s)-convertModuleProvides = traverse (traverse (traverse convertModule))---- | Convert a 'ModuleProvidesU' to a 'ModuleProvides'-convertModuleProvidesU :: ModuleProvidesU s -> UnifyM s ModuleProvides-convertModuleProvidesU = traverse (traverse (traverse convertModuleU))--convertModuleRequires :: ModuleRequires -> UnifyM s (ModuleRequiresU s)-convertModuleRequires = convertModuleProvides--convertModuleRequiresU :: ModuleRequiresU s -> UnifyM s ModuleRequires-convertModuleRequiresU = convertModuleProvidesU