hackport 0.6.3 → 0.6.4

raw patch · 602 files changed

+23933/−22506 lines, 602 files

Files

• Cabal2Ebuild.hs +23/−19
• Main.hs +12/−9
• Merge.hs +22/−23
• Merge/Dependencies.hs +5/−5
• Portage/Cabal.hs +7/−7
• Portage/Dependency/Print.hs +9/−9
• Portage/GHCCore.hs +6/−5
• Portage/Overlay.hs +4/−4
• Portage/PackageId.hs +77/−96
• Portage/Resolve.hs +3/−3
• Portage/Use.hs +13/−15
• Portage/Version.hs +41/−38
• Status.hs +7/−6
• cabal/.gitattributes +3/−0
• cabal/.github/ISSUE_TEMPLATE/bug_report.md +30/−0
• cabal/.github/PULL_REQUEST_TEMPLATE.md +2/−1
• cabal/.gitignore +1/−0
• cabal/.mailmap +8/−1
• cabal/.travis.yml +14/−7
• cabal/AUTHORS +11/−1
• cabal/CONTRIBUTING.md +254/−0
• cabal/Cabal/Cabal.cabal +145/−20
• cabal/Cabal/ChangeLog.md +56/−3
• cabal/Cabal/Distribution/Backpack.hs +3/−45
• cabal/Cabal/Distribution/Backpack/ComponentsGraph.hs +9/−9
• cabal/Cabal/Distribution/Backpack/Configure.hs +11/−10
• cabal/Cabal/Distribution/Backpack/ConfiguredComponent.hs +41/−22
• cabal/Cabal/Distribution/Backpack/DescribeUnitId.hs +9/−9
• cabal/Cabal/Distribution/Backpack/Id.hs +10/−10
• cabal/Cabal/Distribution/Backpack/LinkedComponent.hs +11/−12
• cabal/Cabal/Distribution/Backpack/MixLink.hs +15/−15
• cabal/Cabal/Distribution/Backpack/ModuleScope.hs +9/−8
• cabal/Cabal/Distribution/Backpack/PreExistingComponent.hs +1/−1
• cabal/Cabal/Distribution/Backpack/ReadyComponent.hs +21/−10
• cabal/Cabal/Distribution/Backpack/UnifyM.hs +11/−11
• cabal/Cabal/Distribution/CabalSpecVersion.hs +58/−43
• cabal/Cabal/Distribution/Compat/CharParsing.hs +0/−8
• cabal/Cabal/Distribution/Compat/CopyFile.hs +108/−7
• cabal/Cabal/Distribution/Compat/Directory.hs +6/−1
• cabal/Cabal/Distribution/Compat/MonadFail.hs +2/−33
• cabal/Cabal/Distribution/Compat/Newtype.hs +45/−24
• cabal/Cabal/Distribution/Compat/Parsing.hs +1/−16
• cabal/Cabal/Distribution/Compat/Prelude.hs +45/−2
• cabal/Cabal/Distribution/Compat/ReadP.hs +0/−424
• cabal/Cabal/Distribution/Compat/ResponseFile.hs +68/−0
• cabal/Cabal/Distribution/Compat/Semigroup.hs +28/−87
• cabal/Cabal/Distribution/Compiler.hs +46/−49
• cabal/Cabal/Distribution/FieldGrammar.hs +1/−2
• cabal/Cabal/Distribution/FieldGrammar/Class.hs +38/−24
• cabal/Cabal/Distribution/FieldGrammar/FieldDescrs.hs +38/−11
• cabal/Cabal/Distribution/FieldGrammar/Parsec.hs +144/−33
• cabal/Cabal/Distribution/FieldGrammar/Pretty.hs +47/−26
• cabal/Cabal/Distribution/Fields.hs +42/−0
• cabal/Cabal/Distribution/Fields/ConfVar.hs +127/−0
• cabal/Cabal/Distribution/Fields/Field.hs +108/−0
• cabal/Cabal/Distribution/Fields/Lexer.hs +488/−0
• cabal/Cabal/Distribution/Fields/LexerMonad.hs +154/−0
• cabal/Cabal/Distribution/Fields/ParseResult.hs +185/−0
• cabal/Cabal/Distribution/Fields/Parser.hs +378/−0
• cabal/Cabal/Distribution/Fields/Pretty.hs +163/−0
• cabal/Cabal/Distribution/InstalledPackageInfo.hs +24/−33
• cabal/Cabal/Distribution/License.hs +3/−26
• cabal/Cabal/Distribution/Make.hs +4/−9
• cabal/Cabal/Distribution/ModuleName.hs +1/−19
• cabal/Cabal/Distribution/Package.hs +0/−6
• cabal/Cabal/Distribution/PackageDescription.hs +3/−3
• cabal/Cabal/Distribution/PackageDescription/Check.hs +182/−145
• cabal/Cabal/Distribution/PackageDescription/Configuration.hs +41/−41
• cabal/Cabal/Distribution/PackageDescription/FieldGrammar.hs +74/−65
• cabal/Cabal/Distribution/PackageDescription/Parsec.hs +156/−96
• cabal/Cabal/Distribution/PackageDescription/PrettyPrint.hs +99/−100
• cabal/Cabal/Distribution/PackageDescription/Quirks.hs +89/−0
• cabal/Cabal/Distribution/ParseUtils.hs +0/−715
• cabal/Cabal/Distribution/Parsec.hs +411/−0
• cabal/Cabal/Distribution/Parsec/Class.hs +0/−353
• cabal/Cabal/Distribution/Parsec/Common.hs +0/−100
• cabal/Cabal/Distribution/Parsec/ConfVar.hs +0/−125
• cabal/Cabal/Distribution/Parsec/Error.hs +21/−0
• cabal/Cabal/Distribution/Parsec/Field.hs +0/−96
• cabal/Cabal/Distribution/Parsec/FieldLineStream.hs +8/−13
• cabal/Cabal/Distribution/Parsec/Lexer.hs +0/−422
• cabal/Cabal/Distribution/Parsec/LexerMonad.hs +0/−153
• cabal/Cabal/Distribution/Parsec/Newtypes.hs +19/−63
• cabal/Cabal/Distribution/Parsec/ParseResult.hs +0/−184
• cabal/Cabal/Distribution/Parsec/Parser.hs +0/−378
• cabal/Cabal/Distribution/Parsec/Position.hs +44/−0
• cabal/Cabal/Distribution/Parsec/Warning.hs +52/−0
• cabal/Cabal/Distribution/Pretty.hs +16/−8
• cabal/Cabal/Distribution/PrettyUtils.hs +0/−23
• cabal/Cabal/Distribution/ReadE.hs +2/−17
• cabal/Cabal/Distribution/SPDX/License.hs +1/−1
• cabal/Cabal/Distribution/SPDX/LicenseExceptionId.hs +48/−10
• cabal/Cabal/Distribution/SPDX/LicenseExpression.hs +1/−1
• cabal/Cabal/Distribution/SPDX/LicenseId.hs +156/−31
• cabal/Cabal/Distribution/SPDX/LicenseListVersion.hs +2/−0
• cabal/Cabal/Distribution/SPDX/LicenseReference.hs +1/−1
• cabal/Cabal/Distribution/Simple.hs +107/−107
• cabal/Cabal/Distribution/Simple/Bench.hs +2/−2
• cabal/Cabal/Distribution/Simple/Build.hs +55/−51
• cabal/Cabal/Distribution/Simple/Build/Macros.hs +13/−15
• cabal/Cabal/Distribution/Simple/Build/PathsModule.hs +8/−7
• cabal/Cabal/Distribution/Simple/BuildPaths.hs +35/−28
• cabal/Cabal/Distribution/Simple/BuildTarget.hs +59/−35
• cabal/Cabal/Distribution/Simple/Command.hs +2/−73
• cabal/Cabal/Distribution/Simple/Compiler.hs +3/−3
• cabal/Cabal/Distribution/Simple/Configure.hs +247/−167
• cabal/Cabal/Distribution/Simple/Doctest.hs +1/−1
• cabal/Cabal/Distribution/Simple/GHC.hs +134/−68
• cabal/Cabal/Distribution/Simple/GHC/Internal.hs +11/−9
• cabal/Cabal/Distribution/Simple/GHCJS.hs +1814/−879
• cabal/Cabal/Distribution/Simple/Glob.hs +17/−6
• cabal/Cabal/Distribution/Simple/Haddock.hs +35/−17
• cabal/Cabal/Distribution/Simple/HaskellSuite.hs +18/−15
• cabal/Cabal/Distribution/Simple/Install.hs +19/−29
• cabal/Cabal/Distribution/Simple/InstallDirs.hs +15/−126
• cabal/Cabal/Distribution/Simple/InstallDirs/Internal.hs +124/−0
• cabal/Cabal/Distribution/Simple/LocalBuildInfo.hs +38/−59
• cabal/Cabal/Distribution/Simple/PackageIndex.hs +25/−40
• cabal/Cabal/Distribution/Simple/PreProcess.hs +20/−11
• cabal/Cabal/Distribution/Simple/PreProcess/Unlit.hs +2/−1
• cabal/Cabal/Distribution/Simple/Program.hs +0/−58
• cabal/Cabal/Distribution/Simple/Program/Db.hs +3/−3
• cabal/Cabal/Distribution/Simple/Program/Find.hs +10/−1
• cabal/Cabal/Distribution/Simple/Program/GHC.hs +21/−27
• cabal/Cabal/Distribution/Simple/Program/HcPkg.hs +17/−17
• cabal/Cabal/Distribution/Simple/Program/Hpc.hs +4/−4
• cabal/Cabal/Distribution/Simple/Program/Ld.hs +0/−1
• cabal/Cabal/Distribution/Simple/Register.hs +13/−10
• cabal/Cabal/Distribution/Simple/Setup.hs +213/−112
• cabal/Cabal/Distribution/Simple/ShowBuildInfo.hs +158/−0
• cabal/Cabal/Distribution/Simple/SrcDist.hs +29/−24
• cabal/Cabal/Distribution/Simple/Test.hs +3/−3
• cabal/Cabal/Distribution/Simple/Test/ExeV10.hs +8/−3
• cabal/Cabal/Distribution/Simple/Test/LibV09.hs +14/−8
• cabal/Cabal/Distribution/Simple/Test/Log.hs +5/−3
• cabal/Cabal/Distribution/Simple/UHC.hs +11/−10
• cabal/Cabal/Distribution/Simple/UserHooks.hs +0/−18
• cabal/Cabal/Distribution/Simple/Utils.hs +80/−107
• cabal/Cabal/Distribution/Simple/Utils/Json.hs +46/−0
• cabal/Cabal/Distribution/System.hs +15/−43
• cabal/Cabal/Distribution/Text.hs +9/−99
• cabal/Cabal/Distribution/Types/AbiDependency.hs +2/−12
• cabal/Cabal/Distribution/Types/AbiHash.hs +1/−6
• cabal/Cabal/Distribution/Types/BenchmarkType.hs +1/−9
• cabal/Cabal/Distribution/Types/BuildInfo.hs +25/−15
• cabal/Cabal/Distribution/Types/BuildInfo/Lens.hs +19/−5
• cabal/Cabal/Distribution/Types/BuildType.hs +2/−15
• cabal/Cabal/Distribution/Types/Component.hs +1/−1
• cabal/Cabal/Distribution/Types/ComponentId.hs +2/−8
• cabal/Cabal/Distribution/Types/ComponentName.hs +30/−44
• cabal/Cabal/Distribution/Types/ComponentRequestedSpec.hs +3/−2
• cabal/Cabal/Distribution/Types/CondTree.hs +4/−4
• cabal/Cabal/Distribution/Types/Dependency.hs +65/−20
• cabal/Cabal/Distribution/Types/DependencyMap.hs +13/−5
• cabal/Cabal/Distribution/Types/ExeDependency.hs +1/−13
• cabal/Cabal/Distribution/Types/ExecutableScope.hs +1/−9
• cabal/Cabal/Distribution/Types/ExposedModule.hs +2/−15
• cabal/Cabal/Distribution/Types/ForeignLib.hs +1/−15
• cabal/Cabal/Distribution/Types/ForeignLibOption.hs +1/−8
• cabal/Cabal/Distribution/Types/ForeignLibType.hs +1/−9
• cabal/Cabal/Distribution/Types/GenericPackageDescription.hs +4/−28
• cabal/Cabal/Distribution/Types/GenericPackageDescription/Lens.hs +24/−22
• cabal/Cabal/Distribution/Types/GivenComponent.hs +28/−0
• cabal/Cabal/Distribution/Types/IncludeRenaming.hs +1/−10
• cabal/Cabal/Distribution/Types/InstalledPackageInfo.hs +11/−11
• cabal/Cabal/Distribution/Types/InstalledPackageInfo/FieldGrammar.hs +89/−55
• cabal/Cabal/Distribution/Types/InstalledPackageInfo/Lens.hs +7/−2
• cabal/Cabal/Distribution/Types/LegacyExeDependency.hs +1/−20
• cabal/Cabal/Distribution/Types/Library.hs +45/−36
• cabal/Cabal/Distribution/Types/Library/Lens.hs +13/−8
• cabal/Cabal/Distribution/Types/LibraryName.hs +72/−0
• cabal/Cabal/Distribution/Types/LibraryVisibility.hs +49/−0
• cabal/Cabal/Distribution/Types/LocalBuildInfo.hs +8/−42
• cabal/Cabal/Distribution/Types/Mixin.hs +1/−10
• cabal/Cabal/Distribution/Types/Module.hs +1/−10
• cabal/Cabal/Distribution/Types/ModuleReexport.hs +1/−17
• cabal/Cabal/Distribution/Types/ModuleRenaming.hs +49/−55
• cabal/Cabal/Distribution/Types/MungedPackageId.hs +51/−24
• cabal/Cabal/Distribution/Types/MungedPackageName.hs +77/−62
• cabal/Cabal/Distribution/Types/PackageDescription.hs +2/−16
• cabal/Cabal/Distribution/Types/PackageDescription/Lens.hs +28/−38
• cabal/Cabal/Distribution/Types/PackageId.hs +40/−22
• cabal/Cabal/Distribution/Types/PackageName.hs +1/−6
• cabal/Cabal/Distribution/Types/PackageName/Magic.hs +20/−0
• cabal/Cabal/Distribution/Types/PackageVersionConstraint.hs +39/−0
• cabal/Cabal/Distribution/Types/PkgconfigDependency.hs +4/−15
• cabal/Cabal/Distribution/Types/PkgconfigName.hs +1/−7
• cabal/Cabal/Distribution/Types/PkgconfigVersion.hs +105/−0
• cabal/Cabal/Distribution/Types/PkgconfigVersionRange.hs +142/−0
• cabal/Cabal/Distribution/Types/SourceRepo.hs +2/−13
• cabal/Cabal/Distribution/Types/TestType.hs +1/−8
• cabal/Cabal/Distribution/Types/UnitId.hs +4/−13
• cabal/Cabal/Distribution/Types/UnqualComponentName.hs +5/−6
• cabal/Cabal/Distribution/Types/Version.hs +17/−37
• cabal/Cabal/Distribution/Types/VersionInterval.hs +4/−1
• cabal/Cabal/Distribution/Types/VersionRange.hs +3/−425
• cabal/Cabal/Distribution/Types/VersionRange/Internal.hs +433/−0
• cabal/Cabal/Distribution/Utils/NubList.hs +2/−1
• cabal/Cabal/Distribution/Verbosity.hs +48/−49
• cabal/Cabal/Distribution/Verbosity/Internal.hs +23/−0
• cabal/Cabal/Distribution/Version.hs +2/−69
• cabal/Cabal/Language/Haskell/Extension.hs +13/−28
• cabal/Cabal/Makefile +9/−11
• cabal/Cabal/doc/cabaldomain.py +33/−4
• cabal/Cabal/doc/conf.py +4/−4
• cabal/Cabal/doc/developing-packages.rst +321/−70
• cabal/Cabal/doc/file-format-changelog.rst +78/−10
• cabal/Cabal/doc/hcar/.gitignore +5/−0
• cabal/Cabal/doc/hcar/Cabal-201604.tex +118/−0
• cabal/Cabal/doc/hcar/Cabal-201611.tex +140/−0
• cabal/Cabal/doc/hcar/Cabal-201811.tex +121/−0
• cabal/Cabal/doc/hcar/hcar.sty +186/−0
• cabal/Cabal/doc/hcar/main.tex +11/−0
• cabal/Cabal/doc/installing-packages.rst +31/−6
• cabal/Cabal/doc/nix-local-build-overview.rst +4/−4
• cabal/Cabal/doc/nix-local-build.rst +223/−133
• cabal/Cabal/doc/references.inc +2/−0
• cabal/Makefile +58/−14
• cabal/README.md +3/−250
• cabal/appveyor.yml +26/−5
• cabal/boot/Lexer.x +4/−4
• cabal/boot/SPDX.LicenseExceptionId.template.hs +18/−2
• cabal/boot/SPDX.LicenseId.template.hs +20/−2
• cabal/cabal-dev-scripts/cabal-dev-scripts.cabal +4/−4
• cabal/cabal-dev-scripts/src/GenSPDX.hs +29/−18
• cabal/cabal-dev-scripts/src/GenSPDXExc.hs +29/−18
• cabal/cabal-dev-scripts/src/GenUtils.hs +25/−0
• cabal/cabal-install/.gitignore +4/−0
• cabal/cabal-install/Distribution/Client/BuildReports/Anonymous.hs +3/−3
• cabal/cabal-install/Distribution/Client/BuildReports/Types.hs +2/−2
• cabal/cabal-install/Distribution/Client/BuildReports/Upload.hs +1/−1
• cabal/cabal-install/Distribution/Client/Check.hs +6/−2
• cabal/cabal-install/Distribution/Client/CmdBench.hs +15/−13
• cabal/cabal-install/Distribution/Client/CmdBuild.hs +34/−21
• cabal/cabal-install/Distribution/Client/CmdClean.hs +1/−1
• cabal/cabal-install/Distribution/Client/CmdConfigure.hs +18/−16
• cabal/cabal-install/Distribution/Client/CmdErrorMessages.hs +7/−3
• cabal/cabal-install/Distribution/Client/CmdExec.hs +14/−10
• cabal/cabal-install/Distribution/Client/CmdFreeze.hs +17/−15
• cabal/cabal-install/Distribution/Client/CmdHaddock.hs +12/−10
• cabal/cabal-install/Distribution/Client/CmdInstall.hs +328/−237
• cabal/cabal-install/Distribution/Client/CmdInstall/ClientInstallFlags.hs +105/−0
• cabal/cabal-install/Distribution/Client/CmdLegacy.hs +30/−50
• cabal/cabal-install/Distribution/Client/CmdRepl.hs +83/−48
• cabal/cabal-install/Distribution/Client/CmdRun.hs +130/−69
• cabal/cabal-install/Distribution/Client/CmdSdist.hs +47/−73
• cabal/cabal-install/Distribution/Client/CmdTest.hs +50/−25
• cabal/cabal-install/Distribution/Client/CmdUpdate.hs +27/−21
• cabal/cabal-install/Distribution/Client/Compat/Prelude.hs +1/−4
• cabal/cabal-install/Distribution/Client/Config.hs +196/−38
• cabal/cabal-install/Distribution/Client/Configure.hs +16/−8
• cabal/cabal-install/Distribution/Client/Dependency.hs +43/−18
• cabal/cabal-install/Distribution/Client/Dependency/Types.hs +2/−2
• cabal/cabal-install/Distribution/Client/DistDirLayout.hs +7/−12
• cabal/cabal-install/Distribution/Client/Fetch.hs +7/−1
• cabal/cabal-install/Distribution/Client/FetchUtils.hs +1/−1
• cabal/cabal-install/Distribution/Client/Freeze.hs +7/−1
• cabal/cabal-install/Distribution/Client/GenBounds.hs +5/−5
• cabal/cabal-install/Distribution/Client/Get.hs +12/−7
• cabal/cabal-install/Distribution/Client/Glob.hs +3/−3
• cabal/cabal-install/Distribution/Client/HttpUtils.hs +5/−5
• cabal/cabal-install/Distribution/Client/IndexUtils.hs +5/−5
• cabal/cabal-install/Distribution/Client/IndexUtils/Timestamp.hs +3/−3
• cabal/cabal-install/Distribution/Client/Init.hs +286/−34
• cabal/cabal-install/Distribution/Client/Init/Heuristics.hs +4/−4
• cabal/cabal-install/Distribution/Client/Init/Types.hs +13/−7
• cabal/cabal-install/Distribution/Client/Install.hs +82/−58
• cabal/cabal-install/Distribution/Client/InstallPlan.hs +2/−2
• cabal/cabal-install/Distribution/Client/InstallSymlink.hs +17/−3
• cabal/cabal-install/Distribution/Client/List.hs +3/−3
• cabal/cabal-install/Distribution/Client/Outdated.hs +16/−17
• cabal/cabal-install/Distribution/Client/PackageHash.hs +7/−4
• cabal/cabal-install/Distribution/Client/PackageUtils.hs +8/−10
• cabal/cabal-install/Distribution/Client/ParseUtils.hs +120/−25
• cabal/cabal-install/Distribution/Client/ProjectBuilding.hs +103/−70
• cabal/cabal-install/Distribution/Client/ProjectConfig.hs +80/−50
• cabal/cabal-install/Distribution/Client/ProjectConfig/Legacy.hs +147/−109
• cabal/cabal-install/Distribution/Client/ProjectConfig/Types.hs +26/−7
• cabal/cabal-install/Distribution/Client/ProjectOrchestration.hs +105/−63
• cabal/cabal-install/Distribution/Client/ProjectPlanOutput.hs +1/−1
• cabal/cabal-install/Distribution/Client/ProjectPlanning.hs +121/−53
• cabal/cabal-install/Distribution/Client/ProjectPlanning/Types.hs +35/−20
• cabal/cabal-install/Distribution/Client/Run.hs +1/−1
• cabal/cabal-install/Distribution/Client/Sandbox.hs +3/−2
• cabal/cabal-install/Distribution/Client/Sandbox/PackageEnvironment.hs +4/−4
• cabal/cabal-install/Distribution/Client/Sandbox/Timestamp.hs +1/−1
• cabal/cabal-install/Distribution/Client/Security/HTTP.hs +1/−1
• cabal/cabal-install/Distribution/Client/Setup.hs +333/−232
• cabal/cabal-install/Distribution/Client/SetupWrapper.hs +10/−11
• cabal/cabal-install/Distribution/Client/SolverInstallPlan.hs +1/−1
• cabal/cabal-install/Distribution/Client/SourceRepoParse.hs +5/−4
• cabal/cabal-install/Distribution/Client/SrcDist.hs +7/−47
• cabal/cabal-install/Distribution/Client/Store.hs +1/−1
• cabal/cabal-install/Distribution/Client/TargetSelector.hs +16/−17
• cabal/cabal-install/Distribution/Client/Targets.hs +15/−11
• cabal/cabal-install/Distribution/Client/Types.hs +10/−8
• cabal/cabal-install/Distribution/Client/Update.hs +1/−1
• cabal/cabal-install/Distribution/Client/Upload.hs +39/−35
• cabal/cabal-install/Distribution/Client/Utils/Parsec.hs +102/−0
• cabal/cabal-install/Distribution/Client/World.hs +4/−4
• cabal/cabal-install/Distribution/Deprecated/ParseUtils.hs +724/−0
• cabal/cabal-install/Distribution/Deprecated/ReadP.hs +480/−0
• cabal/cabal-install/Distribution/Deprecated/Text.hs +410/−0
• cabal/cabal-install/Distribution/Deprecated/ViewAsFieldDescr.hs +85/−0
• cabal/cabal-install/Distribution/Solver/Compat/Prelude.hs +1/−1
• cabal/cabal-install/Distribution/Solver/Modular.hs +205/−41
• cabal/cabal-install/Distribution/Solver/Modular/Builder.hs +2/−6
• cabal/cabal-install/Distribution/Solver/Modular/ConflictSet.hs +14/−0
• cabal/cabal-install/Distribution/Solver/Modular/Dependency.hs +2/−1
• cabal/cabal-install/Distribution/Solver/Modular/Explore.hs +48/−29
• cabal/cabal-install/Distribution/Solver/Modular/IndexConversion.hs +4/−4
• cabal/cabal-install/Distribution/Solver/Modular/Log.hs +9/−34
• cabal/cabal-install/Distribution/Solver/Modular/Message.hs +9/−9
• cabal/cabal-install/Distribution/Solver/Modular/Package.hs +1/−1
• cabal/cabal-install/Distribution/Solver/Modular/Preference.hs +10/−0
• cabal/cabal-install/Distribution/Solver/Modular/Solver.hs +14/−2
• cabal/cabal-install/Distribution/Solver/Modular/Tree.hs +4/−1
• cabal/cabal-install/Distribution/Solver/Modular/Validate.hs +3/−2
• cabal/cabal-install/Distribution/Solver/Modular/Version.hs +1/−1
• cabal/cabal-install/Distribution/Solver/Types/ComponentDeps.hs +10/−18
• cabal/cabal-install/Distribution/Solver/Types/InstSolverPackage.hs +1/−2
• cabal/cabal-install/Distribution/Solver/Types/PackageConstraint.hs +4/−2
• cabal/cabal-install/Distribution/Solver/Types/PackageIndex.hs +11/−8
• cabal/cabal-install/Distribution/Solver/Types/PackagePath.hs +1/−1
• cabal/cabal-install/Distribution/Solver/Types/PkgConfigDb.hs +19/−30
• cabal/cabal-install/Distribution/Solver/Types/Settings.hs +30/−0
• cabal/cabal-install/README.md +1/−1
• cabal/cabal-install/bash-completion/cabal +184/−32
• cabal/cabal-install/bootstrap.sh +26/−13
• cabal/cabal-install/cabal-install.cabal +19/−7
• cabal/cabal-install/cabal-install.cabal.pp +27/−9
• cabal/cabal-install/changelog +44/−4
• cabal/cabal-install/main/Main.hs +36/−39
• cabal/cabal-install/solver-dsl/UnitTests/Distribution/Solver/Modular/DSL.hs +15/−4
• cabal/cabal-install/tests/IntegrationTests2.hs +35/−30
• cabal/cabal-install/tests/UnitTests/Distribution/Client/ArbitraryInstances.hs +24/−2
• cabal/cabal-install/tests/UnitTests/Distribution/Client/FileMonitor.hs +2/−1
• cabal/cabal-install/tests/UnitTests/Distribution/Client/GenericInstances.hs +10/−0
• cabal/cabal-install/tests/UnitTests/Distribution/Client/Glob.hs +2/−2
• cabal/cabal-install/tests/UnitTests/Distribution/Client/IndexUtils/Timestamp.hs +1/−1
• cabal/cabal-install/tests/UnitTests/Distribution/Client/InstallPlan.hs +2/−2
• cabal/cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs +132/−56
• cabal/cabal-install/tests/UnitTests/Distribution/Client/Targets.hs +4/−3
• cabal/cabal-install/tests/UnitTests/Distribution/Client/TreeDiffInstances.hs +106/−0
• cabal/cabal-install/tests/UnitTests/Distribution/Solver/Modular/DSL/TestCaseUtils.hs +17/−2
• cabal/cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck.hs +3/−2
• cabal/cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs +120/−1
• cabal/cabal-testsuite/PackageTests/AllowNewer/cabal.test.hs +16/−16
• cabal/cabal-testsuite/PackageTests/AllowOlder/cabal.test.hs +16/−16
• cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.out +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external-target.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.out +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-external.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.out +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal-target.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.out +3/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes2/cabal-internal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.out +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-external.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.out +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Includes3/cabal-internal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/Reexport2/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Backpack/T5634/Go.hs +5/−0
• cabal/cabal-testsuite/PackageTests/Backpack/T5634/T5634.cabal +22/−0
• cabal/cabal-testsuite/PackageTests/Backpack/T5634/Unused.hsig +1/−0
• cabal/cabal-testsuite/PackageTests/Backpack/T5634/impl/Impl.hs +1/−0
• cabal/cabal-testsuite/PackageTests/Backpack/T5634/setup.cabal.out +17/−0
• cabal/cabal-testsuite/PackageTests/Backpack/T5634/setup.out +16/−0
• cabal/cabal-testsuite/PackageTests/Backpack/T5634/setup.test.hs +5/−0
• cabal/cabal-testsuite/PackageTests/Backpack/T5634/sig-with-th/Sig.hsig +1/−0
• cabal/cabal-testsuite/PackageTests/Backpack/T5634/sig-with-th/THFuns.hs +2/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/Main.hs +2/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/bkpcabal01.cabal +36/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.out +34/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.project +1/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/cabal.test.hs +5/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/impl/H.hs +2/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/impl/I.hs +1/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/p/H.hsig +2/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/p/P.hs +4/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/q/I.hsig +1/−0
• cabal/cabal-testsuite/PackageTests/Backpack/bkpcabal01/q/Q.hs +3/−0
• cabal/cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/BuildDeps/DepCycle/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/BuildDeps/InternalLibrary1/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.out +2/−2
• cabal/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackage/use-local-version-of-package.test.hs +3/−3
• cabal/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.out +1/−1
• cabal/cabal-testsuite/PackageTests/BuildTargets/UseLocalPackageForSetup/use-local-package-as-setup-dep.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/BuildToolDepends/setup.out +1/−1
• cabal/cabal-testsuite/PackageTests/BuildToolDepends/setup.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/BuildTools/External/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/BuildTools/External/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.out +2/−1
• cabal/cabal-testsuite/PackageTests/BuildTools/Internal/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/CaretOperator/setup.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Check/DifferentGhcOptions/cabal.out +8/−0
• cabal/cabal-testsuite/PackageTests/Check/DifferentGhcOptions/cabal.test.hs +2/−0
• cabal/cabal-testsuite/PackageTests/Check/DifferentGhcOptions/pkg.cabal +15/−0
• cabal/cabal-testsuite/PackageTests/ConfigureComponent/SubLib/setup-explicit-fail.out +1/−1
• cabal/cabal-testsuite/PackageTests/ConfigureComponent/SubLib/setup-explicit.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/CustomDep/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/CustomPlain/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/CustomSegfault/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/CustomSegfault/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/CustomWithoutCabal/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/CustomWithoutCabalDefaultMain/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/Exec/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/Exec/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Exec/sandbox-hc-pkg.test.hs +3/−2
• cabal/cabal-testsuite/PackageTests/ExecModern/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/ExecModern/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/InternalLibraries/Executable/setup-static.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/InternalLibraries/cabal-per-package.out +1/−1
• cabal/cabal-testsuite/PackageTests/InternalLibraries/cabal-per-package.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/InternalLibraries/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/InternalLibraries/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.cabal.out +13/−0
• cabal/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.out +13/−0
• cabal/cabal-testsuite/PackageTests/InternalVersions/BuildDependsExtra/setup.test.hs +2/−4
• cabal/cabal-testsuite/PackageTests/MultipleLibraries/cabal.out +12/−0
• cabal/cabal-testsuite/PackageTests/MultipleLibraries/cabal.project +4/−0
• cabal/cabal-testsuite/PackageTests/MultipleLibraries/cabal.test.hs +4/−0
• cabal/cabal-testsuite/PackageTests/MultipleLibraries/d/d.cabal +12/−0
• cabal/cabal-testsuite/PackageTests/MultipleLibraries/p/p.cabal +8/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdBench/MultipleBenchmarks/cabal.out +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdBench/MultipleBenchmarks/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdExec/GhcInvocation/cabal.out +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdExec/GhcInvocation/cabal.test.hs +3/−3
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdExec/RunExe/cabal.out +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdExec/RunExe/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/cabal.out +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/Datafiles/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExeAndLib/cabal.out +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExeAndLib/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExitCodePropagation/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/ExitCodePropagation/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultipleExes/cabal.out +5/−5
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultipleExes/cabal.test.hs +5/−5
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.out +8/−8
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/MultiplePackages/cabal.test.hs +8/−8
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out +8/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.project +1/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.test.hs +5/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/script.cabal +4/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/script.hs +11/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out +8/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.project +1/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.test.hs +5/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/script.cabal +4/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/ScriptLiterate/script.lhs +18/−0
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/Single/cabal.out +6/−6
• cabal/cabal-testsuite/PackageTests/NewBuild/CmdRun/Single/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/CustomSetup/LocalPackageWithCustomSetup/build-local-package-with-custom-setup.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/CustomSetup/RemotePackageWithCustomSetup/build-package-from-repo-with-custom-setup.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.out +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/MonitorCabalFiles/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/T3460/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T3827/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T3978/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T4017/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T4288/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T4375/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T4375/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.out +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/T4405/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/T4450/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/NewBuild/T4477/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T4477/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewBuild/T5164/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewConfigure/LocalConfigOverwrite/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.out +3/−3
• cabal/cabal-testsuite/PackageTests/NewFreeze/BuildTools/new_freeze.test.hs +4/−4
• cabal/cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.out +3/−3
• cabal/cabal-testsuite/PackageTests/NewFreeze/Flags/new_freeze.test.hs +4/−4
• cabal/cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.out +6/−6
• cabal/cabal-testsuite/PackageTests/NewFreeze/FreezeFile/new_freeze.test.hs +10/−10
• cabal/cabal-testsuite/PackageTests/NewHaddock/Fails/Example.hs +6/−0
• cabal/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out +15/−0
• cabal/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.project +1/−0
• cabal/cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.test.hs +6/−0
• cabal/cabal-testsuite/PackageTests/NewHaddock/Fails/example.cabal +9/−0
• cabal/cabal-testsuite/PackageTests/NewSdist/DeterministicTrivial/deterministic.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/DeterministicTrivial/deterministic.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/Globbing/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/Globbing/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/ManyDataFiles/many-data-files.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/ManyDataFiles/many-data-files.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-output-dir.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-output-dir.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all-test-sute.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/all.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/list-sources-output-dir.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/list-sources-output-dir.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-archive-to-stdout.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-archive-to-stdout.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-list-sources.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-list-sources.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-target.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/multi-target.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/target-remote-package.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/target-remote-package.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.out +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/MultiTarget/valid-and-test-suite.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/NewSdist/NullTerminated/cabal.out binary
• cabal/cabal-testsuite/PackageTests/NewSdist/NullTerminated/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Outdated/outdated-project-file.out +1/−1
• cabal/cabal-testsuite/PackageTests/Outdated/outdated-project-file.test.hs +3/−3
• cabal/cabal-testsuite/PackageTests/Outdated/outdated_freeze.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Regression/T3436/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/Regression/T3932/cabal.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.out +1/−1
• cabal/cabal-testsuite/PackageTests/Regression/T4154/install-time-with-constraint.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/Regression/T4202/cabal.out +3/−3
• cabal/cabal-testsuite/PackageTests/Regression/T4202/cabal.test.hs +3/−3
• cabal/cabal-testsuite/PackageTests/Regression/T4291/dependee/Dependee.hs +1/−0
• cabal/cabal-testsuite/PackageTests/Regression/T4291/dependee/dependee.cabal +11/−0
• cabal/cabal-testsuite/PackageTests/Regression/T4291/depender/depender.cabal +10/−0
• cabal/cabal-testsuite/PackageTests/Regression/T4291/setup.cabal.out +20/−0
• cabal/cabal-testsuite/PackageTests/Regression/T4291/setup.out +18/−0
• cabal/cabal-testsuite/PackageTests/Regression/T4291/setup.test.hs +17/−0
• cabal/cabal-testsuite/PackageTests/Regression/T4720/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/Regression/T4720/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Regression/T4986/cabal.out +1/−1
• cabal/cabal-testsuite/PackageTests/Regression/T4986/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Regression/T5309/cabal.out +6/−3
• cabal/cabal-testsuite/PackageTests/Regression/T5309/cabal.test.hs +3/−3
• cabal/cabal-testsuite/PackageTests/Regression/T5386/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/Regression/T5409/use-different-versions-of-dependency-for-library-and-build-tool.test.hs +2/−2
• cabal/cabal-testsuite/PackageTests/Regression/T5677/cabal.out +2/−1
• cabal/cabal-testsuite/PackageTests/Regression/T5677/cabal.test.hs +1/−2
• cabal/cabal-testsuite/PackageTests/Regression/T6125/Main.hs +1/−0
• cabal/cabal-testsuite/PackageTests/Regression/T6125/data/foo/bar.html +1/−0
• cabal/cabal-testsuite/PackageTests/Regression/T6125/myprog.cabal +9/−0
• cabal/cabal-testsuite/PackageTests/Regression/T6125/setup.cabal.out +9/−0
• cabal/cabal-testsuite/PackageTests/Regression/T6125/setup.out +8/−0
• cabal/cabal-testsuite/PackageTests/Regression/T6125/setup.test.hs +6/−0
• cabal/cabal-testsuite/PackageTests/RequireExplicit/FlagInProject/a.cabal +7/−0
• cabal/cabal-testsuite/PackageTests/RequireExplicit/FlagInProject/cabal.project +3/−0
• cabal/cabal-testsuite/PackageTests/RequireExplicit/FlagInProject/cabal.test.hs +6/−0
• cabal/cabal-testsuite/PackageTests/RequireExplicit/MultiPkg/a/a.cabal +8/−0
• cabal/cabal-testsuite/PackageTests/RequireExplicit/MultiPkg/b/b.cabal +10/−0
• cabal/cabal-testsuite/PackageTests/RequireExplicit/MultiPkg/cabal.project +6/−0
• cabal/cabal-testsuite/PackageTests/RequireExplicit/MultiPkg/cabal.test.hs +16/−0
• cabal/cabal-testsuite/PackageTests/RequireExplicit/repo/other-lib-1.0/other-lib.cabal +7/−0
• cabal/cabal-testsuite/PackageTests/RequireExplicit/repo/some-exe-1.0/some-exe.cabal +6/−0
• cabal/cabal-testsuite/PackageTests/RequireExplicit/repo/some-lib-1.0/some-lib.cabal +7/−0
• cabal/cabal-testsuite/PackageTests/SPDX/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/SimpleDefault/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal-with-hpc.multitest.hs +1/−1
• cabal/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.out +3/−1
• cabal/cabal-testsuite/PackageTests/TestSuiteTests/ExeV10/cabal.test.hs +1/−1
• cabal/cabal-testsuite/PackageTests/UserConfig/cabal.out +6/−0
• cabal/cabal-testsuite/PackageTests/UserConfig/cabal.test.hs +4/−0
• cabal/cabal-testsuite/Setup.hs +75/−7
• cabal/cabal-testsuite/Setup.simple.hs +6/−0
• cabal/cabal-testsuite/Test/Cabal/Monad.hs +8/−10
• cabal/cabal-testsuite/Test/Cabal/Plan.hs +7/−6
• cabal/cabal-testsuite/Test/Cabal/Prelude.hs +12/−9
• cabal/cabal-testsuite/Test/Cabal/Script.hs +15/−22
• cabal/cabal-testsuite/Test/Cabal/Server.hs +6/−0
• cabal/cabal-testsuite/cabal-testsuite.cabal +66/−39
• cabal/cabal-testsuite/main/cabal-tests.hs +33/−6
• cabal/cabal.project +8/−2
• cabal/cabal.project.local.travis +12/−0
• cabal/cabal.project.travis +20/−0
• cabal/cabal.project.travis.libonly +0/−1
• cabal/cabal.project.validate +2/−0
• cabal/cabal.project.validate.libonly +8/−0
• cabal/license-list-data/exceptions-3.6.json +408/−0
• cabal/license-list-data/licenses-3.6.json +4974/−0
• cabal/pretty-show-1.6.16/CHANGELOG +0/−41
• cabal/pretty-show-1.6.16/LICENSE +0/−19
• cabal/pretty-show-1.6.16/Setup.lhs +0/−8
• cabal/pretty-show-1.6.16/Text/Show/Html.hs +0/−211
• cabal/pretty-show-1.6.16/Text/Show/Parser.y +0/−130
• cabal/pretty-show-1.6.16/Text/Show/Pretty.hs +0/−186
• cabal/pretty-show-1.6.16/Text/Show/PrettyVal.hs +0/−130
• cabal/pretty-show-1.6.16/Text/Show/Value.hs +0/−41
• cabal/pretty-show-1.6.16/bin/ppsh.hs +0/−44
• cabal/pretty-show-1.6.16/pretty-show.cabal +0/−73
• cabal/pretty-show-1.6.16/style/jquery-src.js +0/−10337
• cabal/pretty-show-1.6.16/style/jquery.js +0/−4
• cabal/pretty-show-1.6.16/style/pretty-show.css +0/−32
• cabal/pretty-show-1.6.16/style/pretty-show.js +0/−23
• cabal/solver-benchmarks/solver-benchmarks.cabal +1/−1
• cabal/travis-bootstrap.sh +10/−5
• cabal/travis-common.sh +2/−2
• cabal/travis-deploy.sh +1/−1
• cabal/travis-install.sh +8/−1
• cabal/validate.sh +220/−85
• hackport.cabal +22/−2

