ghc-lib-parser 9.0.1.20210207 → 9.0.1.20210324
raw patch · 4 files changed
+13/−35 lines, 4 files
Files
- compiler/GHC/Builtin/Types/Prim.hs +2/−2
- compiler/GHC/Parser/PostProcess/Haddock.hs +9/−9
- ghc-lib-parser.cabal +2/−3
- ghc-lib/stage0/lib/ghcversion.h +0/−21
compiler/GHC/Builtin/Types/Prim.hs view
@@ -247,7 +247,7 @@ stableNamePrimTyConName = mkPrimTc (fsLit "StableName#") stableNamePrimTyConKey stableNamePrimTyCon compactPrimTyConName = mkPrimTc (fsLit "Compact#") compactPrimTyConKey compactPrimTyCon -#if __GLASGOW_HASKELL >= 900+#if MIN_VERSION_ghc_prim(0, 7, 0) bcoPrimTyConName = mkPrimTc (fsLit "BCO") bcoPrimTyConKey bcoPrimTyCon #else bcoPrimTyConName = mkPrimTc (fsLit "BCO#") bcoPrimTyConKey bcoPrimTyCon@@ -1112,7 +1112,7 @@ bcoPrimTy = mkTyConTy bcoPrimTyCon bcoPrimTyCon :: TyCon -#if __GLASGOW_HASKELL >= 900+#if MIN_VERSION_ghc_prim(0, 7, 0) bcoPrimTyCon = pcPrimTyCon0 bcoPrimTyConName LiftedRep #else bcoPrimTyCon = pcPrimTyCon0 bcoPrimTyConName UnliftedRep
compiler/GHC/Parser/PostProcess/Haddock.hs view
@@ -232,10 +232,10 @@ -- -- | Module header comment -- module M (--- -- * Export list comment+-- -- - Export list comment -- Item1, -- Item2,--- -- * Export list comment+-- -- - Export list comment -- item3, -- item4 -- ) where@@ -260,10 +260,10 @@ -- Step 2, process documentation comments in the export list: -- -- module M (- -- -- * Export list comment+ -- -- - Export list comment -- Item1, -- Item2,- -- -- * Export list comment+ -- -- - Export list comment -- item3, -- item4 -- ) where@@ -987,9 +987,9 @@ -- -- Here, the following holds: ----- * the 'left_neighbour' will only see Haddock comments until 'bufSpanStart' of 'inner_span'--- * the 'right_neighbour' will only see Haddock comments after 'bufSpanEnd' of 'inner_span'--- * the 'inner_m' will only see Haddock comments between its 'left_neighbour' and its 'right_neighbour'+-- - the 'left_neighbour' will only see Haddock comments until 'bufSpanStart' of 'inner_span'+-- - the 'right_neighbour' will only see Haddock comments after 'bufSpanEnd' of 'inner_span'+-- - the 'inner_m' will only see Haddock comments between its 'left_neighbour' and its 'right_neighbour' -- -- In other words, every computation: --@@ -1466,8 +1466,8 @@ flattenBindsAndSigs (all_bs, all_ss, all_ts, all_tfis, all_dfis, all_docs) = -- 'cmpBufSpan' is safe here with the following assumptions: --- -- * 'LHsDecl' produced by 'decl_cls' in Parser.y always have a 'BufSpan'- -- * 'partitionBindsAndSigs' does not discard this 'BufSpan'+ -- - 'LHsDecl' produced by 'decl_cls' in Parser.y always have a 'BufSpan'+ -- - 'partitionBindsAndSigs' does not discard this 'BufSpan' mergeListsBy cmpBufSpan [ mapLL (\b -> ValD noExtField b) (bagToList all_bs), mapLL (\s -> SigD noExtField s) all_ss,
ghc-lib-parser.cabal view
@@ -1,7 +1,7 @@ cabal-version: >=1.22 build-type: Simple name: ghc-lib-parser-version: 9.0.1.20210207+version: 9.0.1.20210324 license: BSD3 license-file: LICENSE category: Development@@ -20,7 +20,6 @@ extra-source-files: ghc-lib/stage0/lib/ghcautoconf.h ghc-lib/stage0/lib/ghcplatform.h- ghc-lib/stage0/lib/ghcversion.h ghc-lib/stage0/lib/DerivedConstants.h ghc-lib/stage0/lib/GHCConstantsHaskellExports.hs ghc-lib/stage0/lib/GHCConstantsHaskellWrappers.hs@@ -72,7 +71,7 @@ build-depends: Win32 build-depends: ghc-prim > 0.2 && < 0.8,- base >= 4.12 && < 4.16,+ base >= 4.13 && < 4.16, containers >= 0.5 && < 0.7, bytestring >= 0.9 && < 0.11, binary == 0.8.*,
− ghc-lib/stage0/lib/ghcversion.h
@@ -1,21 +0,0 @@-#if !defined(__GHCVERSION_H__)-#define __GHCVERSION_H__--#if !defined(__GLASGOW_HASKELL__)-#define __GLASGOW_HASKELL__ 900-#endif-#if !defined(__GLASGOW_HASKELL_FULL_VERSION__)-#define __GLASGOW_HASKELL_FULL_VERSION__ "9.0.1"-#endif--#define __GLASGOW_HASKELL_PATCHLEVEL1__ 1--#define MIN_VERSION_GLASGOW_HASKELL(ma,mi,pl1,pl2) (\- ((ma)*100+(mi)) < __GLASGOW_HASKELL__ || \- ((ma)*100+(mi)) == __GLASGOW_HASKELL__ \- && (pl1) < __GLASGOW_HASKELL_PATCHLEVEL1__ || \- ((ma)*100+(mi)) == __GLASGOW_HASKELL__ \- && (pl1) == __GLASGOW_HASKELL_PATCHLEVEL1__ \- && (pl2) <= __GLASGOW_HASKELL_PATCHLEVEL2__ )--#endif /* __GHCVERSION_H__ */