diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-04-05 17:39:13 +0200 |
|---|---|---|
| committer | Sylvain Henry <sylvain@haskus.fr> | 2020-04-18 20:04:46 +0200 |
| commit | 15312bbb53f247c9ed2c5cf75100a9f44c1c7227 (patch) | |
| tree | 8306dcc04a5b7c82464f903044dfdd589e7fdcd7 /utils | |
| parent | 3ca52151881451ce5b3a7740d003e811b586140d (diff) | |
| download | haskell-15312bbb53f247c9ed2c5cf75100a9f44c1c7227.tar.gz | |
Modules (#13009)
* SysTools
* Parser
* GHC.Builtin
* GHC.Iface.Recomp
* Settings
Update Haddock submodule
Metric Decrease:
Naperian
parsing001
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/check-api-annotations/Main.hs | 2 | ||||
| -rw-r--r-- | utils/check-api-annotations/README | 4 | ||||
| -rw-r--r-- | utils/genprimopcode/Main.hs | 2 | ||||
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 3 | ||||
| m--------- | utils/haddock | 0 |
5 files changed, 6 insertions, 5 deletions
diff --git a/utils/check-api-annotations/Main.hs b/utils/check-api-annotations/Main.hs index 3546e8693f..e0d62e6684 100644 --- a/utils/check-api-annotations/Main.hs +++ b/utils/check-api-annotations/Main.hs @@ -5,7 +5,7 @@ import Data.List import GHC import GHC.Driver.Session import Outputable -import ApiAnnotation +import GHC.Parser.Annotation import GHC.Types.SrcLoc import System.Environment( getArgs ) import System.Exit diff --git a/utils/check-api-annotations/README b/utils/check-api-annotations/README index fcadc50ff6..5d852a30bf 100644 --- a/utils/check-api-annotations/README +++ b/utils/check-api-annotations/README @@ -1,5 +1,5 @@ -This programme is intended to be used by any GHC developers working on Parser.y -or RdrHsSyn.hs, and who want to check that their changes do not break the API +This programme is intended to be used by any GHC developers working on GHC.Parser +or GHC.Parser.PostProcess, and who want to check that their changes do not break the API Annotations. It does a basic test that all annotations do make it to the final AST, and dumps diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs index bcbfe968c8..5e34ee97c1 100644 --- a/utils/genprimopcode/Main.hs +++ b/utils/genprimopcode/Main.hs @@ -859,7 +859,7 @@ ppType (TyApp (TyCon "ThreadId#") []) = "threadIdPrimTy" ppType (TyApp (TyCon "ForeignObj#") []) = "foreignObjPrimTy" ppType (TyApp (TyCon "BCO") []) = "bcoPrimTy" ppType (TyApp (TyCon "Compact#") []) = "compactPrimTy" -ppType (TyApp (TyCon "()") []) = "unitTy" -- unitTy is TysWiredIn's name for () +ppType (TyApp (TyCon "()") []) = "unitTy" -- unitTy is GHC.Builtin.Types's name for () ppType (TyVar "a") = "alphaTy" ppType (TyVar "b") = "betaTy" diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index c29e4cfd13..ed68b3ff04 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -34,7 +34,8 @@ import qualified GHC.PackageDb as GhcPkg import GHC.PackageDb (BinaryStringRep(..)) import GHC.HandleEncoding import GHC.BaseDir (getBaseDir) -import GHC.Settings (getTargetPlatform, maybeReadFuzzy) +import GHC.Settings.Platform (getTargetPlatform) +import GHC.Settings.Utils (maybeReadFuzzy) import GHC.Platform (platformMini) import GHC.Platform.Host (cHostPlatformMini) import GHC.UniqueSubdir (uniqueSubdir) diff --git a/utils/haddock b/utils/haddock -Subproject 5ec817a3e41b7eaa50c74701ab2d7642df86464 +Subproject 20bf93490b37c0410d85a0ad4d38f9ddc225358 |