Rodrigo Mesquita pushed to branch wip/spj-reinstallable-base2 at Glasgow Haskell Compiler / GHC

Commits:

5 changed files:

Changes:

  • compiler/GHC/Tc/Utils/Env.hs
    ... ... @@ -83,6 +83,7 @@ import GHC.Driver.DynFlags
    83 83 
     import GHC.Builtin( isUnboundName )
    84 84 
     import GHC.Builtin.KnownKeys
    85 85 
     import GHC.Builtin.WiredIn.Types
    86 
    +import GHC.Builtin.Modules ( eSSENTIALS_NAME )
    86 87
    87 88 
     import GHC.Runtime.Context
    88 89
    ... ... @@ -115,6 +116,7 @@ import GHC.Unit.Home
    115 116 
     import GHC.Unit.Home.Graph
    116 117 
     import GHC.Unit.Home.ModInfo
    117 118 
     import GHC.Unit.External
    119 
    +import GHC.Unit.Finder
    118 120
    119 121 
     import GHC.Utils.Outputable
    120 122 
     import GHC.Utils.Panic
    ... ... @@ -137,6 +139,7 @@ import GHC.Types.Id
    137 139 
     import GHC.Types.Id.Info ( RecSelParent(..) )
    138 140 
     import GHC.Types.Name.Reader
    139 141 
     import GHC.Types.TyThing
    142 
    +import GHC.Types.PkgQual
    140 143 
     import GHC.Types.Unique.Set ( nonDetEltsUniqSet )
    141 144 
     import qualified GHC.LanguageExtensions as LangExt
    142 145
    ... ... @@ -1129,9 +1132,9 @@ tcGetDefaultTys
    1129 1132 
             ; user_defaults <- getDeclaredDefaultTys -- User-supplied defaults
    1130 1133 
             ; this_module <- tcg_mod <$> getGblEnv
    1131 1134 
             ; let this_unit = moduleUnit this_module
    1132 
    -        ; essentials_mod <- liftIO $ lookupKnownKeysModule hsc_env dflags
    1133 
    -        ; case essentials_mod of
    1134 
    -            Nothing ->
    1135 
    +        ; found_essentials <- liftIO $ findImportedModule hsc_env eSSENTIALS_NAME NoPkgQual
    1136 
    +        ; case found_essentials of
    1137 
    +            NotFound{} ->
    1135 1138 
                   -- If GHC.Essentials isn't available at all (e.g. -hide-all-packages),
    1136 1139 
                   -- don't add the built-in defaulting, bc e.g. Num is a known-entity.
    1137 1140 
                   return (user_defaults, extended_defaults)

  • testsuite/tests/cabal/T27013d/Composition.hs
    1 
    +-- | This module is for convenience and demonstrative purposes
    2 
    +-- more than it is for providing actual value.
    3 
    +-- I do not recommend that you rely on this module
    4 
    +-- for performance-sensitive code.
    5 
    +-- Because this module is not based on Prelude's (.),
    6 
    +-- some chances at optimization might be missed by your compiler.
    7 
    +module Data.Composition (
    8 
    +  -- * Math
    9 
    +    (∘)
    10 
    +
    11 
    +  -- * Colons and dots
    12 
    +  , (.:)
    13 
    +  , (.:.)
    14 
    +  , (.::)
    15 
    +  , (.::.)
    16 
    +  , (.:::)
    17 
    +  , (.:::.)
    18 
    +  , (.::::)
    19 
    +  , (.::::.)
    20 
    +
    21 
    +  -- * Asterisks
    22 
    +  , (.*)
    23 
    +  , (.**)
    24 
    +  , (.***)
    25 
    +  , (.****)
    26 
    +  , (.*****)
    27 
    +  , (.******)
    28 
    +  , (.*******)
    29 
    +  , (.********)
    30 
    +
    31 
    +  -- * composeN
    32 
    +  , compose1
    33 
    +  , compose2
    34 
    +  , compose3
    35 
    +  , compose4
    36 
    +  , compose5
    37 
    +  , compose6
    38 
    +  , compose7
    39 
    +  , compose8
    40 
    +  , compose9
    41 
    +
    42 
    +  ) where
    43 
    +
    44 
    +-- Not exported. This is defined here to remove the dependency on base
    45 
    +(.) :: (b -> c) -> (a -> b) -> a -> c
    46 
    +(f . g) x = f (g x)
    47 
    +
    48 
    +infixr 9 .
    49 
    +
    50 
    +-- | The mathematical symbol for function composition.
    51 
    +(∘) :: (b -> c) -> (a -> b) -> a -> c
    52 
    +(∘) = (.)
    53 
    +
    54 
    +infixr 9 ∘
    55 
    +
    56 
    +-- | Compose two functions. @f .: g@ is similar to @f . g@
    57 
    +-- except that @g@ will be fed /two/ arguments instead of one
    58 
    +-- before handing its result to @f@.
    59 
    +--
    60 
    +-- This function is defined as
    61 
    +--
    62 
    +-- > (f .: g) x y = f (g x y)
    63 
    +--
    64 
    +-- Example usage:
    65 
    +--
    66 
    +-- > concatMap :: (a -> [b]) -> [a] -> [b]
    67 
    +-- > concatMap = concat .: map
    68 
    +--
    69 
    +-- Notice how /two/ arguments
    70 
    +-- (the function /and/ the list)
    71 
    +-- will be given to @map@ before the result
    72 
    +-- is passed to @concat@. This is equivalent to:
    73 
    +--
    74 
    +-- > concatMap f xs = concat (map f xs)
    75 
    +(.:) :: (c -> d) -> (a -> b -> c) -> a -> b -> d
    76 
    +(f .: g) x y = f (g x y)
    77 
    +
    78 
    +infixr 8 .:
    79 
    +
    80 
    +-- | Equivalent to '.:'
    81 
    +--
    82 
    +-- The pattern of appending asterisks is
    83 
    +-- straightforward to extend to similar functions:
    84 
    +-- (compose2 = .*, compose3 = .**, etc).
    85 
    +-- However, @.:@ has been commonly adopted amongst Haskellers,
    86 
    +-- and the need for compose3 and beyond is rare in practice.
    87 
    +(.*) :: (c -> d) -> (a -> b -> c) -> a -> b -> d
    88 
    +(.*) = (.) . (.)
    89 
    +
    90 
    +infixr 8 .*
    91 
    +
    92 
    +(.**) :: (d -> e) -> (a -> b -> c -> d) -> a -> b -> c -> e
    93 
    +(.**) = (.) . (.*)
    94 
    +
    95 
    +(.***) = (.) . (.**)
    96 
    +(.****) = (.) . (.***)
    97 
    +(.*****) = (.) . (.****)
    98 
    +(.******) = (.) . (.*****)
    99 
    +(.*******) = (.) . (.******)
    100 
    +(.********) = (.) . (.*******)
    101 
    +
    102 
    +infixr 8 .**
    103 
    +infixr 8 .***
    104 
    +infixr 8 .****
    105 
    +infixr 8 .*****
    106 
    +infixr 8 .******
    107 
    +infixr 8 .*******
    108 
    +infixr 8 .********
    109 
    +
    110 
    +
    111 
    +-- | @composeN f g@ means give @g@ @N@ inputs
    112 
    +-- and then pass its result to @f@.
    113 
    +compose1 :: (b -> c) -> (a -> b) -> a -> c
    114 
    +compose1 = (.)
    115 
    +
    116 
    +compose2 :: (c -> d) -> (a -> b -> c) -> a -> b -> d
    117 
    +compose2 = (.*)
    118 
    +
    119 
    +compose3 :: (d -> e) -> (a -> b -> c -> d) -> a -> b -> c -> e
    120 
    +compose3 = (.**)
    121 
    +
    122 
    +compose4 = (.***)
    123 
    +compose5 = (.****)
    124 
    +compose6 = (.*****)
    125 
    +compose7 = (.******)
    126 
    +compose8 = (.*******)
    127 
    +compose9 = (.********)
    128 
    +
    129 
    +-- | One compact pattern for composition operators is to
    130 
    +-- "count the dots after the first one",
    131 
    +-- which begins with the common '.:', and proceeds by first
    132 
    +-- appending another @.@ and then replacing it with @:@
    133 
    +(.:.) :: (d -> e) -> (a -> b -> c -> d) -> a -> b -> c -> e
    134 
    +(.:.) = (.**)
    135 
    +
    136 
    +(.::) = (.***)
    137 
    +(.::.) = (.****)
    138 
    +(.:::) = (.*****)
    139 
    +(.:::.) = (.******)
    140 
    +(.::::) = (.*******)
    141 
    +(.::::.) = (.********)
    142 
    +
    143 
    +infixr 8 .:.
    144 
    +infixr 8 .::
    145 
    +infixr 8 .::.
    146 
    +infixr 8 .:::
    147 
    +infixr 8 .:::.
    148 
    +infixr 8 .::::
    149 
    +infixr 8 .::::.
    150 
    +

  • testsuite/tests/cabal/T27013d/Makefile
    1 
    +TOP=../../..
    2 
    +include $(TOP)/mk/boilerplate.mk
    3 
    +include $(TOP)/mk/test.mk
    4 
    +
    5 
    +# Test that compiling Data.Composition without implicit Prelude does not
    6 
    +# recompile the second or third time. The `composition` package's
    7 
    +# Data.Composition uses NoImplicitPrelude and depends on neither base nor
    8 
    +# ghc-internal. In !15899, it was recompiled because of an incorrect
    9 
    +# "GHC.Essentials package changed".
    10 
    +clean:
    11 
    +	rm -f *.o *.hi
    12 
    +
    13 
    +T27013d: clean
    14 
    +	'$(TEST_HC)' $(TEST_HC_OPTS) Composition.hs -XNoImplicitPrelude -hide-all-packages
    15 
    +	'$(TEST_HC)' $(TEST_HC_OPTS) Composition.hs -XNoImplicitPrelude -hide-all-packages
    16 
    +	'$(TEST_HC)' $(TEST_HC_OPTS) Composition.hs -XNoImplicitPrelude -hide-all-packages

  • testsuite/tests/cabal/T27013d/T27013d.stdout
    1 
    +[1 of 1] Compiling Data.Composition ( Composition.hs, Composition.o )

  • testsuite/tests/cabal/T27013d/all.T
    1 
    +test('T27013d', [extra_files(['Composition.hs'])],
    2 
    +     makefile_test, [])

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help