@@ -25,8 +25,10 @@                                                 (PackageDescription(..), license) import qualified Distribution.Package as Cabal  (PackageIdentifier(..)                                                 , Dependency(..))-import qualified Distribution.Version as Cabal  (VersionRange, foldVersionRange')-import Distribution.Text (display)+import qualified Distribution.Version as Cabal  (VersionRange, cataVersionRange, normaliseVersionRange+                                                , wildcardUpperBound, majorUpperBound)+import Distribution.Version (VersionRangeF(..))+import Distribution.Pretty (prettyShow)  import Data.Char          (isUpper) import Data.Maybe@@ -44,9 +46,9 @@ cabal2ebuild :: Portage.Category -> Cabal.PackageDescription -> Portage.EBuild cabal2ebuild cat pkg = Portage.ebuildTemplate {     E.name        = Portage.cabal_pn_to_PN cabal_pn,-    E.category    = display cat,+    E.category    = prettyShow cat,     E.hackage_name= cabalPkgName,-    E.version     = display (Cabal.pkgVersion (Cabal.package pkg)),+    E.version     = prettyShow (Cabal.pkgVersion (Cabal.package pkg)),     E.description = if null (Cabal.synopsis pkg) then Cabal.description pkg                                                else Cabal.synopsis pkg,     E.long_desc       = if null (Cabal.description pkg) then Cabal.synopsis pkg@@ -69,7 +71,7 @@                                    else [])   } where         cabal_pn = Cabal.pkgName $ Cabal.package pkg-        cabalPkgName = display cabal_pn+        cabalPkgName = prettyShow cabal_pn         hasLibs = isJust (Cabal.library pkg)         hasTests = (not . null) (Cabal.testSuites pkg)         thisHomepage = if (null $ Cabal.homepage pkg)@@ -80,7 +82,7 @@ convertDependencies overlay category = map (convertDependency overlay category)  convertDependency :: O.Overlay -> Portage.Category -> Cabal.Dependency -> Dependency-convertDependency overlay category (Cabal.Dependency pname versionRange)+convertDependency overlay category (Cabal.Dependency pname versionRange _lib)   = convert versionRange   where     pn = case Portage.resolveFullPortageName overlay pname of@@ -91,16 +93,18 @@     p_v v   = fromCabalVersion v      convert :: Cabal.VersionRange -> Dependency-    convert =  Cabal.foldVersionRange'-             (          mk_p (DRange ZeroB                 InfinityB)          -- ^ @\"-any\"@ version-            )(\v     -> mk_p (DExact (p_v v))                                  -- ^ @\"== v\"@-            )(\v     -> mk_p (DRange (StrictLB (p_v v))    InfinityB)          -- ^ @\"> v\"@-            )(\v     -> mk_p (DRange ZeroB                 (StrictUB (p_v v))) -- ^ @\"< v\"@-            )(\v     -> mk_p (DRange (NonstrictLB (p_v v)) InfinityB)         -- ^ @\">= v\"@-            )(\v     -> mk_p (DRange ZeroB                (NonstrictUB (p_v v))) -- ^ @\"<= v\"@-            )(\v1 v2 -> mk_p (DRange (NonstrictLB (p_v v1)) (StrictUB (p_v v2))) -- ^ @\"== v.*\"@ wildcard. (incl lower, excl upper)-            )(\v1 v2 -> mk_p (DRange (NonstrictLB (p_v v1)) (StrictUB (p_v v2))) -- ^ @\"^>= v\"@ major upper bound-            )(\g1 g2 -> DependAnyOf [g1, g2]                                  -- ^ @\"_ || _\"@ union-            )(\r1 r2 -> DependAllOf [r1, r2]                                  -- ^ @\"_ && _\"@ intersection-            )(\dp    -> dp                                                    -- ^ @\"(_)\"@ parentheses-            )+    convert = Cabal.cataVersionRange alg . Cabal.normaliseVersionRange+              where+                alg AnyVersionF                     = mk_p $ DRange ZeroB InfinityB+                alg (ThisVersionF v)                = mk_p $ DExact $ p_v v+                alg (LaterVersionF v)               = mk_p $ DRange (StrictLB $ p_v v) InfinityB+                alg (EarlierVersionF v)             = mk_p $ DRange ZeroB $ StrictUB $ p_v v+                alg (OrLaterVersionF v)             = mk_p $ DRange (NonstrictLB $ p_v v) InfinityB+                alg (OrEarlierVersionF v)           = mk_p $ DRange ZeroB $ NonstrictUB $ p_v v+                alg (WildcardVersionF v)            = mk_p $ DRange (NonstrictLB $ p_v v)+                                                      $ StrictUB $ p_v $ Cabal.wildcardUpperBound v+                alg (MajorBoundVersionF v)          = mk_p $ DRange (NonstrictLB $ p_v v)+                                                      $ StrictUB $ p_v $ Cabal.majorUpperBound v+                alg (UnionVersionRangesF v1 v2)     = DependAnyOf [v1, v2]+                alg (IntersectVersionRangesF v1 v2) = DependAllOf [v1, v2]+                alg (VersionRangeParensF v)         = v

@@ -18,12 +18,15 @@         )  import Distribution.Simple.Command -- commandsRun-import Distribution.Simple.Utils ( die, cabalVersion, warn )+import Distribution.Simple.Utils ( dieNoVerbosity, cabalVersion, warn ) import qualified Distribution.PackageDescription.Parsec as Cabal import qualified Distribution.Package as Cabal import Distribution.Verbosity (Verbosity, normal)-import Distribution.Text (display, simpleParse) +import Data.Version (showVersion)+import Distribution.Pretty (prettyShow)+import Distribution.Parsec (simpleParsec)+ import qualified Distribution.Client.Setup as CabalInstall import qualified Distribution.Client.Types as CabalInstall import qualified Distribution.Client.Update as CabalInstall@@ -122,7 +125,7 @@   pretty (isInOverlay, pkgId) =       let dec | isInOverlay = " * "               | otherwise   = "   "-      in dec ++ display pkgId+      in dec ++ prettyShow pkgId   -----------------------------------------------------------------------@@ -167,7 +170,7 @@   (catstr,cabals) <- case args of                       (category:cabal1:cabaln) -> return (category, cabal1:cabaln)                       _ -> throwEx (ArgumentError "make-ebuild needs at least two arguments. <category> <cabal-1> <cabal-n>")-  cat <- case simpleParse catstr of+  cat <- case simpleParsec catstr of             Just c -> return c             Nothing -> throwEx (ArgumentError ("could not parse category: " ++ catstr))   let verbosity = fromFlag (makeEbuildVerbosity flags)@@ -254,7 +257,7 @@ updateAction :: UpdateFlags -> [String] -> H.GlobalFlags -> IO () updateAction flags extraArgs globalFlags = do   unless (null extraArgs) $-    die $ "'update' doesn't take any extra arguments: " ++ unwords extraArgs+    dieNoVerbosity $ "'update' doesn't take any extra arguments: " ++ unwords extraArgs   let verbosity = fromFlag (updateVerbosity flags)    H.withHackPortContext verbosity globalFlags $ \repoContext ->@@ -475,13 +478,13 @@     printErrors errs = do       putStr (concat (intersperse "\n" errs))       exitFailure-    printNumericVersion = putStrLn $ display Paths_hackport.version+    printNumericVersion = putStrLn $ showVersion Paths_hackport.version     printVersion        = putStrLn $ "hackport version "-                                  ++ display Paths_hackport.version+                                  ++ showVersion Paths_hackport.version                                   ++ "\nusing cabal-install "-                                  ++ display Paths_cabal_install.version+                                  ++ showVersion Paths_cabal_install.version                                   ++ " and the Cabal library version "-                                  ++ display cabalVersion+                                  ++ prettyShow cabalVersion     errorHandler :: HackPortError -> IO ()     errorHandler e = do       putStrLn (hackPortShowError e)

@@ -21,7 +21,7 @@ import qualified Distribution.Solver.Types.SourcePackage as CabalInstall import qualified Distribution.Solver.Types.PackageIndex as CabalInstall -import Distribution.Text (display)+import Distribution.Pretty (prettyShow) import Distribution.Verbosity import Distribution.Simple.Utils @@ -39,7 +39,8 @@                         , listDirectory                         ) import System.Process (system)-import System.FilePath ((</>), isExtensionOf)+import System.FilePath ((</>))+import qualified System.FilePath as SF import System.Exit  import qualified Cabal2Ebuild as C2E@@ -80,12 +81,13 @@       [pkg] -> return pkg       _ -> Left (ArgumentError ("Too many arguments: " ++ unwords args))   case Portage.parseFriendlyPackage packageString of-    Just v@(_,_,Nothing) -> return v+    Right v@(_,_,Nothing) -> return v     -- we only allow versions we can convert into cabal versions-    Just v@(_,_,Just (Portage.Version _ Nothing [] 0)) -> return v-    _ -> Left (ArgumentError ("Could not parse [category/]package[-version]: " ++ packageString))--+    Right v@(_,_,Just (Portage.Version _ Nothing [] 0)) -> return v+    Left e -> Left $ ArgumentError $ "Could not parse [category/]package[-version]: "+              ++ packageString ++ "\nParsec error: " ++ e+    _ -> Left $ ArgumentError $ "Could not parse [category/]package[-version]: "+         ++ packageString  -- | Given a list of available packages, and maybe a preferred version, -- return the available package with that version. Latest version is chosen@@ -129,7 +131,7 @@                   notice verbosity $ "Ambiguous names: " ++ L.intercalate ", " names                   forM_ pkgs $ \ps ->                       do let p_name = (cabal_pkg_to_pn . L.head) ps-                         notice verbosity $ p_name ++ ": " ++ (L.intercalate ", " $ map (display . Cabal.pkgVersion . CabalInstall.packageInfoId) ps)+                         notice verbosity $ p_name ++ ": " ++ (L.intercalate ", " $ map (prettyShow . Cabal.pkgVersion . CabalInstall.packageInfoId) ps)                   return $ concat pkgs    -- select a single package taking into account the user specified version@@ -138,7 +140,7 @@       Nothing -> do         putStrLn "No such version for that package, available versions:"         forM_ availablePkgs $ \ avail ->-          putStrLn (display . CabalInstall.packageInfoId $ avail)+          putStrLn (prettyShow . CabalInstall.packageInfoId $ avail)         throwEx (ArgumentError "no such version for that package")       Just avail -> return avail @@ -147,7 +149,7 @@   forM_ availablePkgs $ \ avail -> do     let match_text | CabalInstall.packageInfoId avail == CabalInstall.packageInfoId selectedPkg = "* "                    | otherwise = "- "-    info verbosity $ match_text ++ (display . CabalInstall.packageInfoId $ avail)+    info verbosity $ match_text ++ (prettyShow . CabalInstall.packageInfoId $ avail)    let cabal_pkgId = CabalInstall.packageInfoId selectedPkg       norm_pkgName = Cabal.packageName (Portage.normalizeCabalPackageId cabal_pkgId)@@ -171,10 +173,7 @@                         exitSuccess  -- | Maybe return a PackageId of the next highest version for a given---   package, relative to the provided PackageId of the new version.---   We achieve this by mapping Portage.filePathToPackageId over the---   provided package directory, whose contents are filtered for files---   with the '.ebuild' file extension+--   package, relative to the provided PackageId. getPreviousPackageId :: [FilePath] -- ^ list of ebuilds for given package                      -> Portage.PackageId -- ^ new PackageId                      -> Maybe Portage.PackageId -- ^ maybe PackageId of previous version@@ -182,8 +181,8 @@   let pkgIds = reverse                 . L.sortOn (Portage.pkgVersion)                . filter (<newPkgId)-               $ Portage.filePathToPackageId newPkgId-               <$> filter (\fp -> ".ebuild" `isExtensionOf` fp) pkgDir+               $ mapMaybe (Portage.filePathToPackageId (Portage.category . Portage.packageId $ newPkgId))+               $ SF.dropExtension <$> filter (\fp -> SF.takeExtension fp == ".ebuild") pkgDir   case pkgIds of     x:_ -> Just x     _ -> Nothing@@ -253,8 +252,8 @@   debug verbosity "searching for minimal suitable ghc version"   (compiler_info, ghc_packages, pkgDesc0, _flags, pix) <- case GHCCore.minimumGHCVersionToBuildPackage pkgGenericDesc (Cabal.mkFlagAssignment user_specified_fas) of               Just v  -> return v-              Nothing -> let pn = display merged_cabal_pkg_name-                             cn = display cat+              Nothing -> let pn = prettyShow merged_cabal_pkg_name+                             cn = prettyShow cat                          in error $ unlines [ "mergeGenericPackageDescription: failed to find suitable GHC for " ++ pn                                             , "  You can try to merge the package manually:"                                             , "  $ cabal unpack " ++ pn@@ -384,11 +383,11 @@       cabal_to_emerge_dep cabal_pkg = Merge.resolveDependencies overlay cabal_pkg compiler_info ghc_packages merged_cabal_pkg_name    debug verbosity $ "buildDepends pkgDesc0 raw: " ++ Cabal.showPackageDescription pkgDesc0-  debug verbosity $ "buildDepends pkgDesc0: " ++ show (map display (Merge.exeAndLibDeps pkgDesc0))-  debug verbosity $ "buildDepends pkgDesc:  " ++ show (map display (Merge.buildDepends pkgDesc))+  debug verbosity $ "buildDepends pkgDesc0: " ++ show (map prettyShow (Merge.exeAndLibDeps pkgDesc0))+  debug verbosity $ "buildDepends pkgDesc:  " ++ show (map prettyShow (Merge.buildDepends pkgDesc)) -  notice verbosity $ "Accepted depends: " ++ show (map display accepted_deps)-  notice verbosity $ "Skipped  depends: " ++ show (map display skipped_deps)+  notice verbosity $ "Accepted depends: " ++ show (map prettyShow accepted_deps)+  notice verbosity $ "Skipped  depends: " ++ show (map prettyShow skipped_deps)   notice verbosity $ "Dead flags: " ++ show (map pp_fa irresolvable_flag_assignments)   notice verbosity $ "Dropped  flags: " ++ show (map (Cabal.unFlagName.fst) common_fa)   notice verbosity $ "Active flags: " ++ show (map Cabal.unFlagName active_flags)@@ -442,7 +441,7 @@   when fetch $ do     let cabal_pkgId = Cabal.packageId (Merge.packageDescription pkgDesc)         norm_pkgName = Cabal.packageName (Portage.normalizeCabalPackageId cabal_pkgId)-    fetchDigestAndCheck verbosity (overlayPath </> display cat </> display norm_pkgName)+    fetchDigestAndCheck verbosity (overlayPath </> prettyShow cat </> prettyShow norm_pkgName)  fetchDigestAndCheck :: Verbosity                     -> FilePath -- ^ directory of ebuild

@@ -18,7 +18,7 @@ import qualified Distribution.Package as Cabal import qualified Distribution.PackageDescription as Cabal import qualified Distribution.Version as Cabal-import qualified Distribution.Text as Cabal+import qualified Distribution.Pretty as Cabal import qualified Distribution.Types.ExeDependency as Cabal import qualified Distribution.Types.LegacyExeDependency as Cabal import qualified Distribution.Types.PkgconfigDependency as Cabal@@ -219,7 +219,7 @@          C2E.convertDependency overlay                                (Portage.Category "dev-haskell")                                (Cabal.Dependency (Cabal.mkPackageName "Cabal")-                                                 finalCabalDep)+                                                 finalCabalDep (S.singleton Cabal.defaultLibName))   where     versionNumbers = Cabal.versionNumbers cabal_version     userCabalVersion = Cabal.orLaterVersion (Cabal.specVersion pkg)@@ -389,7 +389,7 @@ legacyBuildToolsDependencies (Cabal.PackageDescription { Cabal.library = lib, Cabal.executables = exes }) = L.nub $   [ case pkg of       Just p -> p-      Nothing -> trace ("WARNING: Unknown build tool '" ++ Cabal.display exe ++ "'. Check the generated ebuild.")+      Nothing -> trace ("WARNING: Unknown build tool '" ++ Cabal.prettyShow exe ++ "'. Check the generated ebuild.")                        (any_c_p "unknown-build-tool" pn)   | exe@(Cabal.LegacyExeDependency pn _range) <- cabalDeps   , pkg <- return (lookup pn buildToolsTable)@@ -429,7 +429,7 @@ hackageBuildToolsDependencies :: Portage.Overlay -> Cabal.PackageDescription -> [Portage.Dependency] hackageBuildToolsDependencies overlay (Cabal.PackageDescription { Cabal.library = lib, Cabal.executables = exes }) =   haskellDependencies overlay $ L.nub $-    [ Cabal.Dependency pn versionRange+    [ Cabal.Dependency pn versionRange $ S.singleton Cabal.defaultLibName     | Cabal.ExeDependency pn _component versionRange <- cabalDeps     ]   where@@ -452,7 +452,7 @@ resolvePkgConfigs overlay cdeps =   [ case resolvePkgConfig overlay pkg of       Just d -> d-      Nothing -> trace ("WARNING: Could not resolve pkg-config: " ++ Cabal.display pkg ++ ". Check generated ebuild.")+      Nothing -> trace ("WARNING: Could not resolve pkg-config: " ++ Cabal.prettyShow pkg ++ ". Check generated ebuild.")                        (any_c_p "unknown-pkg-config" pn)   | pkg@(Cabal.PkgconfigDependency cabal_pn _range) <- cdeps   , let pn = Cabal.unPkgconfigName cabal_pn

@@ -8,24 +8,24 @@ import qualified Distribution.License             as Cabal import qualified Distribution.SPDX.License        as SPDX import qualified Distribution.Package             as Cabal-import qualified Distribution.Text                as Cabal+import qualified Distribution.Pretty                as Cabal  -- map the cabal license type to the gentoo license string format convertLicense :: SPDX.License -> Either String String convertLicense l =     case Cabal.licenseFromSPDX l of         --  good ones-        Cabal.AGPL mv      -> Right $ "AGPL-" ++ (maybe "3" Cabal.display mv)  -- almost certainly version 3-        Cabal.GPL mv       -> Right $ "GPL-" ++ (maybe "2" Cabal.display mv)  -- almost certainly version 2-        Cabal.LGPL mv      -> Right $ "LGPL-" ++ (maybe "2.1" Cabal.display mv) -- probably version 2.1+        Cabal.AGPL mv      -> Right $ "AGPL-" ++ (maybe "3" Cabal.prettyShow mv)  -- almost certainly version 3+        Cabal.GPL mv       -> Right $ "GPL-" ++ (maybe "2" Cabal.prettyShow mv)  -- almost certainly version 2+        Cabal.LGPL mv      -> Right $ "LGPL-" ++ (maybe "2.1" Cabal.prettyShow mv) -- probably version 2.1         Cabal.BSD2         -> Right "BSD-2"         Cabal.BSD3         -> Right "BSD"         Cabal.BSD4         -> Right "BSD-4"         Cabal.PublicDomain -> Right "public-domain"         Cabal.MIT          -> Right "MIT"-        Cabal.Apache mv    -> Right $ "Apache-" ++ (maybe "1.1" Cabal.display mv) -- probably version 1.1+        Cabal.Apache mv    -> Right $ "Apache-" ++ (maybe "1.1" Cabal.prettyShow mv) -- probably version 1.1         Cabal.ISC          -> Right "ISC"-        Cabal.MPL v        -> Right $ "MPL-" ++ Cabal.display v -- probably version 1.0+        Cabal.MPL v        -> Right $ "MPL-" ++ Cabal.prettyShow v -- probably version 1.0         -- bad ones         Cabal.AllRightsReserved -> Left "EULA-style licence. Please pick it manually."         Cabal.UnknownLicense _  -> Left "license unknown to cabal. Please pick it manually."@@ -34,6 +34,6 @@  partition_depends :: [Cabal.PackageName] -> Cabal.PackageName -> [Cabal.Dependency] -> ([Cabal.Dependency], [Cabal.Dependency]) partition_depends ghc_package_names merged_cabal_pkg_name = L.partition (not . is_internal_depend)-    where is_internal_depend (Cabal.Dependency pn _vr) = is_itself || is_ghc_package+    where is_internal_depend (Cabal.Dependency pn _vr _lib) = is_itself || is_ghc_package               where is_itself = pn == merged_cabal_pkg_name                     is_ghc_package = pn `elem` ghc_package_names

@@ -11,7 +11,7 @@  import Portage.PackageId -import qualified Distribution.Text as DT+import qualified Distribution.Pretty as DP (Pretty(..)) import qualified Text.PrettyPrint as Disp import Text.PrettyPrint ( vcat, nest, render ) import Text.PrettyPrint as PP ((<>))@@ -24,13 +24,13 @@ dispSlot (GivenSlot slot) = Disp.text (':' : slot)  dispLBound :: PackageName -> LBound -> Disp.Doc-dispLBound pn (StrictLB    v) = Disp.char '>' PP.<> DT.disp pn <-> DT.disp v-dispLBound pn (NonstrictLB v) = Disp.text ">=" PP.<> DT.disp pn <-> DT.disp v+dispLBound pn (StrictLB    v) = Disp.char '>' PP.<> DP.pretty pn <-> DP.pretty v+dispLBound pn (NonstrictLB v) = Disp.text ">=" PP.<> DP.pretty pn <-> DP.pretty v dispLBound _pn ZeroB = error "unhandled 'dispLBound ZeroB'"  dispUBound :: PackageName -> UBound -> Disp.Doc-dispUBound pn (StrictUB    v) = Disp.char '<' PP.<> DT.disp pn <-> DT.disp v-dispUBound pn (NonstrictUB v) = Disp.text "<=" PP.<> DT.disp pn <-> DT.disp v+dispUBound pn (StrictUB    v) = Disp.char '<' PP.<> DP.pretty pn <-> DP.pretty v+dispUBound pn (NonstrictUB v) = Disp.text "<=" PP.<> DP.pretty pn <-> DP.pretty v dispUBound _pn InfinityB = error "unhandled 'dispUBound Infinity'"  dispDAttr :: DAttr -> Disp.Doc@@ -58,7 +58,7 @@ showDepend (DependAtom (Atom pn range dattr))     = case range of         -- any version-        DRange ZeroB InfinityB -> DT.disp pn       PP.<> dispDAttr dattr+        DRange ZeroB InfinityB -> DP.pretty pn       PP.<> dispDAttr dattr         DRange ZeroB ub        -> dispUBound pn ub PP.<> dispDAttr dattr         DRange lb InfinityB    -> dispLBound pn lb PP.<> dispDAttr dattr         -- TODO: handle >=foo-0    special case@@ -66,15 +66,15 @@         DRange lb ub          ->    showDepend (DependAtom (Atom pn (DRange lb InfinityB) dattr))                                  PP.<> Disp.char ' '                                  PP.<> showDepend (DependAtom (Atom pn (DRange ZeroB ub)    dattr))-        DExact v              -> Disp.char '~' PP.<> DT.disp pn <-> DT.disp v { versionRevision = 0 } PP.<> dispDAttr dattr+        DExact v              -> Disp.char '~' PP.<> DP.pretty pn <-> DP.pretty v { versionRevision = 0 } PP.<> dispDAttr dattr  showDepend (DependIfUse u td fd)  = valign $ vcat [td_doc, fd_doc]     where td_doc               | is_empty_dependency td = Disp.empty-              | otherwise =                  DT.disp u PP.<> Disp.char '?' PP.<> sp PP.<> sparens (showDepend td)+              | otherwise =                  DP.pretty u PP.<> Disp.char '?' PP.<> sp PP.<> sparens (showDepend td)           fd_doc               | is_empty_dependency fd = Disp.empty-              | otherwise = Disp.char '!' PP.<> DT.disp u PP.<> Disp.char '?' PP.<> sp PP.<> sparens (showDepend fd)+              | otherwise = Disp.char '!' PP.<> DP.pretty u PP.<> Disp.char '?' PP.<> sp PP.<> sparens (showDepend fd) showDepend (DependAnyOf deps)   = Disp.text "||" PP.<> sp PP.<> sparens (vcat $ map showDependInAnyOf deps) showDepend (DependAllOf deps)   = valign $ vcat $ map showDepend deps 

@@ -21,8 +21,9 @@ import Distribution.Compiler (CompilerId(..), CompilerFlavor(GHC)) import Distribution.System import Distribution.Types.ComponentRequestedSpec (defaultComponentRequestedSpec)+import Distribution.Types.Dependency (depPkgName, depVerRange) -import Distribution.Text+import Distribution.Pretty (prettyShow)  import Data.Maybe import Data.List ( nub )@@ -66,9 +67,9 @@ -- Packages that are not core will always be accepted, packages that are -- core in any ghc must be satisfied by the 'PackageIndex'. dependencySatisfiable :: InstalledPackageIndex -> Cabal.Dependency -> Bool-dependencySatisfiable pindex dep@(Cabal.Dependency pn _rang)+dependencySatisfiable pindex dep@(Cabal.Dependency pn _rang _lib)   | Cabal.unPackageName pn == "Win32" = False -- only exists on windows, not in linux-  | not . null $ lookupDependency pindex dep = True -- the package index satisfies the dep+  | not . null $ lookupDependency pindex (depPkgName dep) (depVerRange dep) = True -- the package index satisfies the dep   | packageIsCoreInAnyGHC pn = False -- some other ghcs support the dependency   | otherwise = True -- the dep is not related with core packages, accept the dep @@ -88,8 +89,8 @@               _           -> trace (unwords ["accepting dep:" , show_compiler compiler_info                                             ]                                    ) v-          show_deps = show . map display-          show_compiler (DC.CompilerInfo { DC.compilerInfoId = CompilerId GHC v }) = "ghc-" ++ display v+          show_deps = show . map prettyShow+          show_compiler (DC.CompilerInfo { DC.compilerInfoId = CompilerId GHC v }) = "ghc-" ++ prettyShow v           show_compiler c = show c  -- | Given a 'GenericPackageDescription' it returns the miminum GHC version

@@ -16,7 +16,7 @@  import qualified Distribution.Package as Cabal -import Distribution.Text (simpleParse)+import Distribution.Parsec (simpleParsec) import Distribution.Simple.Utils ( comparing, equating )  import Data.List as List@@ -135,14 +135,14 @@     categories entries =       [ (category, entries')       | Directory dir entries' <- entries-      , Just category <- [simpleParse dir] ]+      , Just category <- [simpleParsec dir] ]      packages :: Portage.Category -> DirectoryTree              -> [(Portage.PackageName, DirectoryTree)]     packages category entries =       [ (Portage.PackageName category name, entries')       | Directory dir entries' <- entries-      , Just name <- [simpleParse dir] ]+      , Just name <- [simpleParsec dir] ]      versions :: Portage.PackageName -> DirectoryTree -> [Portage.Version]     versions name@(Portage.PackageName (Portage.Category category) _) entries =@@ -151,7 +151,7 @@       , let (baseName, ext) = splitExtension fileName       , ext == ".ebuild"       , let fullName = category ++ '/' : baseName-      , Just (Portage.PackageId name' version) <- [simpleParse fullName]+      , Just (Portage.PackageId name' version) <- [simpleParsec fullName]       , name == name' ]  readOverlay :: DirectoryTree -> [Portage.PackageId]

@@ -18,21 +18,19 @@     cabal_pn_to_PN   ) where -import Data.Char- import qualified Distribution.Package as Cabal-import Distribution.Text (Text(..)) -import qualified Distribution.Compat.ReadP as Parse+import Distribution.Parsec (CabalParsing(..), Parsec(..), explicitEitherParsec)+import qualified Distribution.Compat.CharParsing as P  import qualified Portage.Version as Portage  import qualified Text.PrettyPrint as Disp import Text.PrettyPrint ((<>))-import qualified Data.Char as Char (isAlphaNum, isSpace, toLower)+import qualified Data.Char as Char (isAlphaNum, toLower) -import Distribution.Text(display)-import System.FilePath ((</>), dropExtension)+import Distribution.Pretty (Pretty(..), prettyShow)+import System.FilePath ((</>))  #if MIN_VERSION_base(4,11,0) import Prelude hiding ((<>))@@ -47,47 +45,61 @@ data PackageId = PackageId { packageId :: PackageName, pkgVersion :: Portage.Version }   deriving (Eq, Ord, Show, Read) -{--instance Text PN where-  disp (PN n) = Disp.text n-  parse = do-    ns <- Parse.sepBy1 component (Parse.char '-')-    return (PN (concat (intersperse "-" ns)))+instance Pretty Category where+  pretty (Category c) = Disp.text c++instance Parsec Category where+  parsec = Category <$> P.munch1 categoryChar     where-      component = do-        cs <- Parse.munch1 Char.isAlphaNum-        if all Char.isDigit cs then Parse.pfail else return cs-        -- each component must contain an alphabetic character, to avoid-        -- ambiguity in identifiers like foo-1 (the 1 is the version number).--}+      categoryChar c = Char.isAlphaNum c || c == '-' +instance Pretty PackageName where+  pretty (PackageName category name) =+    pretty category <> Disp.char '/' <> pretty name++instance Parsec PackageName where+  parsec = do+    category <- parsec+    _ <- P.char '/'+    name <- parsec+    return $ PackageName category name++instance Pretty PackageId where+  pretty (PackageId name version) =+    pretty name <> Disp.char '-' <> pretty version++instance Parsec PackageId where+  parsec = do+    name <- parsec+    _ <- P.char '-'+    version <- parsec+    return $ PackageId name version+ packageIdToFilePath :: PackageId -> FilePath packageIdToFilePath (PackageId (PackageName cat pn) version) =-  display cat </> display pn </> display pn <-> display version <.> "ebuild"+  prettyShow cat </> prettyShow pn </> prettyShow pn <-> prettyShow version <.> "ebuild"   where     a <-> b = a ++ '-':b     a <.> b = a ++ '.':b --- | Attempt to generate a PackageId from a FilePath. If not, return--- the provided PackageId as-is.-filePathToPackageId :: PackageId -> FilePath -> PackageId-filePathToPackageId pkgId fp = do-      -- take package name from provided FilePath-  let pn = take (length-                 $ Cabal.unPackageName . cabalPkgName . packageId-                 $ pkgId) fp-      -- drop .ebuild file extension-      p = dropExtension fp-      -- drop package name and the following dash-      v = drop ((length pn) +1) p-      c = unCategory . category . packageId $ pkgId-      -- parse and extract version-      parsed_v = case parseVersion v of-                   Just (Just my_v) -> my_v-                   _ -> pkgVersion pkgId-  -- Construct PackageId-  PackageId (mkPackageName c pn) parsed_v-  +-- TODO: fix the parser such that it can tolerate malformed package strings,+-- strings with ".ebuild" extensions and strings which are not in fact package+-- strings at all (e.g. metadata.xml). Then we can eliminate the string manipulation+-- present in Merge.getPreviousPackageId, which ensures this function is only fed+-- well-formed package strings, i.e <name>-<version>.+-- | Maybe generate a PackageId from a FilePath.+filePathToPackageId :: Category -> FilePath -> Maybe PackageId+filePathToPackageId cat fp =+  case explicitEitherParsec parser fp of+    Right x -> Just x+    _ -> Nothing+  where+    parser = do+      pn <- parseCabalPackageName+      _ <- P.char '-'+      v <- parsec+      return $ PackageId (PackageName cat pn) v+ mkPackageName :: String -> String -> PackageName mkPackageName cat package = PackageName (Category cat) (Cabal.mkPackageName package) @@ -109,64 +121,33 @@   fmap (Cabal.PackageIdentifier name)            (Portage.toCabalVersion version) -instance Text Category where-  disp (Category c) = Disp.text c-  parse = fmap Category (Parse.munch1 categoryChar)-    where-      categoryChar c = Char.isAlphaNum c || c == '-'--instance Text PackageName where-  disp (PackageName category name) =-    disp category <> Disp.char '/' <> disp name--  parse = do-    category <- parse-    _ <- Parse.char '/'-    name <- parse-    return (PackageName category name)--instance Text PackageId where-  disp (PackageId name version) =-    disp name <> Disp.char '-' <> disp version--  parse = do-    name <- parse-    _ <- Parse.char '-'-    version <- parse-    return (PackageId name version)--parseFriendlyPackage :: String -> Maybe (Maybe Category, Cabal.PackageName, Maybe Portage.Version)-parseFriendlyPackage str =-  case [ p | (p,s) <- Parse.readP_to_S parser str-       , all Char.isSpace s ] of-    [] -> Nothing-    (x:_) -> Just x+parseFriendlyPackage :: String -> Either String (Maybe Category, Cabal.PackageName, Maybe Portage.Version)+parseFriendlyPackage str = explicitEitherParsec parser str   where   parser = do-    mc <- Parse.option Nothing $ do-      c <- parse-      _ <- Parse.char '/'-      return (Just c)-    p <- parse-    mv <- Parse.option Nothing $ do-      _ <- Parse.char '-'-      v <- parse-      return (Just v)+    mc <- P.optional . P.try $ do+      c <- parsec+      _ <- P.char '/'+      return c+    p <- parseCabalPackageName+    mv <- P.optional $ do+      _ <- P.char '-'+      v <- parsec+      return v     return (mc, p, mv) --- | Parse a String in the form of a Portage version-parseVersion :: FilePath -> Maybe (Maybe Portage.Version)-parseVersion str =-    case [ p | (p,s) <- Parse.readP_to_S parser str-           , all Char.isSpace s ] of-      [] -> Nothing-      (x:_) -> Just x-    where-      parser = do-        mv <- Parse.option Nothing $ do-                 v <- parse-                 return (Just v)-        return mv-    +-- | Parse a Cabal PackageName. Note that we cannot use the @parsec@+-- method as defined in the @Parsec PackageName@ instance, since it+-- fails the entire PackageName parse if it tries to parse a version+-- number.+parseCabalPackageName :: CabalParsing m => m Cabal.PackageName+parseCabalPackageName = do+  pn <- P.some . P.try $+    P.choice+    [ P.alphaNum+    , P.char '-' <* P.notFollowedBy (P.some P.digit <* P.notFollowedBy P.letter)+    ]+  return $ Cabal.mkPackageName pn+ cabal_pn_to_PN :: Cabal.PackageName -> String-cabal_pn_to_PN = map toLower . display+cabal_pn_to_PN = map Char.toLower . prettyShow

@@ -10,7 +10,7 @@ import qualified Portage.PackageId as Portage  import Distribution.Verbosity-import Distribution.Text (display)+import Distribution.Pretty (prettyShow) import qualified Distribution.Package as Cabal import Distribution.Simple.Utils @@ -31,10 +31,10 @@       return devhaskell     [cat] -> do       info verbosity $ "Exact match of already existing package, using category: "-                         ++ display cat+                         ++ prettyShow cat       return cat     cats -> do-      warn verbosity $ "Multiple matches of categories: " ++ unwords (map display cats)+      warn verbosity $ "Multiple matches of categories: " ++ unwords (map prettyShow cats)       if devhaskell `elem` cats         then do notice verbosity "Defaulting to dev-haskell"                 return devhaskell

@@ -13,7 +13,7 @@  import qualified Text.PrettyPrint as Disp import Text.PrettyPrint ((<>))-import qualified Distribution.Text as DT+import Distribution.Pretty (Pretty(..))  #if MIN_VERSION_base(4,11,0) import Prelude hiding ((<>))@@ -27,6 +27,9 @@              | N UseFlag             -- ^ - modificator               deriving (Eq,Show,Ord,Read) +instance Pretty UseFlag where+  pretty = showModificator+ mkUse :: Use -> UseFlag mkUse  = UseFlag  @@ -36,31 +39,26 @@ mkQUse :: Use -> UseFlag mkQUse = Q . UseFlag -instance DT.Text UseFlag where-  disp = showModificator-  parse = error "instance DT.Text UseFlag: not implemented"- showModificator :: UseFlag -> Disp.Doc-showModificator (UseFlag u) = DT.disp u-showModificator (X u)     = Disp.char '!' <> DT.disp u-showModificator (Q u)     = DT.disp u <> Disp.char '?'-showModificator (E u)     = DT.disp u <> Disp.char '='-showModificator (N u)     = Disp.char '-' <> DT.disp u+showModificator (UseFlag u) = pretty u+showModificator (X u)     = Disp.char '!' <> pretty u+showModificator (Q u)     = pretty u <> Disp.char '?'+showModificator (E u)     = pretty u <> Disp.char '='+showModificator (N u)     = Disp.char '-' <> pretty u  dispUses :: [UseFlag] -> Disp.Doc dispUses [] = Disp.empty-dispUses us = Disp.brackets $ Disp.hcat $ (Disp.punctuate (Disp.text ", ")) $ map DT.disp  us+dispUses us = Disp.brackets $ Disp.hcat $ (Disp.punctuate (Disp.text ", ")) $ map pretty us  newtype Use = Use String     deriving (Eq, Read, Show) +instance Pretty Use where+  pretty (Use u) = Disp.text u+ instance Ord Use where     compare (Use a) (Use b) = case (a,b) of         ("test", "test") -> EQ         ("test", _)      -> LT         (_, "test")      -> GT         (_, _)           -> a `compare` b--instance DT.Text Use where-    disp (Use u) = Disp.text u-    parse = error "instance DT.Text Use: not implemented"

@@ -21,9 +21,10 @@  import qualified Distribution.Version as Cabal -import Distribution.Text (Text(..))+import Distribution.Pretty (Pretty(..)) -import qualified Distribution.Compat.ReadP as Parse+import Distribution.Parsec (Parsec(..))+import qualified Distribution.Compat.CharParsing as P import qualified Text.PrettyPrint as Disp import Text.PrettyPrint ((<>)) import qualified Data.Char as Char (isAlpha, isDigit)@@ -39,6 +40,24 @@                        }   deriving (Eq, Ord, Show, Read) +instance Pretty Version where+  pretty (Version ver c suf rev) =+    dispVer ver <> dispC c <> dispSuf suf <> dispRev rev+    where+      dispVer   = Disp.hcat . Disp.punctuate (Disp.char '.') . map Disp.int+      dispC     = maybe Disp.empty Disp.char+      dispSuf   = Disp.hcat . map pretty+      dispRev 0 = Disp.empty+      dispRev n = Disp.text "-r" <> Disp.int n++instance Parsec Version where+  parsec = do+    ver <- P.sepBy1 digits (P.char '.')+    c   <- P.optional $ P.satisfy Char.isAlpha+    suf <- P.many parsec+    rev <- P.option 0 $ P.string "-r" *> digits+    return $ Version ver c suf rev+   -- foo-9999* is treated as live ebuild -- Cabal-1.17.9999* as well is_live :: Version -> Bool@@ -55,32 +74,8 @@ data Suffix = Alpha Int | Beta Int | Pre Int | RC Int | P Int   deriving (Eq, Ord, Show, Read) -fromCabalVersion :: Cabal.Version -> Version-fromCabalVersion cabal_version = Version (Cabal.versionNumbers cabal_version) Nothing [] 0--toCabalVersion :: Version -> Maybe Cabal.Version-toCabalVersion (Version nums Nothing [] _) = Just (Cabal.mkVersion nums)-toCabalVersion _                           = Nothing--instance Text Version where-  disp (Version ver c suf rev) =-    dispVer ver <> dispC c <> dispSuf suf <> dispRev rev-    where-      dispVer   = Disp.hcat . Disp.punctuate (Disp.char '.') . map Disp.int-      dispC     = maybe Disp.empty Disp.char-      dispSuf   = Disp.hcat . map disp-      dispRev 0 = Disp.empty-      dispRev n = Disp.text "-r" <> Disp.int n--  parse = do-    ver <- Parse.sepBy1 digits (Parse.char '.')-    c   <- Parse.option Nothing (fmap Just (Parse.satisfy Char.isAlpha))-    suf <- Parse.many parse-    rev <- Parse.option 0 (Parse.string "-r" >> digits)-    return (Version ver c suf rev)--instance Text Suffix where-  disp suf = case suf of+instance Pretty Suffix where+  pretty suf = case suf of     Alpha n -> Disp.text "_alpha" <> dispPos n     Beta n  -> Disp.text "_beta"  <> dispPos n     Pre n   -> Disp.text "_pre"   <> dispPos n@@ -92,16 +87,24 @@       dispPos 0 = Disp.empty       dispPos n = Disp.int n -  parse = Parse.char '_'-       >> Parse.choice-    [ Parse.string "alpha" >> fmap Alpha maybeDigits-    , Parse.string "beta"  >> fmap Beta  maybeDigits-    , Parse.string "pre"   >> fmap Pre   maybeDigits-    , Parse.string "rc"    >> fmap RC    maybeDigits-    , Parse.string "p"     >> fmap P     maybeDigits+instance Parsec Suffix where+  parsec = P.char '_'+       >> P.choice+    [ P.string "alpha" >> fmap Alpha maybeDigits+    , P.string "beta"  >> fmap Beta  maybeDigits+    , P.string "pre"   >> fmap Pre   maybeDigits+    , P.string "rc"    >> fmap RC    maybeDigits+    , P.string "p"     >> fmap P     maybeDigits     ]     where-      maybeDigits = Parse.option 0 digits+      maybeDigits = P.option 0 digits -digits :: Parse.ReadP r Int-digits = fmap read (Parse.munch1 Char.isDigit)+fromCabalVersion :: Cabal.Version -> Version+fromCabalVersion cabal_version = Version (Cabal.versionNumbers cabal_version) Nothing [] 0++toCabalVersion :: Version -> Maybe Cabal.Version+toCabalVersion (Version nums Nothing [] _) = Just (Cabal.mkVersion nums)+toCabalVersion _                           = Nothing++digits :: P.CharParsing m => m Int+digits = read <$> P.munch1 Char.isDigit

@@ -30,8 +30,9 @@ -- cabal import qualified Distribution.Verbosity as Cabal import qualified Distribution.Package as Cabal (pkgName)-import qualified Distribution.Simple.Utils as Cabal (comparing, die, equating)-import qualified Distribution.Text as Cabal ( display, simpleParse )+import qualified Distribution.Simple.Utils as Cabal (comparing, die', equating)+import Distribution.Pretty (prettyShow)+import Distribution.Parsec (simpleParsec)  import qualified Distribution.Client.GlobalFlags as CabalInstall import qualified Distribution.Client.IndexUtils as CabalInstall@@ -145,8 +146,8 @@                       PortagePlusOverlay -> id                       HackageToOverlay   -> fromHackageFilter   pkgs' <- forM pkgs $ \p ->-            case Cabal.simpleParse p of-              Nothing -> Cabal.die ("Could not parse package name: " ++ p ++ ". Format cat/pkg")+            case simpleParsec p of+              Nothing -> Cabal.die' verbosity ("Could not parse package name: " ++ p ++ ". Format cat/pkg")               Just pn -> return pn   tree0 <- status verbosity portdir overlaydir repoContext   let tree = pkgFilter tree0@@ -204,10 +205,10 @@         let (PackageName c p) = pkg         putStr (bold (show ix))         putStr " "-        putStr $ Cabal.display c ++ '/' : bold (Cabal.display p)+        putStr $ prettyShow c ++ '/' : bold (prettyShow p)         putStr " "         forM_ ebuilds $ \e -> do-            putStr $ toColor (fmap (Cabal.display . pkgVersion . ebuildId) e)+            putStr $ toColor (fmap (prettyShow . pkgVersion . ebuildId) e)             putChar ' '         putStrLn "" 

@@ -0,0 +1,3 @@+/Cabal/ChangeLog.md merge=union+/cabal-install/changelog merge=union+/cabal-testsuite/PackageTests/NewBuild/CmdRun/Script/script.hs eol=crlf

@@ -0,0 +1,30 @@+---+name: Bug report+about: Create a report to help us improve+title: ''+labels: ''+assignees: ''++---++**Describe the bug**+A clear and concise description of what the bug is.++**To Reproduce**+Steps to reproduce the behavior:++```+$ cabal v2-build ...+```++Please use version-prefixed commands (e.g. `v2-build` or `v1-build`) to avoid ambiguity.++**Expected behavior**+A clear and concise description of what you expected to happen.++**System informataion**+ - Operating system+ - `cabal`, `ghc` versions++**Additional context**+Add any other context about the problem here.

@@ -1,7 +1,8 @@+ --- Please include the following checklist in your PR: -* [ ] Patches conform to the [coding conventions](https://github.com/haskell/cabal/#conventions).+* [ ] Patches conform to the [coding conventions](https://github.com/haskell/cabal/blob/master/CONTRIBUTING.md#conventions). * [ ] Any changes that could be relevant to users have been recorded in the changelog. * [ ] The documentation has been updated, if necessary. * [ ] If the change is docs-only, `[ci skip]` is used to avoid triggering the build bots.

@@ -17,6 +17,7 @@ cabal-tests.log  /Cabal/dist/+/Cabal/.python-sphinx-virtualenv/ /Cabal/tests/Setup /Cabal/Setup /Cabal/source-file-list

@@ -6,12 +6,14 @@  Adam Langley                <agl@imperialviolet.org> Alex Biehl                  <alexbiehl@gmail.com>+Alex Biehl                  <alexbiehl@gmail.com>                  <alex.biehl@target.com> Alex Biehl                  <alexbiehl@gmail.com>                  Alexander Biehl <abiehl@novomind.com> Alex Biehl                  <alexbiehl@gmail.com>                  alexbiehl <alex.biehl@gmail.com> Alex Washburn               <github@recursion.ninja> Alex Washburn               <github@recursion.ninja>               recursion-ninja <github@recursion.ninja> Alistair Bailey             <alistair@abayley.org>                 alistair <alistair@abayley.org> Alson Kemp                  <alson@alsonkemp.com>                  alson <alson@alsonkemp.com>+Andreas Klebinger           <klebinger.andreas@gmx.at>             klebinger.andreas@gmx.at <klebinger.andreas@gmx.at> Andres Löh                  <andres.loeh@gmail.com> Andres Löh                  <andres.loeh@gmail.com>                <andres@cs.uu.nl> Andres Löh                  <andres.loeh@gmail.com>                <andres@well-typed.com>@@ -43,6 +45,7 @@ David Waern                 <davve@dtek.chalmers.se>               David Waern <unknown> Dennis Gosnell              <cdep.illabout@gmail.com> Dmitry Kovanikov            <kovanikov@gmail.com>                  ChShersh <dmitrii@holmusk.com>+Domen Kožar                 <domen@dev.si>                         <domen@enlambda.com> Don Stewart                 <dons00@gmail.com>                     <dons@galois.com> Duncan Coutts               <duncan@community.haskell.org> Duncan Coutts               <duncan@community.haskell.org>         <Duncan Coutts duncan@community.haskell.org>@@ -56,7 +59,8 @@ Einar Karttunen             <ekarttun@cs.helsinki.fi> Federico Mastellone         <fmaste@users.noreply.github.com> Felix Yan                   <felixonmars@archlinux.org>            Felix Yan <felixonmars@gmail.com>-Francesco Gazzetta          <francygazz@gmail.com>                 <fgaz@users.noreply.github.com>+Francesco Gazzetta          <fgaz@fgaz.me>                         <fgaz@users.noreply.github.com>+Francesco Gazzetta          <fgaz@fgaz.me>                         <francygazz@gmail.com> Ganesh Sittampalam          <ganesh.sittampalam@credit-suisse.com> <ganesh@earth.li> Geoff Nixon                 <geoff-codes@users.noreply.github.com> <geoff.nixon@aol.com> Gershom Bazerman            <gershomb@gmail.com>@@ -120,6 +124,8 @@ Neil Mitchell               <ndmitchell@gmail.com>                 Neil Mitchell <unknown> Niklas Broberg              <niklas.broberg@gmail.com>             <d00nibro@chalmers.se> Niklas Broberg              <niklas.broberg@gmail.com>             <git@nand.wakku.to>+Nikolai Obedin              <dev@nkly.me>                          <github@nkly.me>+Nikolai Obedin              <dev@nkly.me>                          <no@idagio.com> # 3c1502bb633b61ae4d24d40898fca66d7f169679 Peter Higley                <phigley@gmail.com> Peter Simons                <simons@cryp.to> Peter Trško                 <peter.trsko@gmail.com>                Peter Trsko <peter.trsko@ixperta.com>@@ -154,3 +160,4 @@ ghthrowaway7                <41365123+ghthrowaway7@users.noreply.github.com> # Goes by that name online quasicomputational          <quasicomputational@gmail.com>                   # Goes by that name online vedksah                     <31156362+vedksah@users.noreply.github.com>      # Goes by that name online+!

@@ -13,6 +13,7 @@ branches:   only:     - master+    - "3.0"     - "2.4"     - "2.2"     - "2.0"@@ -58,9 +59,12 @@    - env: GHCVER=8.4.4 SCRIPT=script USE_GOLD=YES DEPLOY_DOCS=YES      os: linux      sudo: required-   - env: GHCVER=8.6.2 SCRIPT=script USE_GOLD=YES+   - env: GHCVER=8.6.4 SCRIPT=script USE_GOLD=YES      os: linux      sudo: required+   #- env: GHCVER=8.8.1 SCRIPT=script USE_GOLD=YES+   #  os: linux+   #  sudo: required     - env: GHCVER=8.4.4 SCRIPT=solver-debug-flags USE_GOLD=YES      sudo: required@@ -92,13 +96,17 @@    - env: GHCVER=8.0.2 SCRIPT=bootstrap      os: osx -   - env: GHCVER=via-stack SCRIPT=stack STACK_CONFIG=stack.yaml-     os: linux-+   # It's been long known that CI with+   # Stack does not work so it's disabled until further notice+   # to reduce latency and avoid wasting CI slots for no reason.+   #+   #- env: GHCVER=via-stack SCRIPT=stack STACK_CONFIG=stack.yaml+   #  os: linux+   #    # See https://github.com/haskell/cabal/pull/4667#issuecomment-321036564    # for why failures are allowed.-  allow_failures:-   - env: GHCVER=via-stack SCRIPT=stack STACK_CONFIG=stack.yaml+   # allow_failures:+   # - env: GHCVER=via-stack SCRIPT=stack STACK_CONFIG=stack.yaml   # TODO add PARSEC_BUNDLED=YES when it's so  # It seems pointless to run head if we're going to ignore the results.@@ -112,7 +120,6 @@  - export PATH=$HOME/.cabal/bin:$PATH  - export PATH=$HOME/.local/bin:$PATH  - export PATH=/opt/cabal/2.4/bin:$PATH- - export PATH=/opt/alex/3.1.7/bin:$PATH  - if [ "$USE_GOLD" = "YES" ]; then sudo update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.gold" 20; fi  - if [ "$USE_GOLD" = "YES" ]; then sudo update-alternatives --install "/usr/bin/ld" "ld" "/usr/bin/ld.bfd" 10; fi  - ld -v

@@ -20,6 +20,7 @@ Amir Mohammad Saied      <amirsaied@gmail.com> Anders Kaseorg           <andersk@mit.edu> Andrea Vezzosi           <sanzhiyan@gmail.com>+Andreas Klebinger        <klebinger.andreas@gmx.at> Andres Löh               <andres.loeh@gmail.com> Andrzej Rybczak          <electricityispower@gmail.com> Andrés Sicard-Ramírez    <andres.sicard.ramirez@gmail.com>@@ -55,6 +56,7 @@ Bryan O'Sullivan         <bos@serpentine.com> Bryan Richter            <bryan.richter@gmail.com> Carter Tazio Schonwald   <carter.schonwald@gmail.com>+Chaitanya Koparkar       <ckoparkar@gmail.com> Chang Yang Jiao          <jiaochangyang@gmail.com> Chris Allen              <cma@bitemyapp.com> Chris Wong               <lambda.fairy@gmail.com>@@ -85,6 +87,7 @@ Dino Morelli             <dino@ui3.info> Dmitry Astapov           <dastapov@gmail.com> Dmitry Kovanikov         <kovanikov@gmail.com>+Domen Kožar              <domen@dev.si> Dominic Steinitz         <dominic@steinitz.org> Don Stewart              <dons00@gmail.com> Doug Beardsley           <mightybyte@gmail.com>@@ -107,7 +110,7 @@ Felix Yan                <felixonmars@archlinux.org> Florian Hartwig          <florian.j.hartwig@gmail.com> Francesco Ariis          <fa-ml@ariis.it>-Francesco Gazzetta       <francygazz@gmail.com>+Francesco Gazzetta       <fgaz@fgaz.me> Franz Thoma              <franz.thoma@tngtech.com> Fujimura Daisuke         <me@fujimuradaisuke.com> Gabor Greif              <ggreif@gmail.com>@@ -142,6 +145,7 @@ Jacco Krijnen            <jaccokrijnen@gmail.com> Jack Henahan             <jhenahan@uvm.edu> Jake Wheat               <jakewheatmail@gmail.com>+Jan Path                 <jan@jpath.de> Jason Dagit              <dagitj@gmail.com> Jean-Philippe Bernardy   <jeanphilippe.bernardy@gmail.com> Jens Petersen            <juhpetersen@gmail.com>@@ -163,6 +167,7 @@ Jookia                   <166291@gmail.com> Josef Svenningsson       <josef.svenningsson@gmail.com> Josh Hoyt                <josh.hoyt@galois.com>+Josh Kalderimis          <josh.kalderimis@gmail.com> Judah Jacobson           <judah.jacobson@gmail.com> Jürgen Nicklisch-Franken <jnf@arcor.de> Karel Gardas             <karel.gardas@centrum.cz>@@ -176,6 +181,7 @@ Lennart Kolmodin         <kolmodin@gmail.com> Lennart Spitzner         <hexagoxel@hexagoxel.de> Leon Isenberg            <ljli@users.noreply.github.com>+Leon Schoorl             <l.m.schoorl@student.utwente.nl> Leonid Onokhov           <sopvop@gmail.com> Li-yao Xia               <lysxia@gmail.com> Liyang HU                <git@liyang.hu>@@ -193,6 +199,7 @@ Martin Vlk               <martin@vlkk.cz> Masahiro Yamauchi        <sgt.yamauchi@gmail.com> Mathieu Boespflug        <mboes@tweag.net>+Matt Renaud              <matt@m-renaud.com> Matthew William Cox      <matt@mattcox.ca> Matthias Fischmann       <mf@zerobuzz.net> Matthias Kilian          <kili@outback.escape.de>@@ -223,6 +230,7 @@ Nikita Karetnikov        <nikita@karetnikov.org> Niklas Broberg           <niklas.broberg@gmail.com> Niklas Hambüchen         <mail@nh2.me>+Nikolai Obedin           <dev@nkly.me> Oleg Grenrus             <oleg.grenrus@iki.fi> Oleksandr Manzyuk        <manzyuk@gmail.com> Omar Mefire              <omefire@gmail.com>@@ -299,6 +307,7 @@ Tomas Vestelind          <tomas.vestelind@gmail.com> Toshio Ito               <debug.ito@gmail.com> Travis Cardwell          <travis.cardwell@extellisys.com>+Travis Whitaker          <pi.boy.travis@gmail.com> Tuncer Ayaz              <tuncer.ayaz@gmail.com> Vaibhav Sagar            <vaibhavsagar@gmail.com> Veronika Romashkina      <vrom911@gmail.com>@@ -309,6 +318,7 @@ Yitzchak Gale            <gale@sefer.org> Yuras Shumovich          <shumovichy@gmail.com> Yuriy Syrovetskiy        <cblp@cblp.su>+Zejun Wu                 <watashi@watashi.ws> capsjac                  <capsjac@gmail.com> ghthrowaway7             <41365123+ghthrowaway7@users.noreply.github.com> quasicomputational       <quasicomputational@gmail.com>

@@ -0,0 +1,254 @@+# Contributing to Cabal++Building Cabal for hacking+--------------------------++The current recommended way of developing Cabal is to use the+`new-build` feature which [shipped in cabal-install-1.24](http://blog.ezyang.com/2016/05/announcing-cabal-new-build-nix-style-local-builds/).  Assuming+that you have a sufficiently recent cabal-install (see above),+it is sufficient to run:++~~~~+cabal new-build cabal+~~~~++To build a local, development copy of cabal-install.  The location+of your build products will vary depending on which version of+cabal-install you use to build; see the documentation section+[Where are my build products?](http://cabal.readthedocs.io/en/latest/nix-local-build.html#where-are-my-build-products)+to find the binary (or just run `find -type f -executable -name cabal`).++Here are some other useful variations on the commands:++~~~~+cabal new-build Cabal # build library only+cabal new-build Cabal:unit-tests # build Cabal's unit test suite+cabal new-build cabal-tests # etc...+~~~~++**Dogfooding HEAD.**+Many of the core developers of Cabal dogfood `cabal-install` HEAD+when doing development on Cabal.  This helps us identify bugs+which were missed by the test suite and easily experiment with new+features.++The recommended workflow in this case is slightly different: you will+maintain two Cabal source trees: your production tree (built with a+released version of Cabal) which always tracks `master` and which you+update only when you want to move to a new version of Cabal to dogfood,+and your development tree (built with your production Cabal) that you+actually do development on.++In more detail, suppose you have checkouts of Cabal at `~/cabal-prod`+and `~/cabal-dev`, and you have a release copy of cabal installed at+`/opt/cabal/2.4/bin/cabal`.  First, build your production tree:++~~~~+cd ~/cabal-prod+/opt/cabal/2.4/bin/cabal new-build cabal+~~~~++This will produce a cabal binary (see also: [Where are my build products?](http://cabal.readthedocs.io/en/latest/nix-local-build.html#where-are-my-build-products)+).  Add this binary to your PATH,+and then use it to build your development copy:++~~~~+cd ~/cabal-dev+cabal new-build cabal+~~~~++Running tests+-------------++**Using Travis and AppVeyor.**+If you are not in a hurry, the most convenient way to run tests on Cabal+is to make a branch on GitHub and then open a pull request; our+continuous integration service on Travis and AppVeyor will build and+test your code.  Title your PR with WIP so we know that it does not need+code review.++Some tips for using Travis effectively:++* Travis builds take a long time.  Use them when you are pretty+  sure everything is OK; otherwise, try to run relevant tests locally+  first.++* Watch over your jobs on the [Travis website](http://travis-ci.org).+  If you know a build of yours is going to fail (because one job has+  already failed), be nice to others and cancel the rest of the jobs,+  so that other commits on the build queue can be processed.++* If you want realtime notification when builds of your PRs finish, we have a [Slack team](https://haskell-cabal.slack.com/). To get issued an invite, fill in your email at [this sign up page](https://haskell-cabal.herokuapp.com).++**How to debug a failing CI test.**+One of the annoying things about running tests on CI is when they+fail, there is often no easy way to further troubleshoot the broken+build.  Here are some guidelines for debugging continuous integration+failures:++1. Can you tell what the problem is by looking at the logs?  The+   `cabal-testsuite` tests run with `-v` logging by default, which+   is dumped to the log upon failure; you may be able to figure out+   what the problem is directly this way.++2. Can you reproduce the problem by running the test locally?+   See the next section for how to run the various test suites+   on your local machine.++3. Is the test failing only for a specific version of GHC, or+   a specific operating system?  If so, try reproducing the+   problem on the specific configuration.++4. Is the test failing on a Travis per-GHC build+   ([for example](https://travis-ci.org/haskell-pushbot/cabal-binaries/builds/208128401))?+   In this case, if you click on "Branch", you can get access to+   the precise binaries that were built by Travis that are being+   tested.  If you have an Ubuntu system, you can download+   the binaries and run them directly.++5. Is the test failing on AppVeyor?  Consider logging in via+   Remote Desktop to the build VM:+   https://www.appveyor.com/docs/how-to/rdp-to-build-worker/++If none of these let you reproduce, there might be some race condition+or continuous integration breakage; please file a bug.++**Running tests locally.**+To run tests locally with `new-build`, you will need to know the+name of the test suite you want.  Cabal and cabal-install have+several.  Also, you'll want to read [Where are my build products?](http://cabal.readthedocs.io/en/latest/nix-local-build.html#where-are-my-build-products)++The most important test suite is `cabal-testsuite`: most user-visible+changes to Cabal should come with a test in this framework.  See+[cabal-testsuite/README.md](cabal-testsuite/README.md) for more+information about how to run tests and write new ones.  Quick+start: use `cabal-tests` to run `Cabal` tests, and `cabal-tests+--with-cabal=/path/to/cabal` to run `cabal-install` tests+(don't forget `--with-cabal`! Your cabal-install tests won't+run without it).++There are also other test suites:++* `Cabal:unit-tests` are small, quick-running unit tests+  on small pieces of functionality in Cabal.  If you are working+  on some utility functions in the Cabal library you should run this+  test suite.++* `cabal-install:unit-tests` are small, quick-running unit tests on+  small pieces of functionality in cabal-install.  If you are working+  on some utility functions in cabal-install you should run this test+  suite.++* `cabal-install:solver-quickcheck` are QuickCheck tests on+  cabal-install's dependency solver.  If you are working+  on the solver you should run this test suite.++* `cabal-install:integration-tests2` are integration tests on some+  top-level API functions inside the `cabal-install` source code.++For these test executables, `-p` which applies a regex filter to the test+names.++Conventions+-----------++* Spaces, not tabs.++* Try to follow style conventions of a file you are modifying, and+  avoid gratuitous reformatting (it makes merges harder!)++* Format your commit messages [in the standard way](https://chris.beams.io/posts/git-commit/#seven-rules).++* A lot of Cabal does not have top-level comments.  We are trying to+  fix this.  If you add new top-level definitions, please Haddock them;+  and if you spend some time understanding what a function does, help+  us out and add a comment.  We'll try to remind you during code review.++* If you do something tricky or non-obvious, add a comment.++* If your commit only touches comments, you can use `[ci skip]`+  anywhere in the body of the commit message to avoid needlessly+  triggering the build bots.++* For local imports (Cabal module importing Cabal module), import lists+  are NOT required (although you may use them at your discretion.)  For+  third-party and standard library imports, please use either qualified imports+  or explicit import lists.++* You can use basically any GHC extension supported by a GHC in our+  support window, except Template Haskell, which would cause+  bootstrapping problems in the GHC compilation process.++* Our GHC support window is five years for the Cabal library and three+  years for cabal-install: that is, the Cabal library must be+  buildable out-of-the-box with the dependencies that shipped with GHC+  for at least five years.  The Travis CI checks this, so most+  developers submit a PR to see if their code works on all these+  versions of GHC.  `cabal-install` must also be buildable on all+  supported GHCs, although it does not have to be buildable+  out-of-the-box. Instead, the `cabal-install/bootstrap.sh` script+  must be able to download and install all of the dependencies (this+  is also checked by CI). Also, self-upgrade to the latest version+  (i.e. `cabal install cabal-install`) must work with all versions of+  `cabal-install` released during the last three years.++* `Cabal` has its own Prelude, in `Distribution.Compat.Prelude`,+  that provides a compatibility layer and exports some commonly+  used additional functions. Use it in all new modules.++* As far as possible, please do not use CPP. If you must use it,+  try to put it in a `Compat` module, and minimize the amount of code+  that is enclosed by CPP.  For example, prefer:+  ```+  f :: Int -> Int+  #ifdef mingw32_HOST_OS+  f = (+1)+  #else+  f = (+2)+  #endif+  ```++  over:+  ```+  #ifdef mingw32_HOST_OS+  f :: Int -> Int+  f = (+1)+  #else+  f :: Int -> Int+  f = (+2)+  #endif+  ```++We like [this style guide][guide].++[guide]: https://github.com/tibbe/haskell-style-guide/blob/master/haskell-style.md++Communicating+-------------++There are a few main venues of communication:++* Most developers subscribe to receive messages from [all issues](https://github.com/haskell/cabal/issues); issues can be used to [open discussion](https://github.com/haskell/cabal/issues?q=is%3Aissue+is%3Aopen+custom+label%3A%22type%3A+discussion%22).  If you know someone who should hear about a message, CC them explicitly using the @username GitHub syntax.++* For more organizational concerns, the [mailing+  list](http://www.haskell.org/mailman/listinfo/cabal-devel) is used.++* Many developers idle on `#hackage` on `irc.freenode.net` ([archives](http://ircbrowse.net/browse/hackage)).  `#ghc` ([archives](http://ircbrowse.net/browse/ghc)) is also a decently good bet.++Releases+--------++Notes for how to make a release are at the+wiki page ["Making a release"](https://github.com/haskell/cabal/wiki/Making-a-release).+Currently, @23Skidoo, @rthomas, @tibbe and @dcoutts have access to+`haskell.org/cabal`, and @davean is the point of contact for getting+permissions.++API Documentation+-----------------++Auto-generated API documentation for the `master` branch of Cabal is automatically uploaded here: http://haskell.github.io/cabal-website/doc/html/Cabal/.++## Issue triage [![Open Source Helpers](https://www.codetriage.com/haskell/cabal/badges/users.svg)](https://www.codetriage.com/haskell/cabal)++You can contribute by triaging issues which may include reproducing bug reports or asking for vital information, such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to cabal on CodeTriage](https://www.codetriage.com/haskell/cabal).

@@ -1,6 +1,7 @@+cabal-version: >=1.10 name:          Cabal-version:       2.4.1.0-copyright:     2003-2018, Cabal Development Team (see AUTHORS file)+version:       3.1.0.0+copyright:     2003-2019, Cabal Development Team (see AUTHORS file) license:       BSD3 license-file:  LICENSE author:        Cabal Development Team <cabal-devel@haskell.org>@@ -16,7 +17,6 @@   The Haskell Cabal is part of a larger infrastructure for distributing,   organizing, and cataloging Haskell libraries and tools. category:       Distribution-cabal-version:  >=1.10 build-type:     Simple -- If we use a new Cabal feature, this needs to be changed to Custom so -- we can bootstrap.@@ -33,6 +33,8 @@   -- 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/common1.cabal   tests/ParserTests/errors/common1.errors   tests/ParserTests/errors/common2.cabal@@ -49,20 +51,48 @@   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@@ -75,8 +105,6 @@   tests/ParserTests/ipi/transformers.cabal   tests/ParserTests/ipi/transformers.expr   tests/ParserTests/ipi/transformers.format-  tests/ParserTests/regressions/MiniAgda.cabal-  tests/ParserTests/regressions/MiniAgda.check   tests/ParserTests/regressions/Octree-0.5.cabal   tests/ParserTests/regressions/Octree-0.5.expr   tests/ParserTests/regressions/Octree-0.5.format@@ -84,12 +112,18 @@   tests/ParserTests/regressions/bad-glob-syntax.check   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/elif.cabal@@ -110,6 +144,18 @@   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/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@@ -117,9 +163,34 @@   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/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@@ -146,6 +217,9 @@   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@@ -166,6 +240,7 @@   tests/ParserTests/warnings/unknownsection.cabal   tests/ParserTests/warnings/utf8.cabal   tests/ParserTests/warnings/versiontag.cabal+  tests/cbits/rpmvercmp.c   tests/hackage/check.sh   tests/hackage/download.sh   tests/hackage/unpack.sh@@ -208,6 +283,11 @@     ghc-options: -Wcompat -Wnoncanonical-monad-instances                  -Wnoncanonical-monadfail-instances +  if !impl(ghc >= 8.0)+    -- at least one of lib:Cabal's dependency (i.e. `parsec`)+    -- already depends on `fail` and `semigroups` transitively+    build-depends: fail == 4.9.*, semigroups >= 0.18.3 && < 0.20+   exposed-modules:     Distribution.Backpack     Distribution.Backpack.Configure@@ -230,8 +310,8 @@     Distribution.Compat.Graph     Distribution.Compat.Internal.TempFile     Distribution.Compat.Newtype+    Distribution.Compat.ResponseFile     Distribution.Compat.Prelude.Internal-    Distribution.Compat.ReadP     Distribution.Compat.Semigroup     Distribution.Compat.Stack     Distribution.Compat.Time@@ -251,8 +331,6 @@     Distribution.PackageDescription.Configuration     Distribution.PackageDescription.PrettyPrint     Distribution.PackageDescription.Utils-    Distribution.ParseUtils-    Distribution.PrettyUtils     Distribution.ReadE     Distribution.Simple     Distribution.Simple.Bench@@ -276,6 +354,7 @@     Distribution.Simple.Hpc     Distribution.Simple.Install     Distribution.Simple.InstallDirs+    Distribution.Simple.InstallDirs.Internal     Distribution.Simple.LocalBuildInfo     Distribution.Simple.PackageIndex     Distribution.Simple.PreProcess@@ -297,6 +376,7 @@     Distribution.Simple.Program.Types     Distribution.Simple.Register     Distribution.Simple.Setup+    Distribution.Simple.ShowBuildInfo     Distribution.Simple.SrcDist     Distribution.Simple.Test     Distribution.Simple.Test.ExeV10@@ -336,6 +416,7 @@     Distribution.Types.Executable     Distribution.Types.ExecutableScope     Distribution.Types.Library+    Distribution.Types.LibraryVisibility     Distribution.Types.ForeignLib     Distribution.Types.ForeignLibType     Distribution.Types.ForeignLibOption@@ -343,9 +424,13 @@     Distribution.Types.ModuleReexport     Distribution.Types.ModuleRenaming     Distribution.Types.ComponentName+    Distribution.Types.LibraryName     Distribution.Types.MungedPackageName     Distribution.Types.PackageName+    Distribution.Types.PackageName.Magic     Distribution.Types.PkgconfigName+    Distribution.Types.PkgconfigVersion+    Distribution.Types.PkgconfigVersionRange     Distribution.Types.UnqualComponentName     Distribution.Types.IncludeRenaming     Distribution.Types.Mixin@@ -366,12 +451,16 @@     Distribution.Types.TargetInfo     Distribution.Types.Version     Distribution.Types.VersionRange+    Distribution.Types.VersionRange.Internal     Distribution.Types.VersionInterval+    Distribution.Types.GivenComponent+    Distribution.Types.PackageVersionConstraint     Distribution.Utils.Generic     Distribution.Utils.NubList     Distribution.Utils.ShortText     Distribution.Utils.Progress     Distribution.Verbosity+    Distribution.Verbosity.Internal     Distribution.Version     Language.Haskell.Extension     Distribution.Compat.Binary@@ -395,16 +484,20 @@     Distribution.PackageDescription.FieldGrammar     Distribution.PackageDescription.Parsec     Distribution.PackageDescription.Quirks-    Distribution.Parsec.Class-    Distribution.Parsec.Common-    Distribution.Parsec.ConfVar-    Distribution.Parsec.Field-    Distribution.Parsec.FieldLineStream-    Distribution.Parsec.Lexer-    Distribution.Parsec.LexerMonad+    Distribution.Parsec+    Distribution.Parsec.Error     Distribution.Parsec.Newtypes-    Distribution.Parsec.ParseResult-    Distribution.Parsec.Parser+    Distribution.Parsec.Position+    Distribution.Parsec.Warning+    Distribution.Parsec.FieldLineStream+    Distribution.Fields+    Distribution.Fields.ConfVar+    Distribution.Fields.Field+    Distribution.Fields.Lexer+    Distribution.Fields.LexerMonad+    Distribution.Fields.ParseResult+    Distribution.Fields.Parser+    Distribution.Fields.Pretty    -- Lens functionality   exposed-modules:@@ -443,6 +536,7 @@     Distribution.Simple.GHC.EnvironmentParser     Distribution.Simple.GHC.Internal     Distribution.Simple.GHC.ImplInfo+    Distribution.Simple.Utils.Json     Paths_Cabal    if flag(bundled-binary-generic)@@ -489,7 +583,6 @@     Test.Laws     Test.QuickCheck.Utils     UnitTests.Distribution.Compat.CreatePipe-    UnitTests.Distribution.Compat.ReadP     UnitTests.Distribution.Compat.Time     UnitTests.Distribution.Compat.Graph     UnitTests.Distribution.Simple.Glob@@ -502,10 +595,12 @@     UnitTests.Distribution.Utils.NubList     UnitTests.Distribution.Utils.ShortText     UnitTests.Distribution.Version+    UnitTests.Distribution.PkgconfigVersion   main-is: UnitTests.hs   build-depends:     array,     base,+    binary,     bytestring,     containers,     directory,@@ -531,6 +626,7 @@     base,     base-compat >=0.10.4 && <0.11,     bytestring,+    directory,     filepath,     tasty >= 1.1.0.3 && < 1.2,     tasty-hunit,@@ -541,9 +637,12 @@   ghc-options: -Wall   default-language: Haskell2010 +  if !impl(ghc >= 8.0)+    build-depends:  semigroups+   if impl(ghc >= 7.8)     build-depends:-      tree-diff      >= 0.0.1 && <0.1+      tree-diff      >= 0.0.2 && <0.1     other-modules:       Instances.TreeDiff       Instances.TreeDiff.Language@@ -557,6 +656,7 @@   build-depends:     base,     bytestring,+    directory,     filepath,     tasty >= 1.1.0.3 && < 1.2,     tasty-golden >=2.3.1.1 && <2.4,@@ -564,6 +664,8 @@     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@@ -603,11 +705,12 @@     base-compat          >=0.10.4   && <0.11,     base-orphans         >=0.6      && <0.9,     optparse-applicative >=0.13.2.0 && <0.15,+    stm                  >=2.4.5.0  && <2.6,     tar                  >=0.5.0.3  && <0.6    if impl(ghc >= 7.8)     build-depends:-      tree-diff      >= 0.0.1 && <0.1+      tree-diff      >= 0.0.2 && <0.1     other-modules:       Instances.TreeDiff       Instances.TreeDiff.Language@@ -616,4 +719,26 @@    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.1.0.3 && < 1.2,+    tasty-hunit,+    tasty-quickcheck,+    QuickCheck++  c-sources: tests/cbits/rpmvercmp.c+  cc-options: -Wall++  ghc-options: -Wall   default-language: Haskell2010

@@ -1,9 +1,60 @@+# 3.1.0.0 (current development version)++# 3.0.0.0 TBD+  * TODO+  * Introduce set notation for `^>=` and `==` operators+    ([#5906](https://github.com/haskell/cabal/pull/5906)).+  * 'check' reports warnings for various ghc-\*-options fields separately+    ([#5342](https://github.com/haskell/cabal/issues/5432)).+  * `KnownExtension`: added new extensions `DerivingVia` and+    `EmptyDataDeriving`.+  * Add `extra-dynamic-library-flavours`, to specify extra dynamic library+    flavours to build and install from a .cabal file.+  * `autoconfUserHooks` now passes `--host=$HOST` when cross-compiling+  * Introduce multiple public libraries feature+    ([#5526](https://github.com/haskell/cabal/pull/5526)).+    * New build-depends syntax+    * Add a set of library components to the `Dependency` datatype+    * New `visibility` field in the `library` stanza+    * New `LibraryVisibility` field in `InstalledPackageInfo`+    * New syntax for the `--dependency` Cabal flag+  * Static linking+    * Add `--enable-executable-static` flag for building fully+      static executables (GHC's normal "statish" linking links+      Haskell libraries statically, but libc and system dependencies+      dynamically). This new flag links everything statically.+    * Note you likely want to link against `musl` or another libc that+      supports fully static linking;+      [`glibc` has some issues](https://sourceware.org/glibc/wiki/FAQ#Even_statically_linked_programs_need_some_shared_libraries_which_is_not_acceptable_for_me.__What_can_I_do.3F)+      with fully static linking.+  * Fix corrupted config file header for non-ASCII package names+    ([2557](https://github.com/haskell/cabal/issues/2557)).+  * Extend `Distribution.Simple.Utils.rewriteFileEx` from ASCII to UTF-8 encoding.+  * Change the arguments of `Newtype` class to better suit @DeriveAnyClass@ usage,+    add default implementation in terms of `coerce` / `unsafeCoerce`.+  * Implement support for response file arguments to defaultMain* and cabal-install.+  * Uniformly provide 'Semigroup' instances for `base < 4.9` via `semigroups` package+  * Setting `debug-info` now implies `library-stripping: False` and+    `executable-stripping: False) ([#2702](https://github.com/haskell/cabal/issues/2702))+  * `Setup.hs copy` and `install` now work in the presence of+    `data-files` that use `**` syntax+    ([#6125](https://github.com/haskell/cabal/issues/6125)).++----++### 2.4.1.1 [Mikhail Glushenkov](mailto:mikhail.glushenkov@gmail.com) December 2018++  * Fix `--with-compiler` failing to locate compiler on Windows+    ([#5753](https://github.com/haskell/cabal/pull/5753)).+  * Cabal can once again be built with GHC 7.8 and 7.6+    ([#5730](https://github.com/haskell/cabal/pull/5730)).+ ### 2.4.1.0 [Mikhail Glushenkov](mailto:mikhail.glushenkov@gmail.com) November 2018    * Warnings in autogenerated files are now silenced-    ([#5678](https://github.com/haskell/cabal/pulls/5678)).+    ([#5678](https://github.com/haskell/cabal/pull/5678)).   * Improved recompilation avoidance, especially when using GHC 8.6-    ([#5589](https://github.com/haskell/cabal/pulls/5589)).+    ([#5589](https://github.com/haskell/cabal/pull/5589)).   * Do not error on empty packagedbs in `getInstalledPackages`     ([#5516](https://github.com/haskell/cabal/issues/5516)). @@ -26,6 +77,8 @@     `non`) and an optics to access the modules in a component     of a `PackageDescription` by the `ComponentName`:     `componentBuildInfo` and `componentModules`+  * Linker `ld-options` are now passed to GHC as `-optl` options+    ([#4925](https://github.com/haskell/cabal/pull/4925)).   * Add `readGhcEnvironmentFile` to parse GHC environment files.   * Drop support for GHC 7.4, since it is out of our support window     (and has been for over a year!)@@ -414,7 +467,7 @@   * Experimental support for emitting DWARF debug info.   * Preliminary support for relocatable packages.   * Allow cabal to be used inside cabal exec enviroments.-  * hpc: support mutliple "ways" (e.g. profiling and vanilla).+  * hpc: support multiple "ways" (e.g. profiling and vanilla).   * Support GHCJS.   * Improved command line documentation.   * Add `-none` constraint syntax for version ranges (#2093).

@@ -29,8 +29,6 @@     OpenModuleSubst,     dispOpenModuleSubst,     dispOpenModuleSubstEntry,-    parseOpenModuleSubst,-    parseOpenModuleSubstEntry,     parsecOpenModuleSubst,     parsecOpenModuleSubstEntry,     openModuleSubstFreeHoles,@@ -41,18 +39,15 @@ ) where  import Distribution.Compat.Prelude hiding (mod)-import Distribution.Compat.ReadP   ((<++))-import Distribution.Parsec.Class+import Distribution.Parsec import Distribution.Pretty import Prelude () import Text.PrettyPrint            (hcat)  import qualified Distribution.Compat.CharParsing as P-import qualified Distribution.Compat.ReadP       as Parse import qualified Text.PrettyPrint                as Disp  import Distribution.ModuleName-import Distribution.Text import Distribution.Types.ComponentId import Distribution.Types.Module import Distribution.Types.UnitId@@ -134,15 +129,6 @@                        parsecOpenModuleSubst             return (IndefFullUnitId cid insts) -instance Text OpenUnitId where-    parse = parseOpenUnitId <++ fmap DefiniteUnitId parse-      where-        parseOpenUnitId = do-            cid <- parse-            insts <- Parse.between (Parse.char '[') (Parse.char ']')-                       parseOpenModuleSubst-            return (IndefFullUnitId cid insts)- -- | Get the set of holes ('ModuleVar') embedded in a 'UnitId'. openUnitIdFreeHoles :: OpenUnitId -> Set ModuleName openUnitIdFreeHoles (IndefFullUnitId _ insts) = openModuleSubstFreeHoles insts@@ -211,20 +197,6 @@             _ <- P.char '>'             return (OpenModuleVar mod_name) -instance Text OpenModule where-    parse = parseModuleVar <++ parseOpenModule-      where-        parseOpenModule = do-            uid <- parse-            _ <- Parse.char ':'-            mod_name <- parse-            return (OpenModule uid mod_name)-        parseModuleVar = do-            _ <- Parse.char '<'-            mod_name <- parse-            _ <- Parse.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@@ -249,21 +221,7 @@  -- | Pretty-print a single entry of a module substitution. dispOpenModuleSubstEntry :: (ModuleName, OpenModule) -> Disp.Doc-dispOpenModuleSubstEntry (k, v) = disp k <<>> Disp.char '=' <<>> disp v---- | Inverse to 'dispModSubst'.-parseOpenModuleSubst :: Parse.ReadP r OpenModuleSubst-parseOpenModuleSubst = fmap Map.fromList-      . flip Parse.sepBy (Parse.char ',')-      $ parseOpenModuleSubstEntry---- | Inverse to 'dispModSubstEntry'.-parseOpenModuleSubstEntry :: Parse.ReadP r (ModuleName, OpenModule)-parseOpenModuleSubstEntry =-    do k <- parse-       _ <- Parse.char '='-       v <- parse-       return (k, v)+dispOpenModuleSubstEntry (k, v) = pretty k <<>> Disp.char '=' <<>> pretty v  -- | Inverse to 'dispModSubst'. --@@ -307,5 +265,5 @@   | Map.null subst = Nothing   | otherwise =       Just . hashToBase62 $-        concat [ display mod_name ++ "=" ++ display m ++ "\n"+        concat [ prettyShow mod_name ++ "=" ++ prettyShow m ++ "\n"                | (mod_name, m) <- Map.toList subst]

@@ -20,8 +20,7 @@ import Distribution.Compat.Graph (Graph, Node(..)) import qualified Distribution.Compat.Graph as Graph -import Distribution.Text-    ( Text(disp) )+import Distribution.Pretty (pretty) import Text.PrettyPrint  ------------------------------------------------------------------------------@@ -42,8 +41,8 @@ -- dispComponentsWithDeps :: ComponentsWithDeps -> Doc dispComponentsWithDeps graph =-    vcat [ hang (text "component" <+> disp (componentName c)) 4-                (vcat [ text "dependency" <+> disp cdep | cdep <- cdeps ])+    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@@ -66,16 +65,17 @@       (CExeName <$> getAllInternalToolDependencies pkg_descr bi)        ++ [ if pkgname == packageName pkg_descr-           then CLibName-           else CSubLibName toolname-         | Dependency pkgname _ <- targetBuildDepends bi+           then CLibName LMainLibName+           else CLibName (LSubLibName toolname)+         | Dependency pkgname _ _ <- targetBuildDepends bi          , let toolname = packageNameToUnqualComponentName pkgname          , toolname `elem` internalPkgDeps ]       where         bi = componentBuildInfo component         internalPkgDeps = map (conv . libName) (allLibraries pkg_descr)-        conv Nothing = packageNameToUnqualComponentName $ packageName pkg_descr-        conv (Just s) = s++        conv LMainLibName    = packageNameToUnqualComponentName $ packageName pkg_descr+        conv (LSubLibName s) = s  -- | Given the package description and a 'PackageDescription' (used -- to determine if a package name is internal or not), sort the

@@ -41,6 +41,7 @@ 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(..))@@ -50,7 +51,7 @@     ( lefts ) import qualified Data.Set as Set import qualified Data.Map as Map-import Distribution.Text+import Distribution.Pretty import Text.PrettyPrint  ------------------------------------------------------------------------------@@ -105,7 +106,7 @@             | Just pkg <- PackageIndex.lookupUnitId installedPackageSet uid             = FullUnitId (Installed.installedComponentId pkg)                  (Map.fromList (Installed.instantiatedWith pkg))-            | otherwise = error ("uid_lookup: " ++ display uid)+            | otherwise = error ("uid_lookup: " ++ prettyShow uid)           where uid = unDefUnitId def_uid     graph2 <- toLinkedComponents verbosity uid_lookup                     (package pkg_descr) shape_pkg_map graph1@@ -186,14 +187,14 @@              ++ "packages must be rebuilt before they can be used.\n"              -- TODO: Undupe.              ++ unlines [ "installed package "-                       ++ display (packageId pkg)+                       ++ prettyShow (packageId pkg)                        ++ " is broken due to missing package "-                       ++ intercalate ", " (map display deps)+                       ++ intercalate ", " (map prettyShow deps)                         | (Left pkg, deps) <- broken ]              ++ unlines [ "planned package "-                       ++ display (packageId pkg)+                       ++ prettyShow (packageId pkg)                        ++ " is broken due to missing package "-                       ++ intercalate ", " (map display deps)+                       ++ intercalate ", " (map prettyShow deps)                         | (Right pkg, deps) <- broken ]      -- In this section, we'd like to look at the 'packageDependsIndex'@@ -224,9 +225,9 @@         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" <+> disp (packageName user) <+>-                       parens (disp (installedUnitId user)) <+> text "requires" <+>-                       disp inst+               (vcat [ text "package" <+> pretty (packageName user) <+>+                       parens (pretty (installedUnitId user)) <+> text "requires" <+>+                       pretty inst                      | (_dep_key, insts) <- inconsistencies                      , (inst, users) <- insts                      , user <- users ])@@ -277,7 +278,7 @@                     Right instc -> [ (m, OpenModule (DefiniteUnitId uid') m')                                    | (m, Module uid' m') <- instc_insts instc ] -            compat_name = computeCompatPackageName (packageName rc) (libName lib)+            compat_name = MungedPackageName (packageName rc) (libName lib)             compat_key = computeCompatPackageKey comp compat_name (packageVersion rc) this_uid          in LibComponentLocalBuildInfo {

@@ -30,6 +30,7 @@ import Distribution.Types.PackageName import Distribution.Types.Mixin import Distribution.Types.ComponentName+import Distribution.Types.LibraryName import Distribution.Types.UnqualComponentName import Distribution.Types.ComponentInclude import Distribution.Package@@ -45,7 +46,7 @@ import Control.Monad import qualified Data.Set as Set import qualified Data.Map as Map-import Distribution.Text+import Distribution.Pretty import Text.PrettyPrint  -- | A configured component, we know exactly what its 'ComponentId' is,@@ -91,8 +92,9 @@ -- | Pretty-print a 'ConfiguredComponent'. dispConfiguredComponent :: ConfiguredComponent -> Doc dispConfiguredComponent cc =-    hang (text "component" <+> disp (cc_cid cc)) 4-         (vcat [ hsep $ [ text "include", disp (ci_id incl), disp (ci_renaming incl) ]+    hang (text "component" <+> pretty (cc_cid cc)) 4+         (vcat [ hsep $ [ text "include"+                        , pretty (ci_id incl), pretty (ci_renaming incl) ]                | incl <- cc_includes cc                ]) @@ -114,9 +116,9 @@         aid <- case Map.lookup keys deps_map of                 Nothing ->                     dieProgress $-                        text "Mix-in refers to non-existent package" <+>-                        quotes (disp name) $$-                        text "(did you forget to add the package to build-depends?)"+                    text "Mix-in refers to non-existent package" <+>+                    quotes (pretty name) $$+                    text "(did you forget to add the package to build-depends?)"                 Just r  -> return r         return ComponentInclude {                 ci_ann_id   = aid,@@ -150,7 +152,7 @@     bi = componentBuildInfo component     deps_map = Map.fromList [ ((packageName dep, ann_cname dep), dep)                             | dep <- lib_deps ]-    is_public = componentName component == CLibName+    is_public = componentName component == CLibName LMainLibName  type ConfiguredComponentMap =         Map PackageName (Map ComponentName (AnnotatedId ComponentId))@@ -165,16 +167,30 @@ toConfiguredComponent pkg_descr this_cid lib_dep_map exe_dep_map component = do     lib_deps <-         if newPackageDepsBehaviour pkg_descr-            then forM (targetBuildDepends bi) $ \(Dependency name _) -> do-                    let (pn, cn) = fixFakePkgName pkg_descr name-                    value <- case Map.lookup cn =<< Map.lookup pn lib_dep_map of+            then fmap concat $ forM (targetBuildDepends bi) $+                 \(Dependency name _ sublibs) -> do+                    -- The package name still needs fixing in case of legacy+                    -- sublibrary dependency syntax+                    let (pn, _) = fixFakePkgName pkg_descr name+                    pkg <- case Map.lookup pn lib_dep_map of                         Nothing ->                             dieProgress $-                                text "Dependency on unbuildable (i.e. 'buildable: False')" <+>-                                text (showComponentName cn) <+>-                                text "from" <+> disp pn-                        Just v -> return v-                    return value+                                text "Dependency on unbuildable" <+>+                                text "package" <+> pretty pn+                        Just p -> return p+                    -- Return all library components+                    forM (Set.toList sublibs) $ \lib ->+                        let comp = CLibName lib in+                        case Map.lookup (CLibName $ LSubLibName $+                                         packageNameToUnqualComponentName name) pkg+                         <|> Map.lookup comp pkg+                        of+                            Nothing ->+                                dieProgress $+                                    text "Dependency on unbuildable" <+>+                                    text (showLibraryName lib) <+>+                                    text "from" <+> pretty pn+                            Just v -> return v             else return old_style_lib_deps     mkConfiguredComponent        pkg_descr this_cid@@ -192,7 +208,7 @@                          | (pn, comp_map) <- Map.toList lib_dep_map                          , pn /= packageName pkg_descr                          , (cn, e) <- Map.toList comp_map-                         , cn == CLibName ]+                         , 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@@ -231,8 +247,8 @@                 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))+    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 ] @@ -293,11 +309,14 @@ -- and internal libraries are specified the same. For now, we assume internal -- libraries shadow, and this function disambiguates accordingly, but soon the -- underlying ambiguity will be addressed.+-- Multiple public libraries (cabal 3.0) added an unambiguous way of specifying+-- sublibraries, but we still have to support the old syntax for bc reasons. fixFakePkgName :: PackageDescription -> PackageName -> (PackageName, ComponentName) fixFakePkgName pkg_descr pn =   if subLibName `elem` internalLibraries-  then (packageName pkg_descr, CSubLibName subLibName)-  else (pn,                    CLibName)+  then (packageName pkg_descr, CLibName (LSubLibName subLibName))+  else (pn,                    CLibName LMainLibName            )   where-    subLibName = packageNameToUnqualComponentName pn-    internalLibraries = mapMaybe libName (allLibraries pkg_descr)+    subLibName        = packageNameToUnqualComponentName pn+    internalLibraries = mapMaybe (libraryNameString . libName)+                        (allLibraries pkg_descr)

@@ -1,17 +1,17 @@-{-# LANGUAGE Rank2Types #-} {-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE Rank2Types       #-} module Distribution.Backpack.DescribeUnitId where -import Prelude () import Distribution.Compat.Prelude+import Prelude () -import Distribution.Types.PackageId-import Distribution.Types.ComponentName import Distribution.Compat.Stack-import Distribution.Verbosity import Distribution.ModuleName-import Distribution.Text+import Distribution.Pretty import Distribution.Simple.Utils+import Distribution.Types.ComponentName+import Distribution.Types.PackageId+import Distribution.Verbosity  import Text.PrettyPrint @@ -37,7 +37,7 @@ -- for (2) which component (with enough details to uniquely identify -- the build in question.) ---setupMessage' :: Text a => Verbosity+setupMessage' :: Pretty a => Verbosity              -> String            -- ^ Operation being done (capitalized), on:              -> PackageIdentifier -- ^ Package              -> ComponentName     -- ^ Component name@@ -50,7 +50,7 @@       case mb_insts of         Just insts | not (null insts) ->           hang (msg_doc <+> text "instantiated with") 2-               (vcat [ disp k <+> text "=" <+> disp v+               (vcat [ pretty k <+> text "=" <+> pretty v                      | (k,v) <- insts ]) $$           for_doc         _ ->@@ -58,4 +58,4 @@    where     msg_doc = text msg <+> text (showComponentName cname)-    for_doc = text "for" <+> disp pkgid <<>> text ".."+    for_doc = text "for" <+> pretty pkgid <<>> text ".."

@@ -5,7 +5,6 @@ module Distribution.Backpack.Id(     computeComponentId,     computeCompatPackageKey,-    computeCompatPackageName, ) where  import Prelude ()@@ -24,8 +23,9 @@ import Distribution.Utils.Base62 import Distribution.Version -import Distribution.Text-    ( display, simpleParse )+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@@ -50,11 +50,11 @@                 -- For safety, include the package + version here                 -- for GHC 7.10, where just the hash is used as                 -- the package key-                    (    display pid+                    (    prettyShow pid                       ++ show dep_ipids                       ++ show flags     )             | otherwise = ""-        generated_base = display pid ++ hash_suffix+        generated_base = prettyShow pid ++ hash_suffix         explicit_base cid0 = fromPathTemplate (InstallDirs.substPathTemplate env                                                     (toPathTemplate cid0))             -- Hack to reuse install dirs machinery@@ -62,7 +62,7 @@           where env = packageTemplateEnv pid (mkUnitId "")         actual_base = case mb_ipid of                         Flag ipid0 -> explicit_base ipid0-                        NoFlag | deterministic -> display pid+                        NoFlag | deterministic -> prettyShow pid                                | otherwise     -> generated_base     in case mb_cid of           Flag cid -> cid@@ -126,15 +126,15 @@     -> String computeCompatPackageKey comp pkg_name pkg_version uid     | not (packageKeySupported comp) =-        display pkg_name ++ "-" ++ display pkg_version+        prettyShow pkg_name ++ "-" ++ prettyShow pkg_version     | not (unifiedIPIDRequired comp) =         let str = unUnitId uid -- assume no Backpack support             mb_verbatim_key-                = case simpleParse str :: Maybe PackageId of+                = 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 | display pid0 == str -> Just str+                    Just pid0 | prettyShow pid0 == str -> Just str                     _ -> Nothing             mb_truncated_key                 = let cand = reverse (takeWhile isAlphaNum (reverse str))@@ -143,4 +143,4 @@                         else Nothing             rehashed_key = hashToBase62 str         in fromMaybe rehashed_key (mb_verbatim_key `mplus` mb_truncated_key)-    | otherwise = display uid+    | otherwise = prettyShow uid

@@ -45,8 +45,7 @@ import qualified Data.Map as Map import Data.Traversable     ( mapM )-import Distribution.Text-    ( Text(disp) )+import Distribution.Pretty (pretty) import Text.PrettyPrint import Data.Either @@ -104,11 +103,11 @@  dispLinkedComponent :: LinkedComponent -> Doc dispLinkedComponent lc =-    hang (text "unit" <+> disp (lc_uid lc)) 4 $-         vcat [ text "include" <+> disp (ci_id incl) <+> disp (ci_renaming incl)+    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" <+> disp (ci_id incl)+         vcat [ text "signature include" <+> pretty (ci_id incl)               | incl <- lc_sig_includes lc ]             $+$ dispOpenModuleSubst (modShapeProvides (lc_shape lc)) @@ -230,7 +229,7 @@     when (not (Set.null reqs) && isNotLib component) $         dieProgress $             hang (text "Non-library component has unfilled requirements:")-                4 (vcat [disp req | req <- Set.toList reqs])+                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@@ -285,7 +284,7 @@     let build_reexports m (k, v)             | Map.member k m =                 dieProgress $ hsep-                    [ text "Module name ", disp k, text " is exported multiple times." ]+                    [ 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@@ -364,17 +363,17 @@  brokenReexportMsg :: ModuleReexport -> Doc brokenReexportMsg (ModuleReexport (Just pn) from _to) =-  vcat [ text "The package" <+> quotes (disp pn)-       , text "does not export a module" <+> quotes (disp from) ]+  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 (disp from)+  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 (disp from)+  vcat [ text "Ambiguous reexport" <+> quotes (pretty from)        , hang (text "It could refer to either:") 2             (vcat (msg : msgs))        , help_msg mb_pn ]@@ -393,7 +392,7 @@            , text "mixins field to rename one of the module"            , text "names differently." ]     displayModuleWithSource y-      = vcat [ quotes (disp (unWithSource y))+      = vcat [ quotes (pretty (unWithSource y))              , text "brought into scope by" <+>                 dispModuleSource (getSource y)              ]

@@ -14,7 +14,7 @@  import qualified Distribution.Utils.UnionFind as UnionFind import Distribution.ModuleName-import Distribution.Text+import Distribution.Pretty import Distribution.Types.ComponentId  import Text.PrettyPrint@@ -56,10 +56,10 @@             Just () -> return ()             Nothing -> do                 addErr $-                  text "Ambiguous module" <+> quotes (disp mod_name) $$+                  text "Ambiguous module" <+> quotes (pretty mod_name) $$                   text "It could refer to" <+>-                    ( text "  " <+> (quotes (disp mod)  $$ in_scope_by (getSource prov)) $$-                      text "or" <+> (quotes (disp mod') $$ in_scope_by (getSource prov')) ) $$+                    ( 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)@@ -67,7 +67,7 @@     case mod of       OpenModule (IndefFullUnitId cid _) _         | cid == self_cid -> addErr $-            text "Cannot instantiate requirement" <+> quotes (disp mod_name) <+>+            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." $$@@ -79,9 +79,9 @@         Just () -> return ()         Nothing -> do             -- TODO: Record and report WHERE the bad constraint came from-            addErr $ text "Could not instantiate requirement" <+> quotes (disp mod_name) $$-                     nest 4 (text "Expected:" <+> disp mod $$-                             text "Actual:  " <+> disp req_mod) $$+            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@@ -90,7 +90,7 @@     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 (disp mod_name)+    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)@@ -117,8 +117,8 @@                 | u1 == u2  -> return ()                 | otherwise ->                     failWith $ hang (text "Couldn't match unit IDs:") 4-                               (text "   " <+> disp u1 $$-                                text "and" <+> disp u2)+                               (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)@@ -151,8 +151,8 @@         -- easier to understand error message.         failWith $             hang (text "Couldn't match component IDs:") 4-                 (text "   " <+> disp cid1 $$-                  text "and" <+> disp cid2)+                 (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@@ -176,8 +176,8 @@                 when (mod_name1 /= mod_name2) $                     failWith $                         hang (text "Cannot match module names") 4 $-                            text "   " <+> disp mod_name1 $$-                            text "and" <+> disp mod_name2+                            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

@@ -23,10 +23,11 @@ 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 Distribution.Text  import qualified Data.Map as Map import Text.PrettyPrint@@ -96,15 +97,15 @@ -- TODO: Deduplicate this with Distribution.Backpack.UnifyM.ci_msg dispModuleSource :: ModuleSource -> Doc dispModuleSource (FromMixins pn cn incls)-  = text "mixins:" <+> dispComponent pn cn <+> disp incls+  = text "mixins:" <+> dispComponent pn cn <+> pretty incls dispModuleSource (FromBuildDepends pn cn)   = text "build-depends:" <+> dispComponent pn cn dispModuleSource (FromExposedModules m)-  = text "exposed-modules:" <+> disp m+  = text "exposed-modules:" <+> pretty m dispModuleSource (FromOtherModules m)-  = text "other-modules:" <+> disp m+  = text "other-modules:" <+> pretty m dispModuleSource (FromSignatures m)-  = text "signatures:" <+> disp m+  = text "signatures:" <+> pretty m  -- Dependency dispComponent :: PackageName -> ComponentName -> Doc@@ -113,10 +114,10 @@     -- should be clear enough.  To do source syntax, we'd     -- need to know what the package we're linking is.     case cn of-        CLibName -> disp pn-        CSubLibName ucn -> disp pn <<>> colon <<>> disp ucn+        CLibName LMainLibName -> pretty pn+        CLibName (LSubLibName ucn) -> pretty pn <<>> colon <<>> pretty ucn         -- Case below shouldn't happen-        _ -> disp pn <+> parens (disp cn)+        _ -> pretty pn <+> parens (pretty cn)  -- | An 'OpenModule', annotated with where it came from in a Cabal file. data WithSource a = WithSource ModuleSource a

@@ -46,7 +46,7 @@ ipiToPreExistingComponent ipi =     PreExistingComponent {         pc_pkgname = packageName ipi,-        pc_compname = libraryComponentName $ Installed.sourceLibName ipi,+        pc_compname = CLibName $ Installed.sourceLibName ipi,         pc_munged_id = mungedId ipi,         pc_uid   = Installed.installedUnitId ipi,         pc_cid   = Installed.installedComponentId ipi,

@@ -26,12 +26,14 @@ 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@@ -43,9 +45,10 @@ import Control.Monad import Text.PrettyPrint import qualified Data.Map as Map+import qualified Data.Set as Set  import Distribution.Version-import Distribution.Text+import Distribution.Pretty  -- | A 'ReadyComponent' is one that we can actually generate build -- products for.  We have a ready component for the typecheck-only@@ -134,15 +137,14 @@                 (instc_includes instc)               ++ instc_insts_deps instc   where-    toMungedPackageId :: Text id => ComponentInclude id rn -> MungedPackageId+    toMungedPackageId :: Pretty id => ComponentInclude id rn -> MungedPackageId     toMungedPackageId ci =         computeCompatPackageId             (ci_pkgid ci)             (case ci_cname ci of-                CLibName -> Nothing-                CSubLibName uqn -> Just uqn-                _ -> error $ display (rc_cid rc) ++-                        " depends on non-library " ++ display (ci_id ci))+                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.@@ -178,9 +180,9 @@     hang (text (case rc_i rc of                     Left  _ -> "indefinite"                     Right _ -> "definite")-            <+> disp (nodeKey rc)+            <+> pretty (nodeKey rc)             {- <+> dispModSubst (Map.fromList (lc_insts lc)) -} ) 4 $-        vcat [ text "depends" <+> disp uid+        vcat [ text "depends" <+> pretty uid              | uid <- nodeNeighbors rc ]  -- | The state of 'InstM'; a mapping from 'UnitId's to their@@ -274,7 +276,7 @@                             fmap rc_munged_id (join (Map.lookup dep_uid s)))]                   where                     err_pid = MungedPackageId-                        (mkMungedPackageName "nonexistent-package-this-is-a-cabal-bug")+                        (MungedPackageName nonExistentPackageThisIsCabalBug LMainLibName)                         (mkVersion [0])                 instc = InstantiatedComponent {                             instc_insts = Map.toList insts,@@ -336,11 +338,19 @@     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 <- mapM (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 = lc_includes lc ++ lc_sig_includes lc+                        indefc_includes = inst_includes ++ lc_sig_includes lc                     }             return $ Just ReadyComponent {                     rc_ann_id       = (lc_ann_id lc) { ann_id = uid },@@ -357,6 +367,7 @@     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

@@ -56,7 +56,7 @@ import Distribution.ModuleName import Distribution.Package import Distribution.PackageDescription-import Distribution.Text+import Distribution.Pretty import Distribution.Types.IncludeRenaming import Distribution.Types.ComponentInclude import Distribution.Types.AnnotatedId@@ -436,15 +436,15 @@ ci_msg :: ComponentInclude (OpenUnitId, ModuleShape) IncludeRenaming -> Doc ci_msg ci   | ci_implicit ci = text "build-depends:" <+> pp_pn-  | otherwise = text "mixins:" <+> pp_pn <+> disp (ci_renaming ci)+  | otherwise = text "mixins:" <+> pp_pn <+> pretty (ci_renaming ci)   where     pn = pkgName (ci_pkgid ci)     pp_pn =         case ci_cname ci of-            CLibName -> disp pn-            CSubLibName cn -> disp pn <<>> colon <<>> disp cn+            CLibName LMainLibName -> pretty pn+            CLibName (LSubLibName cn) -> pretty pn <<>> colon <<>> pretty cn             -- Shouldn't happen-            cn -> disp pn <+> parens (disp cn)+            cn -> pretty pn <+> parens (pretty cn)  -- | Convert a 'ModuleShape' into a 'ModuleScopeU', so we can do -- unification on it.@@ -505,8 +505,8 @@         []  -> error "req_rename"         [v] -> return v         v:vs -> do addErr $-                    text "Conflicting renamings of requirement" <+> quotes (disp k) $$-                    text "Renamed to: " <+> vcat (map disp (v:vs))+                    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@@ -536,9 +536,9 @@     unless (Set.null leftover) $         addErr $             hang (text "The" <+> text (showComponentName compname) <+>-                  text "from package" <+> quotes (disp pid)+                  text "from package" <+> quotes (pretty pid)                   <+> text "does not require:") 4-                 (vcat (map disp (Set.toList leftover)))+                 (vcat (map pretty (Set.toList leftover)))      -- Provision computation is more complex.     -- For example, if we have:@@ -576,8 +576,8 @@                 [ case Map.lookup from provs of                     Just m -> return (to, m)                     Nothing -> failWith $-                        text "Package" <+> quotes (disp pid) <+>-                        text "does not expose the module" <+> quotes (disp from)+                        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

@@ -4,73 +4,88 @@  import Prelude () import Distribution.Compat.Prelude-import qualified Data.Set as Set  -- | Different Cabal-the-spec versions. -- -- We branch based on this at least in the parser. -- data CabalSpecVersion-    = CabalSpecOld+    = CabalSpecV1_0 -- ^ this is older than 'CabalSpecV1_2'+    | CabalSpecV1_2 -- ^ new syntax (sections)+    | CabalSpecV1_4+    | CabalSpecV1_6+    | CabalSpecV1_8+    | CabalSpecV1_10+    | CabalSpecV1_12+    -- 1.16 -- 1.14: no changes+    | CabalSpecV1_18+    | CabalSpecV1_20     | CabalSpecV1_22     | CabalSpecV1_24     | CabalSpecV2_0     | CabalSpecV2_2     | CabalSpecV2_4+    | CabalSpecV3_0   deriving (Eq, Ord, Show, Read, Enum, Bounded, Typeable, Data, Generic) -cabalSpecLatest :: CabalSpecVersion-cabalSpecLatest = CabalSpecV2_4+-- | Show cabal spec version, but not the way in the .cabal files+--+-- @since 3.0.0.0+showCabalSpecVersion :: CabalSpecVersion -> String+showCabalSpecVersion CabalSpecV3_0  = "3.0"+showCabalSpecVersion CabalSpecV2_4  = "2.4"+showCabalSpecVersion CabalSpecV2_2  = "2.2"+showCabalSpecVersion CabalSpecV2_0  = "2.0"+showCabalSpecVersion CabalSpecV1_24 = "1.24"+showCabalSpecVersion CabalSpecV1_22 = "1.22"+showCabalSpecVersion CabalSpecV1_20 = "1.20"+showCabalSpecVersion CabalSpecV1_18 = "1.18"+showCabalSpecVersion CabalSpecV1_12 = "1.12"+showCabalSpecVersion CabalSpecV1_10 = "1.10"+showCabalSpecVersion CabalSpecV1_8  = "1.8"+showCabalSpecVersion CabalSpecV1_6  = "1.6"+showCabalSpecVersion CabalSpecV1_4  = "1.4"+showCabalSpecVersion CabalSpecV1_2  = "1.2"+showCabalSpecVersion CabalSpecV1_0  = "1.0" -cabalSpecFeatures :: CabalSpecVersion -> Set.Set CabalFeature-cabalSpecFeatures CabalSpecOld   = Set.empty-cabalSpecFeatures CabalSpecV1_22 = Set.empty-cabalSpecFeatures CabalSpecV1_24 = Set.empty-cabalSpecFeatures CabalSpecV2_0  = Set.empty-cabalSpecFeatures CabalSpecV2_2  = Set.fromList-    [ Elif-    , CommonStanzas-    ]-cabalSpecFeatures CabalSpecV2_4  = Set.fromList-    [ Elif-    , CommonStanzas-    , Globstar-    ]+cabalSpecLatest :: CabalSpecVersion+cabalSpecLatest = CabalSpecV3_0 -cabalSpecSupports :: CabalSpecVersion -> [Int] -> Bool-cabalSpecSupports CabalSpecOld v   = v < [1,21]-cabalSpecSupports CabalSpecV1_22 v = v < [1,23]-cabalSpecSupports CabalSpecV1_24 v = v < [1,25]-cabalSpecSupports CabalSpecV2_0 v  = v < [2,1]-cabalSpecSupports CabalSpecV2_2 v  = v < [2,3]-cabalSpecSupports CabalSpecV2_4 _  = True+cabalSpecFromVersionDigits :: [Int] -> CabalSpecVersion+cabalSpecFromVersionDigits v+    | v >= [2,5]  = CabalSpecV3_0+    | v >= [2,3]  = CabalSpecV2_4+    | v >= [2,1]  = CabalSpecV2_2+    | v >= [1,25] = CabalSpecV2_0+    | v >= [1,23] = CabalSpecV1_24+    | v >= [1,21] = CabalSpecV1_22+    | v >= [1,19] = CabalSpecV1_20+    | v >= [1,17] = CabalSpecV1_18+    | v >= [1,11] = CabalSpecV1_12+    | v >= [1,9]  = CabalSpecV1_10+    | v >= [1,7]  = CabalSpecV1_8+    | v >= [1,5]  = CabalSpecV1_6+    | v >= [1,3]  = CabalSpecV1_4+    | v >= [1,1]  = CabalSpecV1_2+    | otherwise   = CabalSpecV1_0  specHasCommonStanzas :: CabalSpecVersion -> HasCommonStanzas-specHasCommonStanzas CabalSpecV2_2 = HasCommonStanzas-specHasCommonStanzas CabalSpecV2_4 = HasCommonStanzas-specHasCommonStanzas _             = NoCommonStanzas+specHasCommonStanzas v =+    if v >= CabalSpecV2_2+    then HasCommonStanzas+    else NoCommonStanzas  specHasElif :: CabalSpecVersion -> HasElif-specHasElif CabalSpecV2_2 = HasElif-specHasElif CabalSpecV2_4 = HasElif-specHasElif _             = NoElif------------------------------------------------------------------------------------ Features----------------------------------------------------------------------------------data CabalFeature-    = Elif-    | CommonStanzas-    | Globstar-      -- ^ Implemented in #5284. Not actually a change to the parser,-      -- as filename patterns are opaque to it currently.-  deriving (Eq, Ord, Show, Read, Enum, Bounded, Typeable, Data, Generic)+specHasElif v = +    if v >= CabalSpecV2_2+    then HasElif+    else NoElif  ------------------------------------------------------------------------------- -- Booleans ------------------------------------------------------------------------------- +-- IDEA: make some kind of tagged booleans? data HasElif = HasElif | NoElif   deriving (Eq, Show) 

@@ -60,7 +60,6 @@ import Data.Text (Text, unpack)  import qualified Text.Parsec as Parsec-import qualified Distribution.Compat.ReadP as ReadP  import Distribution.Compat.Parsing @@ -309,13 +308,6 @@   notChar c = Parsec.satisfy (/= c)   anyChar   = Parsec.anyChar   string    = Parsec.string--instance t ~ Char => CharParsing (ReadP.Parser r t) where-  satisfy   = ReadP.satisfy-  char      = ReadP.char-  notChar c = ReadP.satisfy (/= c)-  anyChar   = ReadP.get-  string    = ReadP.string  ------------------------------------------------------------------------------- -- Our additions

@@ -51,7 +51,17 @@ import System.Directory   ( doesFileExist ) import System.FilePath-  ( isRelative, normalise )+  ( addTrailingPathSeparator+  , hasTrailingPathSeparator+  , isPathSeparator+  , isRelative+  , joinDrive+  , joinPath+  , pathSeparator+  , pathSeparators+  , splitDirectories+  , splitDrive+  ) import System.IO   ( IOMode(ReadMode), hFileSize   , withBinaryFile )@@ -113,16 +123,107 @@ -- | Add the @"\\\\?\\"@ prefix if necessary or possible.  The path remains -- unchanged if the prefix is not added.  This function can sometimes be used -- to bypass the @MAX_PATH@ length restriction in Windows API calls.+--+-- See Note [Path normalization]. toExtendedLengthPath :: FilePath -> FilePath toExtendedLengthPath path   | isRelative path = path   | otherwise =-      case normalise path of-        '\\' : '?'  : '?' : '\\' : _ -> path-        '\\' : '\\' : '?' : '\\' : _ -> path-        '\\' : '\\' : '.' : '\\' : _ -> path-        '\\' : subpath@('\\' : _) -> "\\\\?\\UNC" <> subpath-        normalisedPath -> "\\\\?\\" <> normalisedPath+      case normalisedPath of+        '\\' : '?'  : '?' : '\\' : _ -> normalisedPath+        '\\' : '\\' : '?' : '\\' : _ -> normalisedPath+        '\\' : '\\' : '.' : '\\' : _ -> normalisedPath+        '\\' : subpath@('\\' : _)    -> "\\\\?\\UNC" <> subpath+        _                            -> "\\\\?\\" <> normalisedPath+    where normalisedPath = simplifyWindows path++-- | Similar to 'normalise' but:+--+-- * empty paths stay empty,+-- * parent dirs (@..@) are expanded, and+-- * paths starting with @\\\\?\\@ are preserved.+--+-- The goal is to preserve the meaning of paths better than 'normalise'.+--+-- Note [Path normalization]+-- 'normalise' doesn't simplify path names but will convert / into \\+-- this would normally not be a problem as once the path hits the RTS we would+-- have simplified the path then.  However since we're calling the WIn32 API+-- directly we have to do the simplification before the call.  Without this the+-- path Z:// would become Z:\\\\ and when converted to a device path the path+-- becomes \\?\Z:\\\\ which is an invalid path.+--+-- This is not a bug in normalise as it explicitly states that it won't simplify+-- a FilePath.+simplifyWindows :: FilePath -> FilePath+simplifyWindows "" = ""+simplifyWindows path =+  case drive' of+    "\\\\?\\" -> drive' <> subpath+    _ -> simplifiedPath+  where+    simplifiedPath = joinDrive drive' subpath'+    (drive, subpath) = splitDrive path+    drive' = upperDrive (normaliseTrailingSep (normalisePathSeps drive))+    subpath' = appendSep . avoidEmpty . prependSep . joinPath .+               stripPardirs . expandDots . skipSeps .+               splitDirectories $ subpath++    upperDrive d = case d of+      c : ':' : s | isAlpha c && all isPathSeparator s -> toUpper c : ':' : s+      _ -> d+    skipSeps = filter (not . (`elem` (pure <$> pathSeparators)))+    stripPardirs | pathIsAbsolute || subpathIsAbsolute = dropWhile (== "..")+                 | otherwise = id+    prependSep | subpathIsAbsolute = (pathSeparator :)+               | otherwise = id+    avoidEmpty | not pathIsAbsolute+                 && (null drive || hasTrailingPathSep) -- prefer "C:" over "C:."+                 = emptyToCurDir+               | otherwise = id+    appendSep p | hasTrailingPathSep+                  && not (pathIsAbsolute && null p)+                  = addTrailingPathSeparator p+                | otherwise = p+    pathIsAbsolute = not (isRelative path)+    subpathIsAbsolute = any isPathSeparator (take 1 subpath)+    hasTrailingPathSep = hasTrailingPathSeparator subpath++-- | Given a list of path segments, expand @.@ and @..@.  The path segments+-- must not contain path separators.+expandDots :: [FilePath] -> [FilePath]+expandDots = reverse . go []+  where+    go ys' xs' =+      case xs' of+        [] -> ys'+        x : xs ->+          case x of+            "." -> go ys' xs+            ".." ->+              case ys' of+                [] -> go (x : ys') xs+                ".." : _ -> go (x : ys') xs+                _ : ys -> go ys xs+            _ -> go (x : ys') xs++-- | Convert to the right kind of slashes.+normalisePathSeps :: FilePath -> FilePath+normalisePathSeps p = (\ c -> if isPathSeparator c then pathSeparator else c) <$> p++-- | Remove redundant trailing slashes and pick the right kind of slash.+normaliseTrailingSep :: FilePath -> FilePath+normaliseTrailingSep path = do+  let path' = reverse path+  let (sep, path'') = span isPathSeparator path'+  let addSep = if null sep then id else (pathSeparator :)+  reverse (addSep path'')++-- | Convert empty paths to the current directory, otherwise leave it+-- unchanged.+emptyToCurDir :: FilePath -> FilePath+emptyToCurDir ""   = "."+emptyToCurDir path = path #endif /* mingw32_HOST_OS */  -- | Like `copyFile`, but does not touch the target if source and destination

@@ -38,7 +38,12 @@ #if !MIN_VERSION_directory(1,2,7)  doesPathExist :: FilePath -> IO Bool-doesPathExist path = (||) <$> doesDirectoryExist path <*> doesFileExist path+doesPathExist path = do+    -- not using Applicative, as this way we can do less IO+    e <- doesDirectoryExist path+    if e+    then return True+    else doesFileExist path  #endif 

@@ -1,36 +1,5 @@ {-# LANGUAGE CPP #-}  -- | Compatibility layer for "Control.Monad.Fail"-module Distribution.Compat.MonadFail ( MonadFail(fail) ) where-#if __GLASGOW_HASKELL__ >= 800--- provided by base-4.9.0.0 and later-import Control.Monad.Fail (MonadFail(fail))-#else--- the following code corresponds to--- http://hackage.haskell.org/package/fail-4.9.0.0-import qualified Prelude as P-import Distribution.Compat.Prelude hiding (fail)--import Text.ParserCombinators.ReadP-import Text.ParserCombinators.ReadPrec--class Monad m => MonadFail m where-    fail :: String -> m a---- instances provided by base-4.9--instance MonadFail Maybe where-    fail _ = Nothing--instance MonadFail [] where-    fail _ = []--instance MonadFail P.IO where-    fail = P.fail--instance MonadFail ReadPrec where-    fail = P.fail -- = P (\_ -> fail s)--instance MonadFail ReadP where-    fail = P.fail-#endif+module Distribution.Compat.MonadFail ( Control.Monad.Fail.MonadFail(fail) ) where+import Control.Monad.Fail

@@ -1,3 +1,5 @@+{-# LANGUAGE CPP                    #-}+{-# LANGUAGE DefaultSignatures      #-} {-# LANGUAGE FlexibleInstances      #-} {-# LANGUAGE FunctionalDependencies #-} -- | Per Conor McBride, the 'Newtype' typeclass represents the packing and@@ -14,31 +16,50 @@ import Data.Functor.Identity (Identity (..)) import Data.Monoid (Sum (..), Product (..), Endo (..)) +#if MIN_VERSION_base(4,7,0)+import Data.Coerce (coerce, Coercible)+#else+import Unsafe.Coerce (unsafeCoerce)+#endif+ -- | The @FunctionalDependencies@ version of 'Newtype' type-class. ----- /Note:/ for actual newtypes the implementation can be--- @pack = coerce; unpack = coerce@. We don't have default implementation,--- because @Cabal@ have to support older than @base >= 4.7@ compilers.--- Also, 'Newtype' could witness a non-structural isomorphism.-class Newtype n o | n -> o where+-- Since Cabal-3.0 class arguments are in a different order than in @newtype@ package.+-- This change is to allow usage with @DeriveAnyClass@ (and @DerivingStrategies@, in GHC-8.2).+-- Unfortunately one have to repeat inner type.+--+-- @+-- newtype New = New Old+--   deriving anyclass (Newtype Old)+-- @+--+-- Another approach would be to use @TypeFamilies@ (and possibly+-- compute inner type using "GHC.Generics"), but we think @FunctionalDependencies@+-- version gives cleaner type signatures.+--+class Newtype o n | n -> o where     pack   :: o -> n-    unpack :: n -> o--instance Newtype (Identity a) a where-    pack   = Identity-    unpack = runIdentity--instance Newtype (Sum a) a where-    pack   = Sum-    unpack = getSum+#if MIN_VERSION_base(4,7,0)+    default pack :: Coercible o n => o -> n+    pack = coerce+#else+    default pack :: o -> n+    pack = unsafeCoerce+#endif -instance Newtype (Product a) a where-    pack   = Product-    unpack = getProduct+    unpack :: n -> o+#if MIN_VERSION_base(4,7,0)+    default unpack :: Coercible n o => n -> o+    unpack = coerce+#else+    default unpack :: n -> o+    unpack = unsafeCoerce+#endif -instance Newtype (Endo a) (a -> a) where-    pack   = Endo-    unpack = appEndo+instance Newtype a (Identity a)+instance Newtype a (Sum a)+instance Newtype a (Product a)+instance Newtype (a -> a) (Endo a)  -- | --@@ -49,7 +70,7 @@ -- -- >>> ala (Sum . (+1)) foldMap [1, 2, 3, 4 :: Int] -- 10-ala :: (Newtype n o, Newtype n' o') => (o -> n) -> ((o -> n) -> b -> n') -> (b -> o')+ala :: (Newtype o n, Newtype o' n') => (o -> n) -> ((o -> n) -> b -> n') -> (b -> o') ala pa hof = alaf pa hof id  -- |@@ -58,13 +79,13 @@ -- 12 -- -- /Note:/ as with 'ala', the user supplied function for the newtype is /ignored/.-alaf :: (Newtype n o, Newtype n' o') => (o -> n) -> ((a -> n) -> b -> n') -> (a -> o) -> (b -> o')+alaf :: (Newtype o n, Newtype o' n') => (o -> n) -> ((a -> n) -> b -> n') -> (a -> o) -> (b -> o') alaf _ hof f = unpack . hof (pack . f)  -- | Variant of 'pack', which takes a phantom type.-pack' :: Newtype n o => (o -> n) -> o -> n+pack' :: Newtype o n => (o -> n) -> o -> n pack' _ = pack  -- | Variant of 'pack', which takes a phantom type.-unpack' :: Newtype n o => (o -> n) -> n -> o+unpack' :: Newtype o n => (o -> n) -> n -> o unpack' _ = unpack

@@ -26,7 +26,7 @@   , many     -- from Control.Applicative   , sepBy   , sepBy1-  -- , sepByNonEmpty+  , sepByNonEmpty   , sepEndBy1   -- , sepEndByNonEmpty   , sepEndBy@@ -59,7 +59,6 @@ import Data.Foldable (asum)  import qualified Text.Parsec as Parsec-import qualified Distribution.Compat.ReadP as ReadP  -- | @choice ps@ tries to apply the parsers in the list @ps@ in order, -- until one of them succeeds. Returns the value of the succeeding@@ -107,13 +106,11 @@ -- toList <$> sepByNonEmpty p sep {-# INLINE sepBy1 #-} -{- -- | @sepByNonEmpty p sep@ parses /one/ or more occurrences of @p@, separated -- by @sep@. Returns a non-empty list of values returned by @p@. sepByNonEmpty :: Alternative m => m a -> m sep -> m (NonEmpty a) sepByNonEmpty p sep = (:|) <$> p <*> many (sep *> p) {-# INLINE sepByNonEmpty #-}--}  -- | @sepEndBy1 p sep@ parses /one/ or more occurrences of @p@, -- separated and optionally ended by @sep@. Returns a list of values@@ -389,15 +386,3 @@   unexpected    = Parsec.unexpected   eof           = Parsec.eof   notFollowedBy = Parsec.notFollowedBy--instance t ~ Char => Parsing (ReadP.Parser r t) where-  try        = id-  (<?>)      = const-  skipMany   = ReadP.skipMany-  skipSome   = ReadP.skipMany1-  unexpected = const ReadP.pfail-  eof        = ReadP.eof--  -- TODO: we would like to have <++ here-  notFollowedBy p = ((Just <$> p) ReadP.+++ pure Nothing)-    >>= maybe (pure ()) (unexpected . show)

@@ -4,16 +4,18 @@ {-# LANGUAGE FlexibleContexts #-}  #ifdef MIN_VERSION_base+#define MINVER_base_411 MIN_VERSION_base(4,11,0) #define MINVER_base_48 MIN_VERSION_base(4,8,0) #define MINVER_base_47 MIN_VERSION_base(4,7,0) #else+#define MINVER_base_411 (__GLASGOW_HASKELL__ >= 804) #define MINVER_base_48 (__GLASGOW_HASKELL__ >= 710) #define MINVER_base_47 (__GLASGOW_HASKELL__ >= 708) #endif  -- | This module does two things: ----- * Acts as a compatiblity layer, like @base-compat@.+-- * Acts as a compatibility layer, like @base-compat@. -- -- * Provides commonly used imports. module Distribution.Compat.Prelude (@@ -57,6 +59,9 @@     sort, sortBy,     nub, nubBy, +    -- * Data.List.NonEmpty+    NonEmpty((:|)), foldl1, foldr1,+     -- * Data.Foldable     Foldable, foldMap, foldr,     null, length,@@ -89,11 +94,21 @@      -- * Text.PrettyPrint     (<<>>),-    ) where +    -- * Text.Read+    readMaybe,+    ) where -- We also could hide few partial function import Prelude                       as BasePrelude hiding   ( IO, mapM, mapM_, sequence, null, length, foldr, any, all+  -- partial functions+  , read+  , foldr1, foldl1+#if MINVER_base_411+  -- As of base 4.11.0.0 Prelude exports part of Semigroup(..).+  -- Hide this so we instead rely on Distribution.Compat.Semigroup.+  , Semigroup(..)+#endif #if MINVER_base_48   , Word   -- We hide them, as we import only some members@@ -111,6 +126,7 @@  import Data.Foldable                 (Foldable (foldMap, foldr), find, foldl', for_, traverse_, any, all) import Data.Traversable              (Traversable (traverse, sequenceA), for)+import qualified Data.Foldable  import Control.Applicative           (Alternative (..)) import Control.DeepSeq               (NFData (..))@@ -130,10 +146,12 @@ import Data.List                     (intercalate, intersperse, isPrefixOf,                                       isSuffixOf, nub, nubBy, sort, sortBy,                                       unfoldr)+import Data.List.NonEmpty            (NonEmpty((:|))) import Data.Maybe import Data.String                   (IsString (..)) import Data.Int import Data.Word+import Text.Read                     (readMaybe)  import qualified Text.PrettyPrint as Disp @@ -202,3 +220,28 @@   grnf (L1 x) = grnf x   grnf (R1 x) = grnf x   {-# INLINEABLE grnf #-}+++-- TODO: if we want foldr1/foldl1 to work on more than NonEmpty, we+-- can define a local typeclass 'Foldable1', e.g.+--+-- @+-- class Foldable f => Foldable1 f+--+-- instance Foldable1 NonEmpty+--+-- foldr1 :: Foldable1 t => (a -> a -> a) -> t a -> a+-- foldr1 = Data.Foldable.foldr1+--+-- foldl1 :: Foldable1 t => (a -> a -> a) -> t a -> a+-- foldl1 = Data.Foldable.foldl1+-- @+--++{-# INLINE foldr1 #-}+foldr1 :: (a -> a -> a) -> NonEmpty a -> a+foldr1 = Data.Foldable.foldr1++{-# INLINE foldl1 #-}+foldl1 :: (a -> a -> a) -> NonEmpty a -> a+foldl1 = Data.Foldable.foldl1

@@ -1,424 +0,0 @@-{-# LANGUAGE GADTs #-}--------------------------------------------------------------------------------- |--- Module      :  Distribution.Compat.ReadP--- Copyright   :  (c) The University of Glasgow 2002--- License     :  BSD-style (see the file libraries/base/LICENSE)------ Maintainer  :  libraries@haskell.org--- Portability :  portable------ This is a library of parser combinators, originally written by Koen Claessen.--- It parses all alternatives in parallel, so it never keeps hold of--- the beginning of the input string, a common source of space leaks with--- other parsers.  The '(+++)' choice combinator is genuinely commutative;--- it makes no difference which branch is \"shorter\".------ See also Koen's paper /Parallel Parsing Processes/--- (<http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.19.9217>).------ This version of ReadP has been locally hacked to make it H98, by--- Martin Sj&#xF6;gren <mailto:msjogren@gmail.com>------ The unit tests have been moved to UnitTest.Distribution.Compat.ReadP, by--- Mark Lentczner <mailto:mark@glyphic.com>--------------------------------------------------------------------------------module Distribution.Compat.ReadP-  (-  -- * The 'ReadP' type-  ReadP,      -- :: * -> *; instance Functor, Monad, MonadPlus--  -- * Primitive operations-  get,        -- :: ReadP Char-  look,       -- :: ReadP String-  (+++),      -- :: ReadP a -> ReadP a -> ReadP a-  (<++),      -- :: ReadP a -> ReadP a -> ReadP a-  gather,     -- :: ReadP a -> ReadP (String, a)--  -- * Other operations-  pfail,      -- :: ReadP a-  eof,        -- :: ReadP ()-  satisfy,    -- :: (Char -> Bool) -> ReadP Char-  char,       -- :: Char -> ReadP Char-  string,     -- :: String -> ReadP String-  munch,      -- :: (Char -> Bool) -> ReadP String-  munch1,     -- :: (Char -> Bool) -> ReadP String-  skipSpaces, -- :: ReadP ()-  skipSpaces1,-- :: ReadP ()-  choice,     -- :: [ReadP a] -> ReadP a-  count,      -- :: Int -> ReadP a -> ReadP [a]-  between,    -- :: ReadP open -> ReadP close -> ReadP a -> ReadP a-  option,     -- :: a -> ReadP a -> ReadP a-  optional,   -- :: ReadP a -> ReadP ()-  many,       -- :: ReadP a -> ReadP [a]-  many1,      -- :: ReadP a -> ReadP [a]-  skipMany,   -- :: ReadP a -> ReadP ()-  skipMany1,  -- :: ReadP a -> ReadP ()-  sepBy,      -- :: ReadP a -> ReadP sep -> ReadP [a]-  sepBy1,     -- :: ReadP a -> ReadP sep -> ReadP [a]-  endBy,      -- :: ReadP a -> ReadP sep -> ReadP [a]-  endBy1,     -- :: ReadP a -> ReadP sep -> ReadP [a]-  chainr,     -- :: ReadP a -> ReadP (a -> a -> a) -> a -> ReadP a-  chainl,     -- :: ReadP a -> ReadP (a -> a -> a) -> a -> ReadP a-  chainl1,    -- :: ReadP a -> ReadP (a -> a -> a) -> ReadP a-  chainr1,    -- :: ReadP a -> ReadP (a -> a -> a) -> ReadP a-  manyTill,   -- :: ReadP a -> ReadP end -> ReadP [a]--  -- * Running a parser-  ReadS,      -- :: *; = String -> [(a,String)]-  readP_to_S, -- :: ReadP a -> ReadS a-  readS_to_P, -- :: ReadS a -> ReadP a--  -- ** Internal-  Parser,-  )- where--import Prelude ()-import Distribution.Compat.Prelude hiding (many, get)--import qualified Distribution.Compat.MonadFail as Fail--import Control.Monad( replicateM, (>=>) )--infixr 5 +++, <++---- ------------------------------------------------------------------------------ The P type--- is representation type -- should be kept abstract--data P s a-  = Get (s -> P s a)-  | Look ([s] -> P s a)-  | Fail-  | Result a (P s a)-  | Final [(a,[s])] -- invariant: list is non-empty!---- Monad, MonadPlus--instance Functor (P s) where-  fmap = liftM--instance Applicative (P s) where-  pure x = Result x Fail-  (<*>) = ap--instance Monad (P s) where-  return = pure--  (Get f)      >>= k = Get (f >=> k)-  (Look f)     >>= k = Look (f >=> k)-  Fail         >>= _ = Fail-  (Result x p) >>= k = k x `mplus` (p >>= k)-  (Final r)    >>= k = final [ys' | (x,s) <- r, ys' <- run (k x) s]--  fail = Fail.fail--instance Fail.MonadFail (P s) where-  fail _ = Fail--instance Alternative (P s) where-      empty = mzero-      (<|>) = mplus--instance MonadPlus (P s) where-  mzero = Fail--  -- most common case: two gets are combined-  Get f1     `mplus` Get f2     = Get (\c -> f1 c `mplus` f2 c)--  -- results are delivered as soon as possible-  Result x p `mplus` q          = Result x (p `mplus` q)-  p          `mplus` Result x q = Result x (p `mplus` q)--  -- fail disappears-  Fail       `mplus` p          = p-  p          `mplus` Fail       = p--  -- two finals are combined-  -- final + look becomes one look and one final (=optimization)-  -- final + sthg else becomes one look and one final-  Final r    `mplus` Final t    = Final (r ++ t)-  Final r    `mplus` Look f     = Look (\s -> Final (r ++ run (f s) s))-  Final r    `mplus` p          = Look (\s -> Final (r ++ run p s))-  Look f     `mplus` Final r    = Look (\s -> Final (run (f s) s ++ r))-  p          `mplus` Final r    = Look (\s -> Final (run p s ++ r))--  -- two looks are combined (=optimization)-  -- look + sthg else floats upwards-  Look f     `mplus` Look g     = Look (\s -> f s `mplus` g s)-  Look f     `mplus` p          = Look (\s -> f s `mplus` p)-  p          `mplus` Look f     = Look (\s -> p `mplus` f s)---- ------------------------------------------------------------------------------ The ReadP type--newtype Parser r s a = R ((a -> P s r) -> P s r)-type ReadP r a = Parser r Char a---- Functor, Monad, MonadPlus--instance Functor (Parser r s) where-  fmap h (R f) = R (\k -> f (k . h))--instance Applicative (Parser r s) where-  pure x  = R (\k -> k x)-  (<*>) = ap--instance s ~ Char => Alternative (Parser r s) where-  empty = pfail-  (<|>) = (+++)--instance Monad (Parser r s) where-  return = pure-  fail = Fail.fail-  R m >>= f = R (\k -> m (\a -> let R m' = f a in m' k))--instance Fail.MonadFail (Parser r s) where-  fail _    = R (const Fail)--instance s ~ Char => MonadPlus (Parser r s) where-  mzero = pfail-  mplus = (+++)---- ------------------------------------------------------------------------------ Operations over P--final :: [(a,[s])] -> P s a--- Maintains invariant for Final constructor-final [] = Fail-final r  = Final r--run :: P c a -> ([c] -> [(a, [c])])-run (Get f)      (c:s) = run (f c) s-run (Look f)     s     = run (f s) s-run (Result x p) s     = (x,s) : run p s-run (Final r)    _     = r-run _            _     = []---- ------------------------------------------------------------------------------ Operations over ReadP--get :: ReadP r Char--- ^ Consumes and returns the next character.---   Fails if there is no input left.-get = R Get--look :: ReadP r String--- ^ Look-ahead: returns the part of the input that is left, without---   consuming it.-look = R Look--pfail :: ReadP r a--- ^ Always fails.-pfail = R (const Fail)--eof :: ReadP r ()--- ^ Succeeds iff we are at the end of input-eof = do { s <- look-         ; if null s then return ()-                     else pfail }--(+++) :: ReadP r a -> ReadP r a -> ReadP r a--- ^ Symmetric choice.-R f1 +++ R f2 = R (\k -> f1 k `mplus` f2 k)--(<++) :: ReadP a a -> ReadP r a -> ReadP r a--- ^ Local, exclusive, left-biased choice: If left parser---   locally produces any result at all, then right parser is---   not used.-R f <++ q =-  do s <- look-     probe (f return) s 0- where-  probe (Get f')       (c:s) n = probe (f' c) s (n+1 :: Int)-  probe (Look f')      s     n = probe (f' s) s n-  probe p@(Result _ _) _     n = discard n >> R (p >>=)-  probe (Final r)      _     _ = R (Final r >>=)-  probe _              _     _ = q--  discard 0 = return ()-  discard n  = get >> discard (n-1 :: Int)--gather :: ReadP (String -> P Char r) a -> ReadP r (String, a)--- ^ Transforms a parser into one that does the same, but---   in addition returns the exact characters read.---   IMPORTANT NOTE: 'gather' gives a runtime error if its first argument---   is built using any occurrences of readS_to_P.-gather (R m) =-  R (\k -> gath id (m (\a -> return (\s -> k (s,a)))))- where-  gath l (Get f)      = Get (\c -> gath (l.(c:)) (f c))-  gath _ Fail         = Fail-  gath l (Look f)     = Look (gath l . f)-  gath l (Result k p) = k (l []) `mplus` gath l p-  gath _ (Final _)    = error "do not use readS_to_P in gather!"---- ------------------------------------------------------------------------------ Derived operations--satisfy :: (Char -> Bool) -> ReadP r Char--- ^ Consumes and returns the next character, if it satisfies the---   specified predicate.-satisfy p = do c <- get; if p c then return c else pfail--char :: Char -> ReadP r Char--- ^ Parses and returns the specified character.-char c = satisfy (c ==)--string :: String -> ReadP r String--- ^ Parses and returns the specified string.-string this = do s <- look; scan this s- where-  scan []     _               = return this-  scan (x:xs) (y:ys) | x == y = get >> scan xs ys-  scan _      _               = pfail--munch :: (Char -> Bool) -> ReadP r String--- ^ Parses the first zero or more characters satisfying the predicate.-munch p =-  do s <- look-     scan s- where-  scan (c:cs) | p c = do _ <- get; s <- scan cs; return (c:s)-  scan _            = do return ""--munch1 :: (Char -> Bool) -> ReadP r String--- ^ Parses the first one or more characters satisfying the predicate.-munch1 p =-  do c <- get-     if p c then do s <- munch p; return (c:s)-            else pfail--choice :: [ReadP r a] -> ReadP r a--- ^ Combines all parsers in the specified list.-choice []     = pfail-choice [p]    = p-choice (p:ps) = p +++ choice ps--skipSpaces :: ReadP r ()--- ^ Skips all whitespace.-skipSpaces =-  do s <- look-     skip s- where-  skip (c:s) | isSpace c = do _ <- get; skip s-  skip _                 = do return ()--skipSpaces1 :: ReadP r ()--- ^ Like 'skipSpaces' but succeeds only if there is at least one--- whitespace character to skip.-skipSpaces1 = satisfy isSpace >> skipSpaces--count :: Int -> ReadP r a -> ReadP r [a]--- ^ @ count n p @ parses @n@ occurrences of @p@ in sequence. A list of---   results is returned.-count n p = replicateM n p--between :: ReadP r open -> ReadP r close -> ReadP r a -> ReadP r a--- ^ @ between open close p @ parses @open@, followed by @p@ and finally---   @close@. Only the value of @p@ is returned.-between open close p = do _ <- open-                          x <- p-                          _ <- close-                          return x--option :: a -> ReadP r a -> ReadP r a--- ^ @option x p@ will either parse @p@ or return @x@ without consuming---   any input.-option x p = p +++ return x--optional :: ReadP r a -> ReadP r ()--- ^ @optional p@ optionally parses @p@ and always returns @()@.-optional p = (p >> return ()) +++ return ()--many :: ReadP r a -> ReadP r [a]--- ^ Parses zero or more occurrences of the given parser.-many p = return [] +++ many1 p--many1 :: ReadP r a -> ReadP r [a]--- ^ Parses one or more occurrences of the given parser.-many1 p = liftM2 (:) p (many p)--skipMany :: ReadP r a -> ReadP r ()--- ^ Like 'many', but discards the result.-skipMany p = many p >> return ()--skipMany1 :: ReadP r a -> ReadP r ()--- ^ Like 'many1', but discards the result.-skipMany1 p = p >> skipMany p--sepBy :: ReadP r a -> ReadP r sep -> ReadP r [a]--- ^ @sepBy p sep@ parses zero or more occurrences of @p@, separated by @sep@.---   Returns a list of values returned by @p@.-sepBy p sep = sepBy1 p sep +++ return []--sepBy1 :: ReadP r a -> ReadP r sep -> ReadP r [a]--- ^ @sepBy1 p sep@ parses one or more occurrences of @p@, separated by @sep@.---   Returns a list of values returned by @p@.-sepBy1 p sep = liftM2 (:) p (many (sep >> p))--endBy :: ReadP r a -> ReadP r sep -> ReadP r [a]--- ^ @endBy p sep@ parses zero or more occurrences of @p@, separated and ended---   by @sep@.-endBy p sep = many (do x <- p ; _ <- sep ; return x)--endBy1 :: ReadP r a -> ReadP r sep -> ReadP r [a]--- ^ @endBy p sep@ parses one or more occurrences of @p@, separated and ended---   by @sep@.-endBy1 p sep = many1 (do x <- p ; _ <- sep ; return x)--chainr :: ReadP r a -> ReadP r (a -> a -> a) -> a -> ReadP r a--- ^ @chainr p op x@ parses zero or more occurrences of @p@, separated by @op@.---   Returns a value produced by a /right/ associative application of all---   functions returned by @op@. If there are no occurrences of @p@, @x@ is---   returned.-chainr p op x = chainr1 p op +++ return x--chainl :: ReadP r a -> ReadP r (a -> a -> a) -> a -> ReadP r a--- ^ @chainl p op x@ parses zero or more occurrences of @p@, separated by @op@.---   Returns a value produced by a /left/ associative application of all---   functions returned by @op@. If there are no occurrences of @p@, @x@ is---   returned.-chainl p op x = chainl1 p op +++ return x--chainr1 :: ReadP r a -> ReadP r (a -> a -> a) -> ReadP r a--- ^ Like 'chainr', but parses one or more occurrences of @p@.-chainr1 p op = scan-  where scan   = p >>= rest-        rest x = do f <- op-                    y <- scan-                    return (f x y)-                 +++ return x--chainl1 :: ReadP r a -> ReadP r (a -> a -> a) -> ReadP r a--- ^ Like 'chainl', but parses one or more occurrences of @p@.-chainl1 p op = p >>= rest-  where rest x = do f <- op-                    y <- p-                    rest (f x y)-                 +++ return x--manyTill :: ReadP r a -> ReadP [a] end -> ReadP r [a]--- ^ @manyTill p end@ parses zero or more occurrences of @p@, until @end@---   succeeds. Returns a list of values returned by @p@.-manyTill p end = scan-  where scan = (end >> return []) <++ (liftM2 (:) p scan)---- ------------------------------------------------------------------------------ Converting between ReadP and Read--readP_to_S :: ReadP a a -> ReadS a--- ^ Converts a parser into a Haskell ReadS-style function.---   This is the main way in which you can \"run\" a 'ReadP' parser:---   the expanded type is--- @ readP_to_S :: ReadP a -> String -> [(a,String)] @-readP_to_S (R f) = run (f return)--readS_to_P :: ReadS a -> ReadP r a--- ^ Converts a Haskell ReadS-style function into a parser.---   Warning: This introduces local backtracking in the resulting---   parser, and therefore a possible inefficiency.-readS_to_P r =-  R (\k -> Look (\s -> final [bs'' | (a,s') <- r s, bs'' <- run (k a) s']))

@@ -0,0 +1,68 @@+{-# LANGUAGE CPP, RankNTypes, FlexibleContexts #-}
+
+-- Compatibility layer for GHC.ResponseFile
+-- Implementation from base 4.12.0 is used.
+-- http://hackage.haskell.org/package/base-4.12.0.0/src/LICENSE
+module Distribution.Compat.ResponseFile (expandResponse) where
+
+import Prelude (mapM)
+import Distribution.Compat.Prelude
+
+import System.Exit
+import System.FilePath
+import System.IO (hPutStrLn, stderr)
+import System.IO.Error
+
+#if MIN_VERSION_base(4,12,0)
+import GHC.ResponseFile (unescapeArgs)
+#else
+
+unescapeArgs :: String -> [String]
+unescapeArgs = filter (not . null) . unescape
+
+data Quoting = NoneQ | SngQ | DblQ
+
+unescape :: String -> [String]
+unescape args = reverse . map reverse $ go args NoneQ False [] []
+    where
+      -- n.b., the order of these cases matters; these are cribbed from gcc
+      -- case 1: end of input
+      go []     _q    _bs   a as = a:as
+      -- case 2: back-slash escape in progress
+      go (c:cs) q     True  a as = go cs q     False (c:a) as
+      -- case 3: no back-slash escape in progress, but got a back-slash
+      go (c:cs) q     False a as
+        | '\\' == c              = go cs q     True  a     as
+      -- case 4: single-quote escaping in progress
+      go (c:cs) SngQ  False a as
+        | '\'' == c              = go cs NoneQ False a     as
+        | otherwise              = go cs SngQ  False (c:a) as
+      -- case 5: double-quote escaping in progress
+      go (c:cs) DblQ  False a as
+        | '"' == c               = go cs NoneQ False a     as
+        | otherwise              = go cs DblQ  False (c:a) as
+      -- case 6: no escaping is in progress
+      go (c:cs) NoneQ False a as
+        | isSpace c              = go cs NoneQ False []    (a:as)
+        | '\'' == c              = go cs SngQ  False a     as
+        | '"'  == c              = go cs DblQ  False a     as
+        | otherwise              = go cs NoneQ False (c:a) as
+
+#endif
+
+expandResponse :: [String] -> IO [String]
+expandResponse = go recursionLimit "."
+  where
+    recursionLimit = 100
+
+    go :: Int -> FilePath -> [String] -> IO [String]
+    go n dir
+      | n >= 0    = fmap concat . mapM (expand n dir)
+      | otherwise = const $ hPutStrLn stderr "Error: response file recursion limit exceeded." >> exitFailure
+
+    expand :: Int -> FilePath -> String -> IO [String]
+    expand n dir arg@('@':f) = readRecursively n (dir </> f) `catchIOError` (const $ print "?" >> return [arg])
+    expand _n _dir x = return [x]
+
+    readRecursively :: Int -> FilePath -> IO [String]
+    readRecursively n f = go (n - 1) (takeDirectory f) =<< unescapeArgs <$> readFile f

@@ -11,113 +11,54 @@     , All(..)     , Any(..) +    , First'(..)     , Last'(..) +    , Option'(..)+     , gmappend     , gmempty     ) where  import Distribution.Compat.Binary (Binary) -import Control.Applicative as App import GHC.Generics-#if __GLASGOW_HASKELL__ >= 711--- Data.Semigroup is available since GHC 8.0/base-4.9+-- Data.Semigroup is available since GHC 8.0/base-4.9 in `base`+-- for older GHC/base, it's provided by `semigroups` import Data.Semigroup import qualified Data.Monoid as Mon-#else--- provide internal simplified non-exposed class for older GHCs-import Data.Monoid as Mon (Monoid(..), All(..), Any(..), Dual(..))--- containers-import Data.Set (Set)-import Data.IntSet (IntSet)-import Data.Map (Map)-import Data.IntMap (IntMap)  -class Semigroup a where-    (<>) :: a -> a -> a---- several primitive instances-instance Semigroup () where-    _ <> _ = ()--instance Semigroup [a] where-    (<>) = (++)--instance Semigroup a => Semigroup (Dual a) where-    Dual a <> Dual b = Dual (b <> a)--instance Semigroup a => Semigroup (Maybe a) where-    Nothing <> b       = b-    a       <> Nothing = a-    Just a  <> Just b  = Just (a <> b)--instance Semigroup (Either a b) where-    Left _ <> b = b-    a      <> _ = a--instance Semigroup Ordering where-    LT <> _ = LT-    EQ <> y = y-    GT <> _ = GT--instance Semigroup b => Semigroup (a -> b) where-    f <> g = \a -> f a <> g a--instance Semigroup All where-    All a <> All b = All (a && b)--instance Semigroup Any where-    Any a <> Any b = Any (a || b)--instance (Semigroup a, Semigroup b) => Semigroup (a, b) where-    (a,b) <> (a',b') = (a<>a',b<>b')--instance (Semigroup a, Semigroup b, Semigroup c)-         => Semigroup (a, b, c) where-    (a,b,c) <> (a',b',c') = (a<>a',b<>b',c<>c')--instance (Semigroup a, Semigroup b, Semigroup c, Semigroup d)-         => Semigroup (a, b, c, d) where-    (a,b,c,d) <> (a',b',c',d') = (a<>a',b<>b',c<>c',d<>d')--instance (Semigroup a, Semigroup b, Semigroup c, Semigroup d, Semigroup e)-         => Semigroup (a, b, c, d, e) where-    (a,b,c,d,e) <> (a',b',c',d',e') = (a<>a',b<>b',c<>c',d<>d',e<>e')+-- | A copy of 'Data.Semigroup.First'.+newtype First' a = First' { getFirst' :: a }+  deriving (Eq, Ord, Show) --- containers instances-instance Semigroup IntSet where-  (<>) = mappend+instance Semigroup (First' a) where+  a <> _ = a -instance Ord a => Semigroup (Set a) where-  (<>) = mappend+-- | A copy of 'Data.Semigroup.Last'.+newtype Last' a = Last' { getLast' :: a }+  deriving (Eq, Ord, Read, Show, Binary) -instance Semigroup (IntMap v) where-  (<>) = mappend+instance Semigroup (Last' a) where+  _ <> b = b -instance Ord k => Semigroup (Map k v) where-  (<>) = mappend-#endif+instance Functor Last' where+  fmap f (Last' x) = Last' (f x) --- | Cabal's own 'Data.Monoid.Last' copy to avoid requiring an orphan--- 'Binary' instance.------ Once the oldest `binary` version we support provides a 'Binary'--- instance for 'Data.Monoid.Last' we can remove this one here.------ NB: 'Data.Semigroup.Last' is defined differently and not a 'Monoid'-newtype Last' a = Last' { getLast' :: Maybe a }-                deriving (Eq, Ord, Read, Show, Binary,-                          Functor, App.Applicative, Generic)+-- | A wrapper around 'Maybe', providing the 'Semigroup' and 'Monoid' instances+-- implemented for 'Maybe' since @base-4.11@.+newtype Option' a = Option' { getOption' :: Maybe a }+  deriving (Eq, Ord, Read, Show, Binary, Functor) -instance Semigroup (Last' a) where-    x <> Last' Nothing = x-    _ <> x             = x+instance Semigroup a => Semigroup (Option' a) where+  Option' (Just a) <> Option' (Just b) = Option' (Just (a <> b))+  Option' Nothing  <> b                = b+  a                <> Option' Nothing  = a -instance Monoid (Last' a) where-    mempty = Last' Nothing-    mappend = (<>)+instance Semigroup a => Monoid (Option' a) where+  mempty = Option' Nothing+  mappend = (<>)  ------------------------------------------------------------------------------- -------------------------------------------------------------------------------

@@ -30,10 +30,13 @@   buildCompilerId,   buildCompilerFlavor,   defaultCompilerFlavor,-  parseCompilerFlavorCompat,   classifyCompilerFlavor,   knownCompilerFlavors, +  -- * Per compiler flavor+  PerCompilerFlavor (..),+  perCompilerFlavorToList,+   -- * Compiler id   CompilerId(..), @@ -51,10 +54,8 @@ import Distribution.Version (Version, mkVersion', nullVersion)  import qualified System.Info (compilerName, compilerVersion)-import Distribution.Parsec.Class (Parsec (..))-import Distribution.Pretty (Pretty (..))-import Distribution.Text (Text(..), display)-import qualified Distribution.Compat.ReadP as Parse+import Distribution.Parsec (Parsec (..))+import Distribution.Pretty (Pretty (..), prettyShow) import qualified Distribution.Compat.CharParsing as P import qualified Text.PrettyPrint as Disp @@ -85,44 +86,13 @@           cs <- P.munch1 isAlphaNum           if all isDigit cs then fail "all digits compiler name" else return cs -instance Text CompilerFlavor where-  parse = do-    comp <- Parse.munch1 isAlphaNum-    when (all isDigit comp) Parse.pfail-    return (classifyCompilerFlavor comp)- classifyCompilerFlavor :: String -> CompilerFlavor classifyCompilerFlavor s =   fromMaybe (OtherCompiler s) $ lookup (lowercase s) compilerMap   where-    compilerMap = [ (lowercase (display compiler), compiler)+    compilerMap = [ (lowercase (prettyShow compiler), compiler)                   | compiler <- knownCompilerFlavors ] ----TODO: In some future release, remove 'parseCompilerFlavorCompat' and use--- ordinary 'parse'. Also add ("nhc", NHC) to the above 'compilerMap'.---- | Like 'classifyCompilerFlavor' but compatible with the old ReadS parser.------ It is compatible in the sense that it accepts only the same strings,--- eg "GHC" but not "ghc". However other strings get mapped to 'OtherCompiler'.--- The point of this is that we do not allow extra valid values that would--- upset older Cabal versions that had a stricter parser however we cope with--- new values more gracefully so that we'll be able to introduce new value in--- future without breaking things so much.----parseCompilerFlavorCompat :: Parse.ReadP r CompilerFlavor-parseCompilerFlavorCompat = do-  comp <- Parse.munch1 isAlphaNum-  when (all isDigit comp) Parse.pfail-  case lookup comp compilerMap of-    Just compiler -> return compiler-    Nothing       -> return (OtherCompiler comp)-  where-    compilerMap = [ (show compiler, compiler)-                  | compiler <- knownCompilerFlavors-                  , compiler /= YHC ]- buildCompilerFlavor :: CompilerFlavor buildCompilerFlavor = classifyCompilerFlavor System.Info.compilerName @@ -143,6 +113,31 @@   OtherCompiler _ -> Nothing   _               -> Just buildCompilerFlavor +-------------------------------------------------------------------------------+-- Per compiler data+-------------------------------------------------------------------------------++-- | 'PerCompilerFlavor' carries only info per GHC and GHCJS+--+-- Cabal parses only @ghc-options@ and @ghcjs-options@, others are omitted.+--+data PerCompilerFlavor v = PerCompilerFlavor v v+  deriving (Generic, Show, Read, Eq, Typeable, Data)++instance Binary a => Binary (PerCompilerFlavor a)+instance NFData a => NFData (PerCompilerFlavor a)++perCompilerFlavorToList :: PerCompilerFlavor v -> [(CompilerFlavor, v)]+perCompilerFlavorToList (PerCompilerFlavor a b) = [(GHC, a), (GHCJS, b)]++instance Semigroup a => Semigroup (PerCompilerFlavor a) where+    PerCompilerFlavor a b <> PerCompilerFlavor a' b' = PerCompilerFlavor+        (a <> a') (b <> b')++instance (Semigroup a, Monoid a) => Monoid (PerCompilerFlavor a) where+    mempty = PerCompilerFlavor mempty mempty+    mappend = (<>)+ -- ------------------------------------------------------------ -- * Compiler Id -- ------------------------------------------------------------@@ -154,14 +149,15 @@  instance NFData CompilerId where rnf = genericRnf -instance Text CompilerId where-  disp (CompilerId f v)-    | v == nullVersion = disp f-    | otherwise        = disp f <<>> Disp.char '-' <<>> disp v+instance Pretty CompilerId where+  pretty (CompilerId f v)+    | v == nullVersion = pretty f+    | otherwise        = pretty f <<>> Disp.char '-' <<>> pretty v -  parse = do-    flavour <- parse-    version <- (Parse.char '-' >> parse) Parse.<++ return nullVersion+instance Parsec CompilerId where+  parsec = do+    flavour <- parsec+    version <- (P.char '-' >> parsec) <|> return nullVersion     return (CompilerId flavour version)  lowercase :: String -> String@@ -200,12 +196,13 @@  instance Binary AbiTag -instance Text AbiTag where-  disp NoAbiTag     = Disp.empty-  disp (AbiTag tag) = Disp.text tag+instance Pretty AbiTag where+  pretty NoAbiTag     = Disp.empty+  pretty (AbiTag tag) = Disp.text tag -  parse = do-    tag <- Parse.munch (\c -> isAlphaNum c || c == '_')+instance Parsec AbiTag where+  parsec = do+    tag <- P.munch (\c -> isAlphaNum c || c == '_')     if null tag then return NoAbiTag else return (AbiTag tag)  abiTagString :: AbiTag -> String

@@ -9,7 +9,6 @@     optionalField,     optionalFieldDef,     monoidalField,-    deprecatedField',     -- * Concrete grammar implementations     ParsecFieldGrammar,     ParsecFieldGrammar',@@ -36,7 +35,7 @@ import Distribution.FieldGrammar.Class import Distribution.FieldGrammar.Parsec import Distribution.FieldGrammar.Pretty-import Distribution.Parsec.Field+import Distribution.Fields.Field import Distribution.Utils.Generic (spanMaybe)  type ParsecFieldGrammar' a = ParsecFieldGrammar a a

@@ -4,7 +4,6 @@     optionalField,     optionalFieldDef,     monoidalField,-    deprecatedField',     ) where  import Distribution.Compat.Lens@@ -13,10 +12,11 @@  import Data.Functor.Identity (Identity (..)) -import Distribution.Compat.Newtype (Newtype)-import Distribution.Parsec.Class   (Parsec)-import Distribution.Parsec.Field-import Distribution.Pretty         (Pretty)+import Distribution.CabalSpecVersion (CabalSpecVersion)+import Distribution.Compat.Newtype   (Newtype)+import Distribution.Fields.Field+import Distribution.Parsec           (Parsec)+import Distribution.Pretty           (Pretty)  -- | 'FieldGrammar' is parametrised by --@@ -33,7 +33,7 @@      -- | Field which should be defined, exactly once.     uniqueFieldAla-        :: (Parsec b, Pretty b, Newtype b a)+        :: (Parsec b, Pretty b, Newtype a b)         => FieldName   -- ^ field name         -> (a -> b)    -- ^ 'Newtype' pack         -> ALens' s a  -- ^ lens into the field@@ -48,7 +48,7 @@      -- | Optional field.     optionalFieldAla-        :: (Parsec b, Pretty b, Newtype b a)+        :: (Parsec b, Pretty b, Newtype a b)         => FieldName          -- ^ field name         -> (a -> b)           -- ^ 'pack'         -> ALens' s (Maybe a) -- ^ lens into the field@@ -56,13 +56,31 @@      -- | Optional field with default value.     optionalFieldDefAla-        :: (Parsec b, Pretty b, Newtype b a, Eq a)+        :: (Parsec b, Pretty b, Newtype a b, Eq a)         => FieldName   -- ^ field name         -> (a -> b)    -- ^ 'Newtype' pack         -> ALens' s a  -- ^ @'Lens'' s a@: lens into the field         -> a           -- ^ default value         -> g s a +    --  | Free text field is essentially 'optionalFieldDefAla` with @""@+    --  as the default and "accept everything" parser.+    --+    -- @since 3.0.0.0+    freeTextField+        :: FieldName+        -> ALens' s (Maybe String) -- ^ lens into the field+        -> g s (Maybe String)++    --  | Free text field is essentially 'optionalFieldDefAla` with @""@+    --  as the default and "accept everything" parser.+    --+    -- @since 3.0.0.0+    freeTextFieldDef+        :: FieldName+        -> ALens' s String -- ^ lens into the field+        -> g s String+     -- | Monoidal field.     --     -- Values are combined with 'mappend'.@@ -70,7 +88,7 @@     -- /Note:/ 'optionalFieldAla' is a @monoidalField@ with 'Last' monoid.     --     monoidalFieldAla-        :: (Parsec b, Pretty b, Monoid a, Newtype b a)+        :: (Parsec b, Pretty b, Monoid a, Newtype a b)         => FieldName   -- ^ field name         -> (a -> b)    -- ^ 'pack'         -> ALens' s a  -- ^ lens into the field@@ -90,15 +108,22 @@      -- | Deprecated since     deprecatedSince-        :: [Int]   -- ^ version-        -> String  -- ^ deprecation message+        :: CabalSpecVersion   -- ^ version+        -> String             -- ^ deprecation message         -> g s a         -> g s a +    -- | Removed in. If we occur removed field, parsing fails.+    removedIn+        :: CabalSpecVersion   -- ^ version+        -> String             -- ^ removal message+        -> g s a+        -> g s a+     -- | Annotate field with since spec-version.     availableSince-        :: [Int]  -- ^ spec version-        -> a      -- ^ default value+        :: CabalSpecVersion  -- ^ spec version+        -> a                 -- ^ default value         -> g s a         -> g s a @@ -134,14 +159,3 @@     -> ALens' s a  -- ^ lens into the field     -> g s a monoidalField fn = monoidalFieldAla fn Identity---- | Deprecated field. If found, warning is issued.------ /Note:/ also it's not pretty printed!----deprecatedField'-    :: FieldGrammar g-    => String  -- ^ deprecation message-    -> g s a-    -> g s a-deprecatedField' = deprecatedSince []

@@ -11,16 +11,17 @@ import Distribution.Compat.Prelude import Prelude () +import Data.List                   (dropWhileEnd) import Distribution.Compat.Lens    (aview, cloneLens) import Distribution.Compat.Newtype import Distribution.FieldGrammar-import Distribution.Pretty         (pretty)-import Distribution.Utils.Generic  (fromUTF8BS)+import Distribution.Pretty         (pretty, showFreeText) -import qualified Data.Map                   as Map-import qualified Distribution.Parsec.Class  as P-import qualified Distribution.Parsec.Field  as P-import qualified Text.PrettyPrint           as Disp+import qualified Data.Map                        as Map+import qualified Distribution.Compat.CharParsing as C+import qualified Distribution.Fields.Field       as P+import qualified Distribution.Parsec             as P+import qualified Text.PrettyPrint                as Disp  -- strict pair data SP s = SP@@ -29,7 +30,7 @@     }  -- | A collection field parsers and pretty-printers.-newtype FieldDescrs s a = F { runF :: Map String (SP s) }+newtype FieldDescrs s a = F { runF :: Map P.FieldName (SP s) }   deriving (Functor)  instance Applicative (FieldDescrs s) where@@ -37,20 +38,20 @@     f <*> x = F (mappend (runF f) (runF x))  singletonF :: P.FieldName -> (s -> Disp.Doc) -> (forall m. P.CabalParsing m => s -> m s) -> FieldDescrs s a-singletonF fn f g = F $ Map.singleton (fromUTF8BS fn) (SP f g)+singletonF fn f g = F $ Map.singleton fn (SP f g)  -- | Lookup a field value pretty-printer.-fieldDescrPretty :: FieldDescrs s a -> String -> Maybe (s -> Disp.Doc)+fieldDescrPretty :: FieldDescrs s a -> P.FieldName -> Maybe (s -> Disp.Doc) fieldDescrPretty (F m) fn = pPretty <$> Map.lookup fn m  -- | Lookup a field value parser.-fieldDescrParse :: P.CabalParsing m => FieldDescrs s a -> String -> Maybe (s -> m s)+fieldDescrParse :: P.CabalParsing m => FieldDescrs s a -> P.FieldName -> Maybe (s -> m s) fieldDescrParse (F m) fn = pParse <$> Map.lookup fn m  fieldDescrsToList     :: P.CabalParsing m     => FieldDescrs s a-    -> [(String, s -> Disp.Doc, s -> m s)]+    -> [(P.FieldName, s -> Disp.Doc, s -> m s)] fieldDescrsToList = map mk . Map.toList . runF where     mk (name, SP ppr parse) = (name, ppr, parse) @@ -76,6 +77,14 @@         f s = pretty (pack' _pack (aview l s))         g s = cloneLens l (const (unpack' _pack <$> P.parsec)) s +    freeTextField fn l = singletonF fn f g where+        f s = maybe mempty showFreeText (aview l s)+        g s = cloneLens l (const (Just <$> parsecFreeText)) s++    freeTextFieldDef fn l = singletonF fn f g where+        f s = showFreeText (aview l s)+        g s = cloneLens l (const parsecFreeText) s+     monoidalFieldAla fn _pack l = singletonF fn f g where         f s = pretty (pack' _pack (aview l s))         g s = cloneLens l (\x -> mappend x . unpack' _pack <$> P.parsec) s@@ -83,5 +92,23 @@     prefixedFields _fnPfx _l = F mempty     knownField _           = pure ()     deprecatedSince _  _ x = x+    removedIn _ _ x        = x     availableSince _ _     = id     hiddenField _          = F mempty++parsecFreeText :: P.CabalParsing m => m String+parsecFreeText = dropDotLines <$ C.spaces <*> many C.anyChar+  where+    -- Example package with dot lines+    -- http://hackage.haskell.org/package/copilot-cbmc-0.1/copilot-cbmc.cabal+    dropDotLines "." = "."+    dropDotLines x = intercalate "\n" . map dotToEmpty . lines $ x++    dotToEmpty x | trim' x == "." = ""+    dotToEmpty x                  = trim x++    trim' :: String -> String+    trim' = dropWhileEnd (`elem` (" \t" :: String))++    trim :: String -> String+    trim = dropWhile isSpace . dropWhileEnd isSpace

@@ -61,6 +61,7 @@     Section (..),     runFieldParser,     runFieldParser',+    fieldLinesToStream,     )  where  import Data.List                   (dropWhileEnd)@@ -72,18 +73,18 @@ import Prelude ()  import qualified Data.ByteString   as BS-import qualified Data.Set          as Set import qualified Data.Map.Strict   as Map+import qualified Data.Set          as Set import qualified Text.Parsec       as P import qualified Text.Parsec.Error as P  import Distribution.CabalSpecVersion import Distribution.FieldGrammar.Class-import Distribution.Parsec.Class-import Distribution.Parsec.Common-import Distribution.Parsec.Field+import Distribution.Fields.Field+import Distribution.Fields.ParseResult+import Distribution.Parsec import Distribution.Parsec.FieldLineStream-import Distribution.Parsec.ParseResult+import Distribution.Parsec.Position        (positionRow, positionCol)  ------------------------------------------------------------------------------- -- Auxiliary types@@ -205,6 +206,34 @@             | null fls  = pure def             | otherwise = unpack' _pack <$> runFieldParser pos parsec v fls +    freeTextField fn _ = ParsecFG (Set.singleton fn) Set.empty parser where+        parser v fields = case Map.lookup fn fields of+            Nothing  -> pure Nothing+            Just []  -> pure Nothing+            Just [x] -> parseOne v x+            Just xs  -> do+                warnMultipleSingularFields fn xs+                last <$> traverse (parseOne v) xs++        parseOne v (MkNamelessField pos fls)+            | null fls           = pure Nothing+            | v >= CabalSpecV3_0 = pure (Just (fieldlinesToFreeText3 pos fls))+            | otherwise          = pure (Just (fieldlinesToFreeText fls))++    freeTextFieldDef fn _ = ParsecFG (Set.singleton fn) Set.empty parser where+        parser v fields = case Map.lookup fn fields of+            Nothing  -> pure ""+            Just []  -> pure ""+            Just [x] -> parseOne v x+            Just xs  -> do+                warnMultipleSingularFields fn xs+                last <$> traverse (parseOne v) xs++        parseOne v (MkNamelessField pos fls)+            | null fls           = pure ""+            | v >= CabalSpecV3_0 = pure (fieldlinesToFreeText3 pos fls)+            | otherwise          = pure (fieldlinesToFreeText fls)+     monoidalFieldAla fn _pack _extract = ParsecFG (Set.singleton fn) Set.empty parser       where         parser v fields = case Map.lookup fn fields of@@ -231,29 +260,55 @@     availableSince vs def (ParsecFG names prefixes parser) = ParsecFG names prefixes parser'       where         parser' v values-            | cabalSpecSupports v vs = parser v values+            | v >= vs = parser v values             | otherwise = do                 let unknownFields = Map.intersection values $ Map.fromSet (const ()) names                 for_ (Map.toList unknownFields) $ \(name, fields) ->                     for_ fields $ \(MkNamelessField pos _) ->                         parseWarning pos PWTUnknownField $-                            "The field " <> show name <> " is available since Cabal " ++ show vs+                            "The field " <> show name <> " is available only since the Cabal specification version " ++ showCabalSpecVersion vs ++ ". This field will be ignored."                  pure def      -- todo we know about this field-    deprecatedSince (_ : _) _ grammar = grammar -- pass on non-empty version-    deprecatedSince _ msg (ParsecFG names prefixes parser) = ParsecFG names prefixes parser'+    deprecatedSince vs msg (ParsecFG names prefixes parser) = ParsecFG names prefixes parser'       where-        parser' v values = do-            let deprecatedFields = Map.intersection values $ Map.fromSet (const ()) names-            for_ (Map.toList deprecatedFields) $ \(name, fields) ->-                for_ fields $ \(MkNamelessField pos _) ->-                    parseWarning pos PWTDeprecatedField $-                        "The field " <> show name <> " is deprecated. " ++ msg+        parser' v values+            | v >= vs = do+                let deprecatedFields = Map.intersection values $ Map.fromSet (const ()) names+                for_ (Map.toList deprecatedFields) $ \(name, fields) ->+                    for_ fields $ \(MkNamelessField pos _) ->+                        parseWarning pos PWTDeprecatedField $+                            "The field " <> show name <> " is deprecated in the Cabal specification version " ++ showCabalSpecVersion vs ++ ". " ++ msg -            parser v values+                parser v values +            | otherwise = parser v values++    removedIn vs msg (ParsecFG names prefixes parser) = ParsecFG names prefixes parser' where+        parser' v values+            | v >= vs = do+                let msg' = if null msg then "" else ' ' : msg+                let unknownFields = Map.intersection values $ Map.fromSet (const ()) names+                let namePos =+                      [ (name, pos)+                      | (name, fields) <- Map.toList unknownFields+                      , MkNamelessField pos _ <- fields+                      ]++                let makeMsg name = "The field " <> show name <> " is removed in the Cabal specification version " ++ showCabalSpecVersion vs ++ "." ++ msg'++                case namePos of+                    -- no fields => proceed (with empty values, to be sure)+                    [] -> parser v mempty++                    -- if there's single field: fail fatally with it+                    ((name, pos) : rest) -> do+                        for_ rest $ \(name', pos') -> parseFailure pos' $ makeMsg name'+                        parseFatalFailure pos $ makeMsg name++              | otherwise = parser v values+     knownField fn = ParsecFG (Set.singleton fn) Set.empty (\_ _ -> pure ())      hiddenField = id@@ -262,36 +317,92 @@ -- Parsec ------------------------------------------------------------------------------- -runFieldParser' :: Position -> ParsecParser a -> CabalSpecVersion -> FieldLineStream -> ParseResult a-runFieldParser' (Position row col) p v str = case P.runParser p' [] "<field>" str of+runFieldParser' :: [Position] -> ParsecParser a -> CabalSpecVersion -> FieldLineStream -> ParseResult a+runFieldParser' inputPoss p v str = case P.runParser p' [] "<field>" str of     Right (pok, ws) -> do-        -- TODO: map pos-        traverse_ (\(PWarning t pos w) -> parseWarning pos t w) ws+        traverse_ (\(PWarning t pos w) -> parseWarning (mapPosition pos) t w) ws         pure pok     Left err        -> do         let ppos = P.errorPos err-        -- Positions start from 1:1, not 0:0-        let epos = Position (row - 1 + P.sourceLine ppos) (col - 1 + P.sourceColumn ppos)+        let epos = mapPosition $ Position (P.sourceLine ppos) (P.sourceColumn ppos)+         let msg = P.showErrorMessages                 "or" "unknown parse error" "expecting" "unexpected" "end of input"                 (P.errorMessages err)-        let str' = unlines (filter (not . all isSpace) (fieldLineStreamToLines str))--        parseFatalFailure epos $ msg ++ "\n" ++ "\n" ++ str'+        parseFatalFailure epos $ msg ++ "\n"   where     p' = (,) <$ P.spaces <*> unPP p v <* P.spaces <* P.eof <*> P.getState -fieldLineStreamToLines :: FieldLineStream -> [String]-fieldLineStreamToLines (FLSLast bs)   = [ fromUTF8BS bs ]-fieldLineStreamToLines (FLSCons bs s) = fromUTF8BS bs : fieldLineStreamToLines s+    -- Positions start from 1:1, not 0:0+    mapPosition (Position prow pcol) = go (prow - 1) inputPoss where+        go _ []                            = zeroPos+        go _ [Position row col]            = Position row (col + pcol - 1)+        go n (Position row col:_) | n <= 0 = Position row (col + pcol - 1)+        go n (_:ps)                        = go (n - 1) ps  runFieldParser :: Position -> ParsecParser a -> CabalSpecVersion -> [FieldLine Position] -> ParseResult a-runFieldParser pp p v ls = runFieldParser' pos p v (fieldLinesToStream ls)+runFieldParser pp p v ls = runFieldParser' poss p v (fieldLinesToStream ls)   where-    -- TODO: make per line lookup-    pos = case ls of-        []                     -> pp-        (FieldLine pos' _ : _) -> pos'+    poss = map (\(FieldLine pos _) -> pos) ls ++ [pp] -- add "default" position  fieldlinesToBS :: [FieldLine ann] -> BS.ByteString fieldlinesToBS = BS.intercalate "\n" . map (\(FieldLine _ bs) -> bs)++-- Example package with dot lines+-- http://hackage.haskell.org/package/copilot-cbmc-0.1/copilot-cbmc.cabal+fieldlinesToFreeText :: [FieldLine ann] -> String+fieldlinesToFreeText [FieldLine _ "."] = "."+fieldlinesToFreeText fls               = intercalate "\n" (map go fls)+  where+    go (FieldLine _ bs)+        | s == "." = ""+        | otherwise = s+      where+        s = trim (fromUTF8BS bs)++        trim :: String -> String+        trim = dropWhile isSpace . dropWhileEnd isSpace++fieldlinesToFreeText3 :: Position -> [FieldLine Position] -> String+fieldlinesToFreeText3 _   []               = ""+fieldlinesToFreeText3 _   [FieldLine _ bs] = fromUTF8BS bs+fieldlinesToFreeText3 pos (FieldLine pos1 bs1 : fls2@(FieldLine pos2 _ : _))+    -- if first line is on the same line with field name:+    -- the indentation level is either+    -- 1. the indentation of left most line in rest fields+    -- 2. the indentation of the first line+    -- whichever is leftmost+    | positionRow pos == positionRow pos1 = concat+        $ fromUTF8BS bs1+        : mealy (mk mcol1) pos1 fls2++    -- otherwise, also indent the first line+    | otherwise = concat+        $ replicate (positionCol pos1 - mcol2) ' '+        : fromUTF8BS bs1+        : mealy (mk mcol2) pos1 fls2++  where+    mcol1 = foldl' (\a b -> min a $ positionCol $ fieldLineAnn b) (min (positionCol pos1) (positionCol pos2)) fls2+    mcol2 = foldl' (\a b -> min a $ positionCol $ fieldLineAnn b) (positionCol pos1) fls2++    mk :: Int -> Position -> FieldLine Position -> (Position, String)+    mk col p (FieldLine q bs) =+        ( q+        , replicate newlines '\n'+          ++ replicate indent ' '+          ++ fromUTF8BS bs+        )+      where+        newlines = positionRow q - positionRow p+        indent   = positionCol q - col++mealy :: (s -> a -> (s, b)) -> s -> [a] -> [b]+mealy f = go where+    go _ [] = []+    go s (x : xs) = let ~(s', y) = f s x in y : go s' xs++fieldLinesToStream :: [FieldLine ann] -> FieldLineStream+fieldLinesToStream []                    = fieldLineStreamEnd+fieldLinesToStream [FieldLine _ bs]      = FLSLast bs+fieldLinesToStream (FieldLine _ bs : fs) = FLSCons bs (fieldLinesToStream fs)

@@ -4,77 +4,98 @@     prettyFieldGrammar,     ) where +import           Distribution.CabalSpecVersion import           Distribution.Compat.Lens import           Distribution.Compat.Newtype import           Distribution.Compat.Prelude-import           Distribution.Pretty         (Pretty (..))-import           Distribution.Simple.Utils   (fromUTF8BS)+import           Distribution.Fields.Field     (FieldName)+import           Distribution.Fields.Pretty    (PrettyField (..))+import           Distribution.Pretty           (Pretty (..), showFreeText, showFreeTextV3)+import           Distribution.Simple.Utils     (toUTF8BS) import           Prelude ()-import           Text.PrettyPrint            (Doc)-import qualified Text.PrettyPrint            as PP+import           Text.PrettyPrint              (Doc)+import qualified Text.PrettyPrint              as PP  import Distribution.FieldGrammar.Class-import Distribution.ParseUtils         (ppField)  newtype PrettyFieldGrammar s a = PrettyFG-    { fieldGrammarPretty :: s -> Doc+    { fieldGrammarPretty :: CabalSpecVersion -> s -> [PrettyField ()]     }   deriving (Functor)  instance Applicative (PrettyFieldGrammar s) where-    pure _ = PrettyFG (\_ -> mempty)-    PrettyFG f <*> PrettyFG x = PrettyFG (\s -> f s PP.$$ x s)+    pure _ = PrettyFG (\_ _ -> mempty)+    PrettyFG f <*> PrettyFG x = PrettyFG (\v s -> f v s <> x v s)  -- | We can use 'PrettyFieldGrammar' to pp print the @s@. -- -- /Note:/ there is not trailing @($+$ text "")@.-prettyFieldGrammar :: PrettyFieldGrammar s a -> s -> Doc-prettyFieldGrammar = fieldGrammarPretty+prettyFieldGrammar :: CabalSpecVersion -> PrettyFieldGrammar s a -> s -> [PrettyField ()]+prettyFieldGrammar = flip fieldGrammarPretty  instance FieldGrammar PrettyFieldGrammar where-    blurFieldGrammar f (PrettyFG pp) = PrettyFG (pp . aview f)+    blurFieldGrammar f (PrettyFG pp) = PrettyFG (\v -> pp v . aview f) -    uniqueFieldAla fn _pack l = PrettyFG $ \s ->-        ppField (fromUTF8BS fn) (pretty (pack' _pack (aview l s)))+    uniqueFieldAla fn _pack l = PrettyFG $ \_v s ->+        ppField fn (pretty (pack' _pack (aview l s)))      booleanFieldDef fn l def = PrettyFG pp       where-        pp s+        pp _v s             | b == def  = mempty-            | otherwise = ppField (fromUTF8BS fn) (PP.text (show b))+            | otherwise = ppField fn (PP.text (show b))           where             b = aview l s      optionalFieldAla fn _pack l = PrettyFG pp       where-        pp s = case aview l s of+        pp v s = case aview l s of             Nothing -> mempty-            Just a  -> ppField (fromUTF8BS fn) (pretty (pack' _pack a))+            Just a  -> ppField fn (prettyVersioned v (pack' _pack a))      optionalFieldDefAla fn _pack l def = PrettyFG pp       where-        pp s+        pp v s             | x == def  = mempty-            | otherwise = ppField (fromUTF8BS fn) (pretty (pack' _pack x))+            | otherwise = ppField fn (prettyVersioned v (pack' _pack x))           where             x = aview l s +    freeTextField fn l = PrettyFG pp where+        pp v s = maybe mempty (ppField fn . showFT) (aview l s) where+            showFT | v >= CabalSpecV3_0 = showFreeTextV3+                   | otherwise          = showFreeText++    -- it's ok to just show, as showFreeText of empty string is empty.+    freeTextFieldDef fn l = PrettyFG pp where+        pp v s = ppField fn (showFT (aview l s)) where+            showFT | v >= CabalSpecV3_0 = showFreeTextV3+                   | otherwise          = showFreeText+     monoidalFieldAla fn _pack l = PrettyFG pp       where-        pp s = ppField  (fromUTF8BS fn) (pretty (pack' _pack (aview l s)))+        pp v s = ppField fn (prettyVersioned v (pack' _pack (aview l s))) -    prefixedFields _fnPfx l = PrettyFG (pp . aview l)+    prefixedFields _fnPfx l = PrettyFG (\_ -> pp . aview l)       where-        pp xs = PP.vcat-            -- always print the field, even its Doc is empty+        pp xs =+            -- always print the field, even its Doc is empty.             -- i.e. don't use ppField-            [ PP.text n <<>> PP.colon PP.<+> (PP.vcat $ map PP.text $ lines s)+            [ PrettyField () (toUTF8BS n) $ PP.vcat $ map PP.text $ lines s             | (n, s) <- xs             -- fnPfx `isPrefixOf` n             ]      knownField _           = pure ()-    deprecatedSince [] _ _ = PrettyFG (\_ -> mempty)-    deprecatedSince _  _ x = x+    deprecatedSince _ _ x  = x+    -- TODO: as PrettyFieldGrammar isn't aware of cabal-version: we output the field+    -- this doesn't affect roundtrip as `removedIn` fields cannot be parsed+    -- so invalid documents can be only manually constructed.+    removedIn _ _ x        = x     availableSince _ _     = id     hiddenField _          = PrettyFG (\_ -> mempty)++ppField :: FieldName -> Doc -> [PrettyField ()]+ppField name fielddoc+    | PP.isEmpty fielddoc = []+    | otherwise        = [ PrettyField () name fielddoc ]

@@ -0,0 +1,42 @@+-- | Utilitiies to work with @.cabal@ like file structure.+module Distribution.Fields (+    -- * Types+    Field(..),+    Name(..),+    FieldLine(..),+    SectionArg(..),+    FieldName,+    -- * Grammar and parsing+    --+    -- See "Distribution.Fields.Parser" for grammar.+    readFields,+    readFields',+    -- ** ParseResult+    ParseResult,+    runParseResult,+    parseString,+    parseWarning,+    parseWarnings,+    parseFailure,+    parseFatalFailure,+    -- ** Warnings+    PWarnType (..),+    PWarning (..),+    showPWarning,+    -- ** Errors+    PError (..),+    showPError,+    -- * Pretty printing+    PrettyField (..),+    showFields,+    -- ** Transformation from Field+    genericFromParsecFields,+    fromParsecFields,+    ) where++import Distribution.Fields.Field+import Distribution.Fields.Parser+import Distribution.Fields.ParseResult+import Distribution.Fields.Pretty+import Distribution.Parsec.Error+import Distribution.Parsec.Warning

@@ -0,0 +1,127 @@+{-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE NoMonoLocalBinds #-}+module Distribution.Fields.ConfVar (parseConditionConfVar) where++import Distribution.Compat.CharParsing              (char, integral)+import Distribution.Compat.Prelude+import Distribution.Parsec                    (Parsec (..), runParsecParser, Position (..))+import Distribution.Parsec.FieldLineStream (fieldLineStreamFromBS)+import Distribution.Fields.Field                    (SectionArg (..))+import Distribution.Fields.ParseResult+import Distribution.Types.Condition+import Distribution.Types.GenericPackageDescription (ConfVar (..))+import Distribution.Version+       (anyVersion, earlierVersion, intersectVersionRanges, laterVersion, majorBoundVersion,+       mkVersion, noVersion, orEarlierVersion, orLaterVersion, thisVersion, unionVersionRanges,+       withinVersion)+import Prelude ()++import qualified Text.Parsec       as P+import qualified Text.Parsec.Error as P++-- | Parse @'Condition' 'ConfVar'@ from section arguments provided by parsec+-- based outline parser.+parseConditionConfVar :: [SectionArg Position] -> ParseResult (Condition ConfVar)+parseConditionConfVar args =+    -- The name of the input file is irrelevant, as we reformat the error message.+    case P.runParser (parser <* P.eof) () "<condition>" args of+        Right x  -> pure x+        Left err -> do+            -- Mangle the position to the actual one+            let ppos = P.errorPos err+            let epos = Position (P.sourceLine ppos) (P.sourceColumn ppos)+            let msg = P.showErrorMessages+                    "or" "unknown parse error" "expecting" "unexpected" "end of input"+                    (P.errorMessages err)+            parseFailure epos msg+            pure $ Lit True++type Parser = P.Parsec [SectionArg Position] ()++sepByNonEmpty :: Parser a -> Parser sep -> Parser (NonEmpty a)+sepByNonEmpty p sep = (:|) <$> p <*> many (sep *> p)++parser :: Parser (Condition ConfVar)+parser = condOr+  where+    condOr       = sepByNonEmpty condAnd (oper "||") >>= return . foldl1 COr+    condAnd      = sepByNonEmpty cond    (oper "&&") >>= return . foldl1 CAnd+    cond         = P.choice+         [ boolLiteral, parens condOr,  notCond, osCond, archCond, flagCond, implCond ]++    notCond      = CNot <$ oper "!" <*> cond++    boolLiteral  = Lit <$> boolLiteral'+    osCond       = Var . OS   <$ string "os"   <*> parens fromParsec+    flagCond     = Var . Flag <$ string "flag" <*> parens fromParsec+    archCond     = Var . Arch <$ string "arch" <*> parens fromParsec+    implCond     = Var        <$ string "impl" <*> parens implCond'++    implCond'    = Impl+        <$> fromParsec+        <*> P.option anyVersion versionRange++    version = fromParsec+    versionStar  = mkVersion <$> fromParsec' versionStar' <* oper "*"+    versionStar' = some (integral <* char '.')++    versionRange = expr+      where+        expr = foldl1 unionVersionRanges     <$> sepByNonEmpty term   (oper "||")+        term = foldl1 intersectVersionRanges <$> sepByNonEmpty factor (oper "&&")++        factor = P.choice+            $ parens expr+            : parseAnyVersion+            : parseNoVersion+            : parseWildcardRange+            : map parseRangeOp rangeOps++        parseAnyVersion    = anyVersion <$ string "-any"+        parseNoVersion     = noVersion  <$ string "-none"++        parseWildcardRange = P.try $ withinVersion <$ oper "==" <*> versionStar++        parseRangeOp (s,f) = P.try (f <$ oper s <*> version)+        rangeOps = [ ("<",  earlierVersion),+                     ("<=", orEarlierVersion),+                     (">",  laterVersion),+                     (">=", orLaterVersion),+                     ("^>=", majorBoundVersion),+                     ("==", thisVersion) ]++    -- Number token can have many dots in it: SecArgNum (Position 65 15) "7.6.1"+    identBS = tokenPrim $ \t -> case t of+        SecArgName _ s -> Just s+        _              -> Nothing++    boolLiteral' = tokenPrim $ \t -> case t of+        SecArgName _ s+            | s == "True"  -> Just True+            | s == "true"  -> Just True+            | s == "False" -> Just False+            | s == "false" -> Just False+        _                  -> Nothing++    string s = tokenPrim $ \t -> case t of+        SecArgName _ s' | s == s' -> Just ()+        _                         -> Nothing++    oper o = tokenPrim $ \t -> case t of+        SecArgOther _ o' | o == o' -> Just ()+        _                          -> Nothing++    parens = P.between (oper "(") (oper ")")++    tokenPrim = P.tokenPrim prettySectionArg updatePosition+    -- TODO: check where the errors are reported+    updatePosition x _ _ = x+    prettySectionArg = show++    fromParsec :: Parsec a => Parser a+    fromParsec = fromParsec' parsec++    fromParsec' p = do+        bs <- identBS+        let fls = fieldLineStreamFromBS bs+        either (fail . show) pure (runParsecParser p "<fromParsec'>" fls)

@@ -0,0 +1,108 @@+{-# LANGUAGE DeriveFunctor #-}+{-# LANGUAGE DeriveFoldable #-}+{-# LANGUAGE DeriveTraversable #-}+-- | Cabal-like file AST types: 'Field', 'Section' etc+--+-- These types are parametrized by an annotation.+module Distribution.Fields.Field (+    -- * Cabal file+    Field (..),+    fieldName,+    fieldAnn,+    fieldUniverse,+    FieldLine (..),+    fieldLineAnn,+    fieldLineBS,+    SectionArg (..),+    sectionArgAnn,+    -- * Name+    FieldName,+    Name (..),+    mkName,+    getName,+    nameAnn,+    ) where++import           Prelude ()+import           Distribution.Compat.Prelude+import           Data.ByteString             (ByteString)+import qualified Data.ByteString.Char8       as B+import qualified Data.Char                   as Char++-------------------------------------------------------------------------------+-- Cabal file+-------------------------------------------------------------------------------++-- | A Cabal-like file consists of a series of fields (@foo: bar@) and sections (@library ...@).+data Field ann+    = Field   !(Name ann) [FieldLine ann]+    | Section !(Name ann) [SectionArg ann] [Field ann]+  deriving (Eq, Show, Functor, Foldable, Traversable)++-- | Section of field name+fieldName :: Field ann -> Name ann+fieldName (Field n _ )    = n+fieldName (Section n _ _) = n++fieldAnn :: Field ann -> ann+fieldAnn = nameAnn . fieldName++-- | All transitive descendands of 'Field', including itself.+--+-- /Note:/ the resulting list is never empty.+--+fieldUniverse :: Field ann -> [Field ann]+fieldUniverse f@(Section _ _ fs) = f : concatMap fieldUniverse fs+fieldUniverse f@(Field _ _)      = [f]++-- | A line of text representing the value of a field from a Cabal file.+-- A field may contain multiple lines.+--+-- /Invariant:/ 'ByteString' has no newlines.+data FieldLine ann  = FieldLine  !ann !ByteString+  deriving (Eq, Show, Functor, Foldable, Traversable)++-- | @since 3.0.0.0+fieldLineAnn :: FieldLine ann -> ann+fieldLineAnn (FieldLine ann _) = ann++-- | @since 3.0.0.0+fieldLineBS :: FieldLine ann -> ByteString+fieldLineBS (FieldLine _ bs) = bs++-- | Section arguments, e.g. name of the library+data SectionArg ann+    = SecArgName  !ann !ByteString+      -- ^ identifier, or omething which loos like number. Also many dot numbers, i.e. "7.6.3"+    | SecArgStr   !ann !ByteString+      -- ^ quoted string+    | SecArgOther !ann !ByteString+      -- ^ everything else, mm. operators (e.g. in if-section conditionals)+  deriving (Eq, Show, Functor, Foldable, Traversable)++-- | Extract annotation from 'SectionArg'.+sectionArgAnn :: SectionArg ann -> ann+sectionArgAnn (SecArgName ann _)  = ann+sectionArgAnn (SecArgStr ann _)   = ann+sectionArgAnn (SecArgOther ann _) = ann++-------------------------------------------------------------------------------+-- Name+-------------------------------------------------------------------------------++type FieldName = ByteString++-- | A field name.+--+-- /Invariant/: 'ByteString' is lower-case ASCII.+data Name ann  = Name       !ann !FieldName+  deriving (Eq, Show, Functor, Foldable, Traversable)++mkName :: ann -> FieldName -> Name ann+mkName ann bs = Name ann (B.map Char.toLower bs)++getName :: Name ann -> FieldName+getName (Name _ bs) = bs++nameAnn :: Name ann -> ann+nameAnn (Name ann _) = ann

@@ -0,0 +1,488 @@+{-# OPTIONS_GHC -fno-warn-unused-binds -fno-warn-missing-signatures #-}+{-# LANGUAGE CPP,MagicHash #-}+{-# LINE 1 "boot/Lexer.x" #-}++-----------------------------------------------------------------------------+-- |+-- Module      :  Distribution.Fields.Lexer+-- License     :  BSD3+--+-- Maintainer  :  cabal-devel@haskell.org+-- Portability :  portable+--+-- Lexer for the cabal files.+{-# LANGUAGE CPP #-}+{-# LANGUAGE BangPatterns #-}+#ifdef CABAL_PARSEC_DEBUG+{-# LANGUAGE PatternGuards #-}+#endif+{-# OPTIONS_GHC -fno-warn-unused-imports #-}+module Distribution.Fields.Lexer+  (ltest, lexToken, Token(..), LToken(..)+  ,bol_section, in_section, in_field_layout, in_field_braces+  ,mkLexState) where++-- [Note: boostrapping parsec parser]+--+-- We manually produce the `Lexer.hs` file from `boot/Lexer.x` (make lexer)+-- because boostrapping cabal-install would be otherwise tricky.+-- Alex is (atm) tricky package to build, cabal-install has some magic+-- to move bundled generated files in place, so rather we don't depend+-- on it before we can build it ourselves.+-- Therefore there is one thing less to worry in bootstrap.sh, which is a win.+--+-- See also https://github.com/haskell/cabal/issues/4633+--++import Prelude ()+import qualified Prelude as Prelude+import Distribution.Compat.Prelude++import Distribution.Fields.LexerMonad+import Distribution.Parsec.Position (Position (..), incPos, retPos)+import Data.ByteString (ByteString)+import qualified Data.ByteString as B+import qualified Data.ByteString.Char8 as B.Char8+import qualified Data.Word as Word++#ifdef CABAL_PARSEC_DEBUG+import Debug.Trace+import qualified Data.Vector as V+import qualified Data.Text   as T+import qualified Data.Text.Encoding as T+import qualified Data.Text.Encoding.Error as T+#endif++#if __GLASGOW_HASKELL__ >= 603+#include "ghcconfig.h"+#elif defined(__GLASGOW_HASKELL__)+#include "config.h"+#endif+#if __GLASGOW_HASKELL__ >= 503+import Data.Array+import Data.Array.Base (unsafeAt)+#else+import Array+#endif+#if __GLASGOW_HASKELL__ >= 503+import GHC.Exts+#else+import GlaExts+#endif+alex_tab_size :: Int+alex_tab_size = 8+alex_base :: AlexAddr+alex_base = AlexA#+  "\x12\xff\xff\xff\xf9\xff\xff\xff\xfb\xff\xff\xff\x01\x00\x00\x00\x2f\x00\x00\x00\x50\x00\x00\x00\xd0\x00\x00\x00\x48\xff\xff\xff\xdc\xff\xff\xff\x51\xff\xff\xff\x6d\xff\xff\xff\x6f\xff\xff\xff\x50\x01\x00\x00\x74\x01\x00\x00\x70\xff\xff\xff\x68\x00\x00\x00\x09\x00\x00\x00\x00\x00\x00\x00\x07\x00\x00\x00\xa3\x01\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x6a\x00\x00\x00\xd1\x01\x00\x00\xfb\x01\x00\x00\x7b\x02\x00\x00\xfb\x02\x00\x00\x00\x00\x00\x00\x7b\x03\x00\x00\x7d\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0d\x00\x00\x00\x6d\x00\x00\x00\x6b\x00\x00\x00\xfc\x03\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x6f\x00\x00\x00\x1c\x04\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x12\x00\x00\x00"#++alex_table :: AlexAddr+alex_table = AlexA#+  "\x00\x00\x09\x00\x0f\x00\x11\x00\x02\x00\x11\x00\x12\x00\x00\x00\x12\x00\x13\x00\x03\x00\x11\x00\x07\x00\x10\x00\x12\x00\x25\x00\x14\x00\x11\x00\x10\x00\x11\x00\x14\x00\x11\x00\x12\x00\x23\x00\x12\x00\x0f\x00\x28\x00\x02\x00\x2e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x08\x00\x10\x00\x00\x00\x14\x00\x00\x00\x00\x00\x08\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x2a\x00\x2e\x00\xff\xff\xff\xff\x2f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x2a\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x26\x00\x28\x00\xff\xff\xff\xff\x29\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x26\x00\x0f\x00\x11\x00\x17\x00\x26\x00\x12\x00\x25\x00\x11\x00\x2a\x00\x00\x00\x12\x00\x00\x00\x15\x00\x00\x00\x16\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0f\x00\x00\x00\x17\x00\x26\x00\x00\x00\x25\x00\x00\x00\x2a\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x08\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x2c\x00\x00\x00\x2d\x00\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x00\x00\x0e\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x17\x00\x23\x00\xff\xff\xff\xff\x24\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x17\x00\x1e\x00\x0d\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x00\x00\x1f\x00\x1f\x00\x1e\x00\x1e\x00\x1e\x00\x19\x00\x1a\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x20\x00\x00\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0a\x00\x1f\x00\x1e\x00\x1f\x00\x1e\x00\x0b\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x21\x00\x1e\x00\x22\x00\x1e\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x1d\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x1c\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x0c\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x0c\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x1e\x00\xff\xff\x1e\x00\x1e\x00\x1e\x00\x1e\x00\xff\xff\xff\xff\xff\xff\x1e\x00\x1e\x00\x1e\x00\x18\x00\x1a\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x1e\x00\xff\xff\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x1e\x00\xff\xff\x1e\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x1e\x00\xff\xff\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x00\x00\xff\xff\xff\xff\x1e\x00\x1e\x00\x1e\x00\x1a\x00\x1a\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x1e\x00\xff\xff\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x1e\x00\xff\xff\x1e\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x1c\x00\x1e\x00\x00\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x0c\x00\x00\x00\x1e\x00\x00\x00\x1e\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x1e\x00\xff\xff\x1e\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xff\xff\x00\x00\xff\xff\x00\x00\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"#++alex_check :: AlexAddr+alex_check = AlexA#+  "\xff\xff\xef\x00\x09\x00\x0a\x00\x09\x00\x0a\x00\x0d\x00\xbf\x00\x0d\x00\x2d\x00\x09\x00\x0a\x00\xbb\x00\xa0\x00\x0d\x00\xa0\x00\xa0\x00\x0a\x00\x09\x00\x0a\x00\x09\x00\x0a\x00\x0d\x00\x0a\x00\x0d\x00\x20\x00\x0a\x00\x20\x00\x0a\x00\xff\xff\xff\xff\xff\xff\xff\xff\x20\x00\xff\xff\xff\xff\xff\xff\xff\xff\x2d\x00\xff\xff\x2d\x00\x20\x00\xff\xff\x20\x00\xff\xff\xff\xff\x2d\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x09\x00\x0a\x00\x09\x00\x09\x00\x0d\x00\x09\x00\x0a\x00\x09\x00\xff\xff\x0d\x00\xff\xff\x7b\x00\xff\xff\x7d\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x20\x00\xff\xff\x20\x00\x20\x00\xff\xff\x20\x00\xff\xff\x20\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x2d\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7b\x00\xff\xff\x7d\x00\xff\xff\x7f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc2\x00\xff\xff\xc2\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc2\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc2\x00\xff\xff\xc2\x00\xff\xff\x7f\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x23\x00\x24\x00\x25\x00\x26\x00\xff\xff\x28\x00\x29\x00\x2a\x00\x2b\x00\x2c\x00\x2d\x00\x2e\x00\x2f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x3a\x00\xff\xff\x3c\x00\x3d\x00\x3e\x00\x3f\x00\x40\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xc2\x00\x5b\x00\x5c\x00\x5d\x00\x5e\x00\xc2\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7b\x00\x7c\x00\x7d\x00\x7e\x00\x7f\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\xff\xff\xff\xff\x22\x00\xff\xff\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\xff\xff\xff\xff\x22\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x5c\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7f\x00\x5c\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\xff\xff\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\xff\xff\xff\xff\x7f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x23\x00\x24\x00\x25\x00\x26\x00\x7f\x00\x28\x00\x29\x00\x2a\x00\x2b\x00\x2c\x00\x2d\x00\x2e\x00\x2f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x3a\x00\xff\xff\x3c\x00\x3d\x00\x3e\x00\x3f\x00\x40\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x5b\x00\x5c\x00\x5d\x00\x5e\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7b\x00\x7c\x00\x7d\x00\x7e\x00\x7f\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x23\x00\x24\x00\x25\x00\x26\x00\xff\xff\x28\x00\x29\x00\x2a\x00\x2b\x00\x2c\x00\x2d\x00\x2e\x00\x2f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x3a\x00\xff\xff\x3c\x00\x3d\x00\x3e\x00\x3f\x00\x40\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x5b\x00\x5c\x00\x5d\x00\x5e\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7b\x00\x7c\x00\x7d\x00\x7e\x00\x7f\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\x20\x00\x21\x00\x22\x00\x23\x00\x24\x00\x25\x00\x26\x00\xff\xff\x28\x00\x29\x00\x2a\x00\x2b\x00\x2c\x00\xff\xff\xff\xff\x2f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x3a\x00\xff\xff\x3c\x00\x3d\x00\x3e\x00\x3f\x00\x40\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x5b\x00\x5c\x00\x5d\x00\x5e\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7b\x00\x7c\x00\x7d\x00\x7e\x00\x7f\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\x09\x00\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\xff\xff\xff\xff\x22\x00\x21\x00\xff\xff\x23\x00\x24\x00\x25\x00\x26\x00\xff\xff\xff\xff\xff\xff\x2a\x00\x2b\x00\x2c\x00\x2d\x00\x2e\x00\x2f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x3c\x00\x3d\x00\x3e\x00\x3f\x00\x40\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x5c\x00\xff\xff\x5c\x00\xff\xff\x5e\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7c\x00\x7f\x00\x7e\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\xff\xff\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\x00\x00\x01\x00\x02\x00\x03\x00\x04\x00\x05\x00\x06\x00\x07\x00\x08\x00\xff\xff\x0a\x00\x0b\x00\x0c\x00\x0d\x00\x0e\x00\x0f\x00\x10\x00\x11\x00\x12\x00\x13\x00\x14\x00\x15\x00\x16\x00\x17\x00\x18\x00\x19\x00\x1a\x00\x1b\x00\x1c\x00\x1d\x00\x1e\x00\x1f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7b\x00\xff\xff\x7d\x00\xff\xff\x7f\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"#++alex_deflt :: AlexAddr+alex_deflt = AlexA#+  "\xff\xff\xff\xff\xff\xff\xff\xff\x2b\x00\x27\x00\x1b\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x0d\x00\x0d\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x13\x00\xff\xff\xff\xff\xff\xff\xff\xff\x18\x00\x1b\x00\x1b\x00\x1b\x00\xff\xff\x0d\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x27\x00\xff\xff\xff\xff\xff\xff\x2b\x00\xff\xff\xff\xff\xff\xff\xff\xff"#++alex_accept = listArray (0 :: Int, 47)+  [ AlexAcc 29+  , AlexAcc 28+  , AlexAcc 27+  , AlexAcc 26+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAccNone+  , AlexAcc 25+  , AlexAcc 24+  , AlexAccSkip+  , AlexAcc 23+  , AlexAcc 22+  , AlexAcc 21+  , AlexAccSkip+  , AlexAccSkip+  , AlexAcc 20+  , AlexAcc 19+  , AlexAcc 18+  , AlexAcc 17+  , AlexAcc 16+  , AlexAcc 15+  , AlexAcc 14+  , AlexAcc 13+  , AlexAcc 12+  , AlexAcc 11+  , AlexAcc 10+  , AlexAcc 9+  , AlexAcc 8+  , AlexAccSkip+  , AlexAcc 7+  , AlexAcc 6+  , AlexAcc 5+  , AlexAccSkip+  , AlexAcc 4+  , AlexAcc 3+  , AlexAcc 2+  , AlexAcc 1+  , AlexAcc 0+  ]++alex_actions = array (0 :: Int, 30)+  [ (29,alex_action_0)+  , (28,alex_action_20)+  , (27,alex_action_16)+  , (26,alex_action_3)+  , (25,alex_action_1)+  , (24,alex_action_1)+  , (23,alex_action_3)+  , (22,alex_action_4)+  , (21,alex_action_5)+  , (20,alex_action_8)+  , (19,alex_action_8)+  , (18,alex_action_8)+  , (17,alex_action_9)+  , (16,alex_action_9)+  , (15,alex_action_10)+  , (14,alex_action_11)+  , (13,alex_action_12)+  , (12,alex_action_13)+  , (11,alex_action_14)+  , (10,alex_action_15)+  , (9,alex_action_15)+  , (8,alex_action_16)+  , (7,alex_action_18)+  , (6,alex_action_19)+  , (5,alex_action_19)+  , (4,alex_action_22)+  , (3,alex_action_23)+  , (2,alex_action_24)+  , (1,alex_action_25)+  , (0,alex_action_25)+  ]++{-# LINE 151 "boot/Lexer.x" #-}++-- | Tokens of outer cabal file structure. Field values are treated opaquely.+data Token = TokSym   !ByteString       -- ^ Haskell-like identifier, number or operator+           | TokStr   !ByteString       -- ^ String in quotes+           | TokOther !ByteString       -- ^ Operators and parens+           | Indent   !Int              -- ^ Indentation token+           | TokFieldLine !ByteString   -- ^ Lines after @:@+           | Colon+           | OpenBrace+           | CloseBrace+           | EOF+           | LexicalError InputStream --TODO: add separate string lexical error+  deriving Show++data LToken = L !Position !Token+  deriving Show++toki :: (ByteString -> Token) -> Position -> Int -> ByteString -> Lex LToken+toki t pos  len  input = return $! L pos (t (B.take len input))++tok :: Token -> Position -> Int -> ByteString -> Lex LToken+tok  t pos _len _input = return $! L pos t++checkLeadingWhitespace :: Int -> ByteString -> Lex Int+checkLeadingWhitespace len bs+    | B.any (== 9) (B.take len bs) = do+        addWarning LexWarningTab+        checkWhitespace len bs+    | otherwise = checkWhitespace len bs++checkWhitespace :: Int -> ByteString -> Lex Int+checkWhitespace len bs+    | B.any (== 194) (B.take len bs) = do+        addWarning LexWarningNBSP+        return $ len - B.count 194 (B.take len bs)+    | otherwise = return len++-- -----------------------------------------------------------------------------+-- The input type++type AlexInput = InputStream++alexInputPrevChar :: AlexInput -> Char+alexInputPrevChar _ = error "alexInputPrevChar not used"++alexGetByte :: AlexInput -> Maybe (Word.Word8,AlexInput)+alexGetByte = B.uncons++lexicalError :: Position -> InputStream -> Lex LToken+lexicalError pos inp = do+  setInput B.empty+  return $! L pos (LexicalError inp)++lexToken :: Lex LToken+lexToken = do+  pos <- getPos+  inp <- getInput+  st  <- getStartCode+  case alexScan inp st of+    AlexEOF -> return (L pos EOF)+    AlexError inp' ->+        let !len_bytes = B.length inp - B.length inp' in+            --FIXME: we want len_chars here really+            -- need to decode utf8 up to this point+        lexicalError (incPos len_bytes pos) inp'+    AlexSkip  inp' len_chars -> do+        checkPosition pos inp inp' len_chars+        adjustPos (incPos len_chars)+        setInput inp'+        lexToken+    AlexToken inp' len_chars action -> do+        checkPosition pos inp inp' len_chars+        adjustPos (incPos len_chars)+        setInput inp'+        let !len_bytes = B.length inp - B.length inp'+        t <- action pos len_bytes inp+        --traceShow t $ return tok+        return t++checkPosition :: Position -> ByteString -> ByteString -> Int -> Lex ()+#ifdef CABAL_PARSEC_DEBUG+checkPosition pos@(Position lineno colno) inp inp' len_chars = do+    text_lines <- getDbgText+    let len_bytes = B.length inp - B.length inp'+        pos_txt   | lineno-1 < V.length text_lines = T.take len_chars (T.drop (colno-1) (text_lines V.! (lineno-1)))+                  | otherwise = T.empty+        real_txt  = B.take len_bytes inp+    when (pos_txt /= T.decodeUtf8 real_txt) $+      traceShow (pos, pos_txt, T.decodeUtf8 real_txt) $+      traceShow (take 3 (V.toList text_lines)) $ return ()+  where+    getDbgText = Lex $ \s@LexState{ dbgText = txt } -> LexResult s txt+#else+checkPosition _ _ _ _ = return ()+#endif++lexAll :: Lex [LToken]+lexAll = do+  t <- lexToken+  case t of+    L _ EOF -> return [t]+    _       -> do ts <- lexAll+                  return (t : ts)++ltest :: Int -> String -> Prelude.IO ()+ltest code s =+  let (ws, xs) = execLexer (setStartCode code >> lexAll) (B.Char8.pack s)+   in traverse_ print ws >> traverse_ print xs++mkLexState :: ByteString -> LexState+mkLexState input = LexState+  { curPos   = Position 1 1+  , curInput = input+  , curCode  = 0+  , warnings = []+#ifdef CABAL_PARSEC_DEBUG+  , dbgText  = V.fromList . lines' . T.decodeUtf8With T.lenientDecode $ input+#endif+  }++#ifdef CABAL_PARSEC_DEBUG+lines' :: T.Text -> [T.Text]+lines' s1+  | T.null s1 = []+  | otherwise = case T.break (\c -> c == '\r' || c == '\n') s1 of+                  (l, s2) | Just (c,s3) <- T.uncons s2+                         -> case T.uncons s3 of+                              Just ('\n', s4) | c == '\r' -> l `T.snoc` '\r' `T.snoc` '\n' : lines' s4+                              _                           -> l `T.snoc` c : lines' s3++                          | otherwise+                         -> [l]+#endif++bol_field_braces,bol_field_layout,bol_section,in_field_braces,in_field_layout,in_section :: Int+bol_field_braces = 1+bol_field_layout = 2+bol_section = 3+in_field_braces = 4+in_field_layout = 5+in_section = 6+alex_action_0 =  \_ len _ -> do+              when (len /= 0) $ addWarning LexWarningBOM+              setStartCode bol_section+              lexToken+         +alex_action_1 =  \_pos len inp -> checkWhitespace len inp >> adjustPos retPos >> lexToken +alex_action_3 =  \pos len inp -> checkLeadingWhitespace len inp >>+                                     if B.length inp == len+                                       then return (L pos EOF)+                                       else setStartCode in_section+                                         >> return (L pos (Indent len)) +alex_action_4 =  tok  OpenBrace +alex_action_5 =  tok  CloseBrace +alex_action_8 =  toki TokSym +alex_action_9 =  \pos len inp -> return $! L pos (TokStr (B.take (len - 2) (B.tail inp))) +alex_action_10 =  toki TokOther +alex_action_11 =  toki TokOther +alex_action_12 =  tok  Colon +alex_action_13 =  tok  OpenBrace +alex_action_14 =  tok  CloseBrace +alex_action_15 =  \_ _ _ -> adjustPos retPos >> setStartCode bol_section >> lexToken +alex_action_16 =  \pos len inp -> checkLeadingWhitespace len inp >>= \len' ->+                                  if B.length inp == len+                                    then return (L pos EOF)+                                    else setStartCode in_field_layout+                                      >> return (L pos (Indent len')) +alex_action_18 =  toki TokFieldLine +alex_action_19 =  \_ _ _ -> adjustPos retPos >> setStartCode bol_field_layout >> lexToken +alex_action_20 =  \_ _ _ -> setStartCode in_field_braces >> lexToken +alex_action_22 =  toki TokFieldLine +alex_action_23 =  tok  OpenBrace  +alex_action_24 =  tok  CloseBrace +alex_action_25 =  \_ _ _ -> adjustPos retPos >> setStartCode bol_field_braces >> lexToken +{-# LINE 1 "templates/GenericTemplate.hs" #-}+-- -----------------------------------------------------------------------------+-- ALEX TEMPLATE+--+-- This code is in the PUBLIC DOMAIN; you may copy it freely and use+-- it for any purpose whatsoever.++-- -----------------------------------------------------------------------------+-- INTERNALS and main scanner engine++-- Do not remove this comment. Required to fix CPP parsing when using GCC and a clang-compiled alex.+#if __GLASGOW_HASKELL__ > 706+#define GTE(n,m) (tagToEnum# (n >=# m))+#define EQ(n,m) (tagToEnum# (n ==# m))+#else+#define GTE(n,m) (n >=# m)+#define EQ(n,m) (n ==# m)+#endif++data AlexAddr = AlexA# Addr#+-- Do not remove this comment. Required to fix CPP parsing when using GCC and a clang-compiled alex.+#if __GLASGOW_HASKELL__ < 503+uncheckedShiftL# = shiftL#+#endif++{-# INLINE alexIndexInt16OffAddr #-}+alexIndexInt16OffAddr (AlexA# arr) off =+#ifdef WORDS_BIGENDIAN+  narrow16Int# i+  where+        i    = word2Int# ((high `uncheckedShiftL#` 8#) `or#` low)+        high = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))+        low  = int2Word# (ord# (indexCharOffAddr# arr off'))+        off' = off *# 2#+#else+  indexInt16OffAddr# arr off+#endif++{-# INLINE alexIndexInt32OffAddr #-}+alexIndexInt32OffAddr (AlexA# arr) off =+#ifdef WORDS_BIGENDIAN+  narrow32Int# i+  where+   i    = word2Int# ((b3 `uncheckedShiftL#` 24#) `or#`+                     (b2 `uncheckedShiftL#` 16#) `or#`+                     (b1 `uncheckedShiftL#` 8#) `or#` b0)+   b3   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 3#)))+   b2   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 2#)))+   b1   = int2Word# (ord# (indexCharOffAddr# arr (off' +# 1#)))+   b0   = int2Word# (ord# (indexCharOffAddr# arr off'))+   off' = off *# 4#+#else+  indexInt32OffAddr# arr off+#endif++#if __GLASGOW_HASKELL__ < 503+quickIndex arr i = arr ! i+#else+-- GHC >= 503, unsafeAt is available from Data.Array.Base.+quickIndex = unsafeAt+#endif++-- -----------------------------------------------------------------------------+-- Main lexing routines++data AlexReturn a+  = AlexEOF+  | AlexError  !AlexInput+  | AlexSkip   !AlexInput !Int+  | AlexToken  !AlexInput !Int a++-- alexScan :: AlexInput -> StartCode -> AlexReturn a+alexScan input__ (I# (sc))+  = alexScanUser undefined input__ (I# (sc))++alexScanUser user__ input__ (I# (sc))+  = case alex_scan_tkn user__ input__ 0# input__ sc AlexNone of+  (AlexNone, input__') ->+    case alexGetByte input__ of+      Nothing ->++                                   AlexEOF+      Just _ ->++                                   AlexError input__'++  (AlexLastSkip input__'' len, _) ->++    AlexSkip input__'' len++  (AlexLastAcc k input__''' len, _) ->++    AlexToken input__''' len (alex_actions ! k)++-- Push the input through the DFA, remembering the most recent accepting+-- state it encountered.++alex_scan_tkn user__ orig_input len input__ s last_acc =+  input__ `seq` -- strict in the input+  let+  new_acc = (check_accs (alex_accept `quickIndex` (I# (s))))+  in+  new_acc `seq`+  case alexGetByte input__ of+     Nothing -> (new_acc, input__)+     Just (c, new_input) ->++      case fromIntegral c of { (I# (ord_c)) ->+        let+                base   = alexIndexInt32OffAddr alex_base s+                offset = (base +# ord_c)+                check  = alexIndexInt16OffAddr alex_check offset++                new_s = if GTE(offset,0#) && EQ(check,ord_c)+                          then alexIndexInt16OffAddr alex_table offset+                          else alexIndexInt16OffAddr alex_deflt s+        in+        case new_s of+            -1# -> (new_acc, input__)+                -- on an error, we want to keep the input *before* the+                -- character that failed, not after.+            _ -> alex_scan_tkn user__ orig_input (if c < 0x80 || c >= 0xC0 then (len +# 1#) else len)+                                                -- note that the length is increased ONLY if this is the 1st byte in a char encoding)+                        new_input new_s new_acc+      }+  where+        check_accs (AlexAccNone) = last_acc+        check_accs (AlexAcc a  ) = AlexLastAcc a input__ (I# (len))+        check_accs (AlexAccSkip) = AlexLastSkip  input__ (I# (len))++data AlexLastAcc+  = AlexNone+  | AlexLastAcc !Int !AlexInput !Int+  | AlexLastSkip     !AlexInput !Int++data AlexAcc user+  = AlexAccNone+  | AlexAcc Int+  | AlexAccSkip+

@@ -0,0 +1,154 @@+{-# LANGUAGE CPP #-}+-----------------------------------------------------------------------------+-- |+-- Module      :  Distribution.Fields.LexerMonad+-- License     :  BSD3+--+-- Maintainer  :  cabal-devel@haskell.org+-- Portability :  portable+module Distribution.Fields.LexerMonad (+    InputStream,+    LexState(..),+    LexResult(..),++    Lex(..),+    execLexer,++    getPos,+    setPos,+    adjustPos,++    getInput,+    setInput,++    getStartCode,+    setStartCode,++    LexWarning(..),+    LexWarningType(..),+    addWarning,+    toPWarnings,++  ) where++import qualified Data.ByteString              as B+import           Distribution.Compat.Prelude+import           Distribution.Parsec.Position (Position (..), showPos)+import           Distribution.Parsec.Warning  (PWarnType (..), PWarning (..))+import           Prelude ()++import qualified Data.Map.Strict as Map++#ifdef CABAL_PARSEC_DEBUG+-- testing only:+import qualified Data.Text          as T+import qualified Data.Text.Encoding as T+import qualified Data.Vector        as V+#endif++-- simple state monad+newtype Lex a = Lex { unLex :: LexState -> LexResult a }++instance Functor Lex where+  fmap = liftM++instance Applicative Lex where+  pure = returnLex+  (<*>) = ap++instance Monad Lex where+  return = pure+  (>>=)  = thenLex++data LexResult a = LexResult {-# UNPACK #-} !LexState a++data LexWarningType+    = LexWarningNBSP  -- ^ Encountered non breaking space+    | LexWarningBOM   -- ^ BOM at the start of the cabal file+    | LexWarningTab   -- ^ Leading tags+  deriving (Eq, Ord, Show)++data LexWarning = LexWarning                !LexWarningType+                             {-# UNPACK #-} !Position+  deriving (Show)++toPWarnings :: [LexWarning] -> [PWarning]+toPWarnings+    = map (uncurry toWarning)+    . Map.toList+    . Map.fromListWith (++)+    . map (\(LexWarning t p) -> (t, [p]))+  where+    toWarning LexWarningBOM poss =+        PWarning PWTLexBOM (head poss) "Byte-order mark found at the beginning of the file"+    toWarning LexWarningNBSP poss =+        PWarning PWTLexNBSP (head poss) $ "Non breaking spaces at " ++ intercalate ", " (map showPos poss)+    toWarning LexWarningTab poss =+        PWarning PWTLexTab (head poss) $ "Tabs used as indentation at " ++ intercalate ", " (map showPos poss)++data LexState = LexState {+        curPos   :: {-# UNPACK #-} !Position,        -- ^ position at current input location+        curInput :: {-# UNPACK #-} !InputStream,     -- ^ the current input+        curCode  :: {-# UNPACK #-} !StartCode,       -- ^ lexer code+        warnings :: [LexWarning]+#ifdef CABAL_PARSEC_DEBUG+        , dbgText  :: V.Vector T.Text                -- ^ input lines, to print pretty debug info+#endif+     } --TODO: check if we should cache the first token+       -- since it looks like parsec's uncons can be called many times on the same input++type StartCode   = Int    -- ^ An @alex@ lexer start code+type InputStream = B.ByteString++++-- | Execute the given lexer on the supplied input stream.+execLexer :: Lex a -> InputStream -> ([LexWarning], a)+execLexer (Lex lexer) input =+    case lexer initialState of+      LexResult LexState{ warnings = ws } result -> (ws, result)+  where+    initialState = LexState+      -- TODO: add 'startPosition'+      { curPos   = Position 1 1+      , curInput = input+      , curCode  = 0+      , warnings = []+#ifdef CABAL_PARSEC_DEBUG+      , dbgText  = V.fromList . T.lines . T.decodeUtf8 $ input+#endif+      }++{-# INLINE returnLex #-}+returnLex :: a -> Lex a+returnLex a = Lex $ \s -> LexResult s a++{-# INLINE thenLex #-}+thenLex :: Lex a -> (a -> Lex b) -> Lex b+(Lex m) `thenLex` k = Lex $ \s -> case m s of LexResult s' a -> (unLex (k a)) s'++setPos :: Position -> Lex ()+setPos pos = Lex $ \s -> LexResult s{ curPos = pos } ()++getPos :: Lex Position+getPos = Lex $ \s@LexState{ curPos = pos } -> LexResult s pos++adjustPos :: (Position -> Position) -> Lex ()+adjustPos f = Lex $ \s@LexState{ curPos = pos } -> LexResult s{ curPos = f pos } ()++getInput :: Lex InputStream+getInput = Lex $ \s@LexState{ curInput = i } -> LexResult s i++setInput :: InputStream -> Lex ()+setInput i = Lex $ \s -> LexResult s{ curInput = i } ()++getStartCode :: Lex Int+getStartCode = Lex $ \s@LexState{ curCode = c } -> LexResult s c++setStartCode :: Int -> Lex ()+setStartCode c = Lex $ \s -> LexResult s{ curCode = c } ()++-- | Add warning at the current position+addWarning :: LexWarningType -> Lex ()+addWarning wt = Lex $ \s@LexState{ curPos = pos, warnings = ws  } ->+    LexResult s{ warnings = LexWarning wt pos : ws } ()

@@ -0,0 +1,185 @@+{-# LANGUAGE BangPatterns     #-}+{-# LANGUAGE CPP              #-}+{-# LANGUAGE FlexibleContexts #-}+{-# LANGUAGE RankNTypes       #-}+-- | A parse result type for parsers from AST to Haskell types.+module Distribution.Fields.ParseResult (+    ParseResult,+    runParseResult,+    recoverWith,+    parseWarning,+    parseWarnings,+    parseFailure,+    parseFatalFailure,+    parseFatalFailure',+    getCabalSpecVersion,+    setCabalSpecVersion,+    readAndParseFile,+    parseString+    ) where++import qualified Data.ByteString.Char8        as BS+import           Distribution.Compat.Prelude+import           Distribution.Parsec.Error    (PError (..), showPError)+import           Distribution.Parsec.Position (Position (..), zeroPos)+import           Distribution.Parsec.Warning  (PWarnType (..), PWarning (..), showPWarning)+import           Distribution.Simple.Utils    (die', warn)+import           Distribution.Verbosity       (Verbosity)+import           Distribution.Version         (Version)+import           Prelude ()+import           System.Directory             (doesFileExist)++#if MIN_VERSION_base(4,10,0)+import Control.Applicative (Applicative (..))+#endif++-- | A monad with failure and accumulating errors and warnings.+newtype ParseResult a = PR+    { unPR+        :: forall r. PRState+        -> (PRState -> r) -- failure, but we were able to recover a new-style spec-version declaration+        -> (PRState -> a -> r)             -- success+        -> r+    }++data PRState = PRState ![PWarning] ![PError] !(Maybe Version)++emptyPRState :: PRState+emptyPRState = PRState [] [] Nothing++-- | Destruct a 'ParseResult' into the emitted warnings and either+-- a successful value or+-- list of errors and possibly recovered a spec-version declaration.+runParseResult :: ParseResult a -> ([PWarning], Either (Maybe Version, NonEmpty PError) a)+runParseResult pr = unPR pr emptyPRState failure success+  where+    failure (PRState warns []         v)   = (warns, Left (v, PError zeroPos "panic" :| []))+    failure (PRState warns (err:errs) v)   = (warns, Left (v, err :| errs)) where+    success (PRState warns []         _)   x = (warns, Right x)+    -- If there are any errors, don't return the result+    success (PRState warns (err:errs) v) _ = (warns, Left (v, err :| errs))++instance Functor ParseResult where+    fmap f (PR pr) = PR $ \ !s failure success ->+        pr s failure $ \ !s' a ->+        success s' (f a)+    {-# INLINE fmap #-}++instance Applicative ParseResult where+    pure x = PR $ \ !s _ success -> success s x+    {-# INLINE pure #-}++    f <*> x = PR $ \ !s0 failure success ->+        unPR f s0 failure $ \ !s1 f' ->+        unPR x s1 failure $ \ !s2 x' ->+        success s2 (f' x')+    {-# INLINE (<*>) #-}++    x  *> y = PR $ \ !s0 failure success ->+        unPR x s0 failure $ \ !s1 _ ->+        unPR y s1 failure success+    {-# INLINE (*>) #-}++    x  <* y = PR $ \ !s0 failure success ->+        unPR x s0 failure $ \ !s1 x' ->+        unPR y s1 failure $ \ !s2 _  ->+        success s2 x'+    {-# INLINE (<*) #-}++#if MIN_VERSION_base(4,10,0)+    liftA2 f x y = PR $ \ !s0 failure success ->+        unPR x s0 failure $ \ !s1 x' ->+        unPR y s1 failure $ \ !s2 y' ->+        success s2 (f x' y')+    {-# INLINE liftA2 #-}+#endif++instance Monad ParseResult where+    return = pure+    (>>) = (*>)++    m >>= k = PR $ \ !s failure success ->+        unPR m s failure $ \ !s' a ->+        unPR (k a) s' failure success+    {-# INLINE (>>=) #-}++-- | "Recover" the parse result, so we can proceed parsing.+-- 'runParseResult' will still result in 'Nothing', if there are recorded errors.+recoverWith :: ParseResult a -> a -> ParseResult a+recoverWith (PR pr) x = PR $ \ !s _failure success ->+    pr s (\ !s' -> success s' x) success++-- | Set cabal spec version.+setCabalSpecVersion :: Maybe Version -> ParseResult ()+setCabalSpecVersion v = PR $ \(PRState warns errs _) _failure success ->+    success (PRState warns errs v) ()++-- | Get cabal spec version.+getCabalSpecVersion :: ParseResult (Maybe Version)+getCabalSpecVersion = PR $ \s@(PRState _ _ v) _failure success ->+    success s v++-- | Add a warning. This doesn't fail the parsing process.+parseWarning :: Position -> PWarnType -> String -> ParseResult ()+parseWarning pos t msg = PR $ \(PRState warns errs v) _failure success ->+    success (PRState (PWarning t pos msg : warns) errs v) ()++-- | Add multiple warnings at once.+parseWarnings :: [PWarning] -> ParseResult ()+parseWarnings newWarns = PR $ \(PRState warns errs v) _failure success ->+    success (PRState (newWarns ++ warns) errs v) ()++-- | Add an error, but not fail the parser yet.+--+-- For fatal failure use 'parseFatalFailure'+parseFailure :: Position -> String -> ParseResult ()+parseFailure pos msg = PR $ \(PRState warns errs v) _failure success ->+    success (PRState warns (PError pos msg : errs) v) ()++-- | Add an fatal error.+parseFatalFailure :: Position -> String -> ParseResult a+parseFatalFailure pos msg = PR $ \(PRState warns errs v) failure _success ->+    failure (PRState warns (PError pos msg : errs) v)++-- | A 'mzero'.+parseFatalFailure' :: ParseResult a+parseFatalFailure' = PR pr+  where+    pr (PRState warns [] v) failure _success = failure (PRState warns [err] v)+    pr s                    failure _success = failure s++    err = PError zeroPos "Unknown fatal error"++-- | Helper combinator to do parsing plumbing for files.+--+-- Given a parser and a filename, return the parse of the file,+-- after checking if the file exists.+--+-- Argument order is chosen to encourage partial application.+readAndParseFile+    :: (BS.ByteString -> ParseResult a)  -- ^ File contents to final value parser+    -> Verbosity                         -- ^ Verbosity level+    -> FilePath                          -- ^ File to read+    -> IO a+readAndParseFile parser verbosity fpath = do+    exists <- doesFileExist fpath+    unless exists $+      die' verbosity $+        "Error Parsing: file \"" ++ fpath ++ "\" doesn't exist. Cannot continue."+    bs <- BS.readFile fpath+    parseString parser verbosity fpath bs++parseString+    :: (BS.ByteString -> ParseResult a)  -- ^ File contents to final value parser+    -> Verbosity                         -- ^ Verbosity level+    -> String                            -- ^ File name+    -> BS.ByteString+    -> IO a+parseString parser verbosity name bs = do+    let (warnings, result) = runParseResult (parser bs)+    traverse_ (warn verbosity . showPWarning name) warnings+    case result of+        Right x -> return x+        Left (_, errors) -> do+            traverse_ (warn verbosity . showPError name) errors+            die' verbosity $ "Failed parsing \"" ++ name ++ "\"."

@@ -0,0 +1,378 @@+{-# LANGUAGE CPP                   #-}+{-# LANGUAGE MultiParamTypeClasses #-}+{-# LANGUAGE OverloadedStrings     #-}+{-# LANGUAGE PatternGuards         #-}+-----------------------------------------------------------------------------+-- |+-- Module      :  Distribution.Fields.Parser+-- License     :  BSD3+--+-- Maintainer  :  cabal-devel@haskell.org+-- Portability :  portable+module Distribution.Fields.Parser (+    -- * Types+    Field(..),+    Name(..),+    FieldLine(..),+    SectionArg(..),+    -- * Grammar and parsing+    -- $grammar+    readFields,+    readFields',+#ifdef CABAL_PARSEC_DEBUG+    -- * Internal+    parseFile,+    parseStr,+    parseBS,+#endif+    ) where++import           Control.Monad                  (guard)+import qualified Data.ByteString.Char8          as B8+import           Data.Functor.Identity+import           Distribution.Compat.Prelude+import           Distribution.Fields.Field+import           Distribution.Fields.Lexer+import           Distribution.Fields.LexerMonad+                 (LexResult (..), LexState (..), LexWarning (..), unLex)+import           Distribution.Parsec.Position   (Position (..))+import           Prelude ()+import           Text.Parsec.Combinator         hiding (eof, notFollowedBy)+import           Text.Parsec.Error+import           Text.Parsec.Pos+import           Text.Parsec.Prim               hiding (many, (<|>))++#ifdef CABAL_PARSEC_DEBUG+import qualified Data.Text                as T+import qualified Data.Text.Encoding       as T+import qualified Data.Text.Encoding.Error as T+#endif++-- | The 'LexState'' (with a prime) is an instance of parsec's 'Stream'+-- wrapped around lexer's 'LexState' (without a prime)+data LexState' = LexState' !LexState (LToken, LexState')++mkLexState' :: LexState -> LexState'+mkLexState' st = LexState' st+                   (case unLex lexToken st of LexResult st' tok -> (tok, mkLexState' st'))++type Parser a = ParsecT LexState' () Identity a++instance Stream LexState' Identity LToken where+  uncons (LexState' _ (tok, st')) =+    case tok of+      L _ EOF -> return Nothing+      _       -> return (Just (tok, st'))++-- | Get lexer warnings accumulated so far+getLexerWarnings :: Parser [LexWarning]+getLexerWarnings = do+  LexState' (LexState { warnings = ws }) _ <- getInput+  return ws++-- | Set Alex code i.e. the mode "state" lexer is in.+setLexerMode :: Int -> Parser ()+setLexerMode code = do+  LexState' ls _ <- getInput+  setInput $! mkLexState' ls { curCode = code }++getToken :: (Token -> Maybe a) -> Parser a+getToken getTok = getTokenWithPos (\(L _ t) -> getTok t)++getTokenWithPos :: (LToken -> Maybe a) -> Parser a+getTokenWithPos getTok = tokenPrim (\(L _ t) -> describeToken t) updatePos getTok+  where+    updatePos :: SourcePos -> LToken -> LexState' -> SourcePos+    updatePos pos (L (Position col line) _) _ = newPos (sourceName pos) col line++describeToken :: Token -> String+describeToken t = case t of+  TokSym   s      -> "symbol "   ++ show s+  TokStr   s      -> "string "   ++ show s+  TokOther s      -> "operator " ++ show s+  Indent _        -> "new line"+  TokFieldLine _  -> "field content"+  Colon           -> "\":\""+  OpenBrace       -> "\"{\""+  CloseBrace      -> "\"}\""+--  SemiColon       -> "\";\""+  EOF             -> "end of file"+  LexicalError is -> "character in input " ++ show (B8.head is)++tokSym :: Parser (Name Position)+tokSym', tokStr, tokOther :: Parser (SectionArg Position)+tokIndent :: Parser Int+tokColon, tokOpenBrace, tokCloseBrace :: Parser ()+tokFieldLine :: Parser (FieldLine Position)++tokSym        = getTokenWithPos $ \t -> case t of L pos (TokSym   x) -> Just (mkName pos x);  _ -> Nothing+tokSym'       = getTokenWithPos $ \t -> case t of L pos (TokSym   x) -> Just (SecArgName pos x);  _ -> Nothing+tokStr        = getTokenWithPos $ \t -> case t of L pos (TokStr   x) -> Just (SecArgStr pos x);  _ -> Nothing+tokOther      = getTokenWithPos $ \t -> case t of L pos (TokOther x) -> Just (SecArgOther pos x);  _ -> Nothing+tokIndent     = getToken $ \t -> case t of Indent   x -> Just x;  _ -> Nothing+tokColon      = getToken $ \t -> case t of Colon      -> Just (); _ -> Nothing+tokOpenBrace  = getToken $ \t -> case t of OpenBrace  -> Just (); _ -> Nothing+tokCloseBrace = getToken $ \t -> case t of CloseBrace -> Just (); _ -> Nothing+tokFieldLine  = getTokenWithPos $ \t -> case t of L pos (TokFieldLine s) -> Just (FieldLine pos s); _ -> Nothing++colon, openBrace, closeBrace :: Parser ()++sectionArg :: Parser (SectionArg Position)+sectionArg   = tokSym' <|> tokStr <|> tokOther <?> "section parameter"++fieldSecName :: Parser (Name Position)+fieldSecName = tokSym              <?> "field or section name"++colon        = tokColon      <?> "\":\""+openBrace    = tokOpenBrace  <?> "\"{\""+closeBrace   = tokCloseBrace <?> "\"}\""++fieldContent :: Parser (FieldLine Position)+fieldContent = tokFieldLine <?> "field contents"++newtype IndentLevel = IndentLevel Int++zeroIndentLevel :: IndentLevel+zeroIndentLevel = IndentLevel 0++incIndentLevel :: IndentLevel -> IndentLevel+incIndentLevel (IndentLevel i) = IndentLevel (succ i)++indentOfAtLeast :: IndentLevel -> Parser IndentLevel+indentOfAtLeast (IndentLevel i) = try $ do+  j <- tokIndent+  guard (j >= i) <?> "indentation of at least " ++ show i+  return (IndentLevel j)+++newtype LexerMode = LexerMode Int++inLexerMode :: LexerMode -> Parser p -> Parser p+inLexerMode (LexerMode mode) p =+  do setLexerMode mode; x <- p; setLexerMode in_section; return x+++-----------------------+-- Cabal file grammar+--++-- $grammar+--+-- @+-- CabalStyleFile ::= SecElems+--+-- SecElems       ::= SecElem* '\\n'?+-- SecElem        ::= '\\n' SecElemLayout | SecElemBraces+-- SecElemLayout  ::= FieldLayout | FieldBraces | SectionLayout | SectionBraces+-- SecElemBraces  ::= FieldInline | FieldBraces |                 SectionBraces+-- FieldLayout    ::= name ':' line? ('\\n' line)*+-- FieldBraces    ::= name ':' '\\n'? '{' content '}'+-- FieldInline    ::= name ':' content+-- SectionLayout  ::= name arg* SecElems+-- SectionBraces  ::= name arg* '\\n'? '{' SecElems '}'+-- @+--+-- and the same thing but left factored...+--+-- @+-- SecElems              ::= SecElem*+-- SecElem               ::= '\\n' name SecElemLayout+--                         |      name SecElemBraces+-- SecElemLayout         ::= ':'   FieldLayoutOrBraces+--                         | arg*  SectionLayoutOrBraces+-- FieldLayoutOrBraces   ::= '\\n'? '{' content '}'+--                         | line? ('\\n' line)*+-- SectionLayoutOrBraces ::= '\\n'? '{' SecElems '\\n'? '}'+--                         | SecElems+-- SecElemBraces         ::= ':' FieldInlineOrBraces+--                         | arg* '\\n'? '{' SecElems '\\n'? '}'+-- FieldInlineOrBraces   ::= '\\n'? '{' content '}'+--                         | content+-- @+--+-- Note how we have several productions with the sequence:+--+-- > '\\n'? '{'+--+-- That is, an optional newline (and indent) followed by a @{@ token.+-- In the @SectionLayoutOrBraces@ case you can see that this makes it+-- not fully left factored (because @SecElems@ can start with a @\\n@).+-- Fully left factoring here would be ugly, and though we could use a+-- lookahead of two tokens to resolve the alternatives, we can't+-- conveniently use Parsec's 'try' here to get a lookahead of only two.+-- So instead we deal with this case in the lexer by making a line+-- where the first non-space is @{@ lex as just the @{@ token, without+-- the usual indent token. Then in the parser we can resolve everything+-- with just one token of lookahead and so without using 'try'.++-- Top level of a file using cabal syntax+--+cabalStyleFile :: Parser [Field Position]+cabalStyleFile = do es <- elements zeroIndentLevel+                    eof+                    return es++-- Elements that live at the top level or inside a section, ie fields+-- and sectionscontent+--+-- elements ::= element*+elements :: IndentLevel -> Parser [Field Position]+elements ilevel = many (element ilevel)++-- An individual element, ie a field or a section. These can either use+-- layout style or braces style. For layout style then it must start on+-- a line on its own (so that we know its indentation level).+--+-- element ::= '\\n' name elementInLayoutContext+--           |      name elementInNonLayoutContext+element :: IndentLevel -> Parser (Field Position)+element ilevel =+      (do ilevel' <- indentOfAtLeast ilevel+          name    <- fieldSecName+          elementInLayoutContext (incIndentLevel ilevel') name)+  <|> (do name    <- fieldSecName+          elementInNonLayoutContext name)++-- An element (field or section) that is valid in a layout context.+-- In a layout context we can have fields and sections that themselves+-- either use layout style or that use braces style.+--+-- elementInLayoutContext ::= ':'  fieldLayoutOrBraces+--                          | arg* sectionLayoutOrBraces+elementInLayoutContext :: IndentLevel -> Name Position -> Parser (Field Position)+elementInLayoutContext ilevel name =+      (do colon; fieldLayoutOrBraces ilevel name)+  <|> (do args  <- many sectionArg+          elems <- sectionLayoutOrBraces ilevel+          return (Section name args elems))++-- An element (field or section) that is valid in a non-layout context.+-- In a non-layout context we can have only have fields and sections that+-- themselves use braces style, or inline style fields.+--+-- elementInNonLayoutContext ::= ':' FieldInlineOrBraces+--                             | arg* '\\n'? '{' elements '\\n'? '}'+elementInNonLayoutContext :: Name Position -> Parser (Field Position)+elementInNonLayoutContext name =+      (do colon; fieldInlineOrBraces name)+  <|> (do args <- many sectionArg+          openBrace+          elems <- elements zeroIndentLevel+          optional tokIndent+          closeBrace+          return (Section name args elems))++-- The body of a field, using either layout style or braces style.+--+-- fieldLayoutOrBraces   ::= '\\n'? '{' content '}'+--                         | line? ('\\n' line)*+fieldLayoutOrBraces :: IndentLevel -> Name Position -> Parser (Field Position)+fieldLayoutOrBraces ilevel name = braces <|> fieldLayout+  where+    braces = do+          openBrace+          ls <- inLexerMode (LexerMode in_field_braces) (many fieldContent)+          closeBrace+          return (Field name ls)+    fieldLayout = inLexerMode (LexerMode in_field_layout) $ do+          l  <- optionMaybe fieldContent+          ls <- many (do _ <- indentOfAtLeast ilevel; fieldContent)+          return $ case l of+              Nothing -> Field name ls+              Just l' -> Field name (l' : ls)++-- The body of a section, using either layout style or braces style.+--+-- sectionLayoutOrBraces ::= '\\n'? '{' elements \\n? '}'+--                         | elements+sectionLayoutOrBraces :: IndentLevel -> Parser [Field Position]+sectionLayoutOrBraces ilevel =+      (do openBrace+          elems <- elements zeroIndentLevel+          optional tokIndent+          closeBrace+          return elems)+  <|> (elements ilevel)++-- The body of a field, using either inline style or braces.+--+-- fieldInlineOrBraces   ::= '\\n'? '{' content '}'+--                         | content+fieldInlineOrBraces :: Name Position -> Parser (Field Position)+fieldInlineOrBraces name =+      (do openBrace+          ls <- inLexerMode (LexerMode in_field_braces) (many fieldContent)+          closeBrace+          return (Field name ls))+  <|> (do ls <- inLexerMode (LexerMode in_field_braces) (option [] (fmap (\l -> [l]) fieldContent))+          return (Field name ls))+++-- | Parse cabal style 'B8.ByteString' into list of 'Field's, i.e. the cabal AST.+readFields :: B8.ByteString -> Either ParseError [Field Position]+readFields s = fmap fst (readFields' s)++-- | Like 'readFields' but also return lexer warnings+readFields' :: B8.ByteString -> Either ParseError ([Field Position], [LexWarning])+readFields' s = do+    parse parser "the input" lexSt+  where+    parser = do+        fields <- cabalStyleFile+        ws     <- getLexerWarnings+        pure (fields, ws)++    lexSt = mkLexState' (mkLexState s)++#ifdef CABAL_PARSEC_DEBUG+parseTest' :: Show a => Parsec LexState' () a -> SourceName -> B8.ByteString -> IO ()+parseTest' p fname s =+    case parse p fname (lexSt s) of+      Left err -> putStrLn (formatError s err)++      Right x  -> print x+  where+    lexSt = mkLexState' . mkLexState++parseFile :: Show a => Parser a -> FilePath -> IO ()+parseFile p f = B8.readFile f >>= \s -> parseTest' p f s++parseStr  :: Show a => Parser a -> String -> IO ()+parseStr p = parseBS p . B8.pack++parseBS  :: Show a => Parser a -> B8.ByteString -> IO ()+parseBS p = parseTest' p "<input string>"++formatError :: B8.ByteString -> ParseError -> String+formatError input perr =+    unlines+      [ "Parse error "++ show (errorPos perr) ++ ":"+      , errLine+      , indicator ++ errmsg ]+  where+    pos       = errorPos perr+    ls        = lines' (T.decodeUtf8With T.lenientDecode input)+    errLine   = T.unpack (ls !! (sourceLine pos - 1))+    indicator = replicate (sourceColumn pos) ' ' ++ "^"+    errmsg    = showErrorMessages "or" "unknown parse error"+                                  "expecting" "unexpected" "end of file"+                                  (errorMessages perr)++-- | Handles windows/osx/unix line breaks uniformly+lines' :: T.Text -> [T.Text]+lines' s1+  | T.null s1 = []+  | otherwise = case T.break (\c -> c == '\r' || c == '\n') s1 of+                  (l, s2) | Just (c,s3) <- T.uncons s2+                         -> case T.uncons s3 of+                              Just ('\n', s4) | c == '\r' -> l : lines' s4+                              _               -> l : lines' s3+                          | otherwise -> [l]+#endif++eof :: Parser ()+eof = notFollowedBy anyToken <?> "end of file"+  where+    notFollowedBy :: Parser LToken -> Parser ()+    notFollowedBy p = try (    (do L _ t <- try p; unexpected (describeToken t))+                           <|> return ())