Ben Gamari pushed to branch ghc-9.14 at Glasgow Haskell Compiler / GHC

Commits:

7 changed files:

Changes:

  • .gitmodules
    ... ... @@ -118,3 +118,9 @@
    118 118 
     [submodule "libraries/file-io"]
    119 119 
     	path = libraries/file-io
    120 120 
     	url = https://gitlab.haskell.org/ghc/packages/file-io.git
    121 
    +[submodule "libraries/template-haskell-lift"]
    122 
    +	path = libraries/template-haskell-lift
    123 
    +	url = https://gitlab.haskell.org/ghc/template-haskell-lift.git
    124 
    +[submodule "libraries/template-haskell-quasiquoter"]
    125 
    +	path = libraries/template-haskell-quasiquoter
    126 
    +	url = https://gitlab.haskell.org/ghc/template-haskell-quasiquoter.git

  • hadrian/src/Packages.hs
    ... ... @@ -9,7 +9,7 @@ module Packages (
    9 9 
         ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline,
    10 10 
         hsc2hs, hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy,
    11 11 
         libffi, mtl, osString, parsec, pretty, primitive, process, remoteIserv, rts,
    12 
    -    runGhc, semaphoreCompat, stm, templateHaskell, terminfo, text, time, timeout,
    12 
    +    runGhc, semaphoreCompat, stm, templateHaskell, thLift, thQuasiquoter, terminfo, text, time, timeout,
    13 13 
         transformers, unlit, unix, win32, xhtml,
    14 14 
         lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace,
    15 15 
         ghcPackages, isGhcPackage,
    ... ... @@ -39,7 +39,7 @@ ghcPackages =
    39 39 
         , ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghcInternal, ghci, ghciWrapper, ghcPkg, ghcPrim
    40 40 
         , ghcToolchain, ghcToolchainBin, haddockApi, haddockLibrary, haddock, haskeline, hsc2hs
    41 41 
         , hp2ps, hpc, hpcBin, integerGmp, iserv, libffi, mtl, osString
    42 
    -    , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell
    42 
    +    , parsec, pretty, process, rts, runGhc, stm, semaphoreCompat, templateHaskell, thLift, thQuasiquoter
    43 43 
         , terminfo, text, time, transformers, unlit, unix, win32, xhtml, fileio
    44 44 
         , timeout
    45 45 
         , lintersCommon
    ... ... @@ -56,7 +56,7 @@ array, base, binary, bytestring, cabalSyntax, cabal, checkPpr, checkExact, count
    56 56 
       ghcCompact, ghcConfig, ghcExperimental, ghcHeap, ghci, ghcInternal, ghciWrapper, ghcPkg, ghcPrim,
    57 57 
       ghcToolchain, ghcToolchainBin, haddockLibrary, haddockApi, haddock, haskeline, hsc2hs,
    58 58 
       hp2ps, hpc, hpcBin, integerGmp, iserv, iservProxy, remoteIserv, libffi, mtl,
    59 
    -  osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell,
    59 
    +  osString, parsec, pretty, primitive, process, rts, runGhc, semaphoreCompat, stm, templateHaskell, thLift, thQuasiquoter,
    60 60 
       terminfo, text, time, transformers, unlit, unix, win32, xhtml,
    61 61 
       timeout,
    62 62 
       lintersCommon, lintNotes, lintCodes, lintCommitMsg, lintSubmoduleRefs, lintWhitespace
    ... ... @@ -124,6 +124,8 @@ runGhc = util "runghc"
    124 124 
     semaphoreCompat     = lib  "semaphore-compat"
    125 125 
     stm                 = lib  "stm"
    126 126 
     templateHaskell     = lib  "template-haskell"
    127 
    +thLift              = lib  "template-haskell-lift"
    128 
    +thQuasiquoter       = lib  "template-haskell-quasiquoter"
    127 129 
     terminfo            = lib  "terminfo"
    128 130 
     text                = lib  "text"
    129 131 
     time                = lib  "time"

  • hadrian/src/Settings/Default.hs
    ... ... @@ -106,6 +106,8 @@ stage0Packages = do
    106 106 
                  , runGhc
    107 107 
                  , semaphoreCompat -- depends on
    108 108 
                  , time -- depends on win32
    109 
    +             , thLift -- new library not yet present for boot compilers
    110 
    +             , thQuasiquoter -- new library not yet present for boot compilers
    109 111 
                  , unlit
    110 112 
                  , if windowsHost then win32 else unix
    111 113 
                  -- We must use the in-tree `Win32` as the version

  • libraries/ghc-internal/src/GHC/Internal/TH/Lift.hs
    ... ... @@ -20,7 +20,7 @@
    20 20 
     -- | This module gives the definition of the 'Lift' class.
    21 21 
     --
    22 22 
     -- This is an internal module.
    23 
    --- Please import "Language.Haskell.TH" or "Language.Haskell.TH.Syntax" instead!
    23 
    +-- Please import "Language.Haskell.TH.Lift", "Language.Haskell.TH" or "Language.Haskell.TH.Syntax" instead!
    24 24
    25 25 
     module GHC.Internal.TH.Lift
    26 26 
       ( Lift(..)
    ... ... @@ -70,6 +70,9 @@ import GHC.Internal.ForeignPtr
    70 70 
     -- >   deriving Lift
    71 71 
     --
    72 72 
     -- Representation-polymorphic since /template-haskell-2.16.0.0/.
    73 
    +--
    74 
    +-- This is exposed both from the @template-haskell-lift@ and @template-haskell@ packages.
    75 
    +-- Consider importing it from the more stable @template-haskell-lift@ if you don't need the full breadth of the @template-haskell@ interface.
    73 76 
     class Lift (t :: TYPE r) where
    74 77 
       -- | Turn a value into a Template Haskell expression, suitable for use in
    75 78 
       -- a splice.

  • libraries/ghc-internal/src/GHC/Internal/TH/Quote.hs
    ... ... @@ -30,6 +30,9 @@ import GHC.Internal.Base hiding (Type)
    30 30 
     -- in defining a quasiquoter to be used for expressions, you would
    31 31 
     -- define a 'QuasiQuoter' with only 'quoteExp', and leave the other
    32 32 
     -- fields stubbed out with errors.
    33 
    +--
    34 
    +-- This is exposed both from the @template-haskell-quasiquoter@ and @template-haskell@ packages.
    35 
    +-- Consider importing it from the more stable @template-haskell-quasiquoter@ if you don't need the full breadth of the @template-haskell@ interface.
    33 36 
     data QuasiQuoter = QuasiQuoter {
    34 37 
         -- | Quasi-quoter for expressions, invoked by quotes like @lhs = $[q|...]@
    35 38 
         quoteExp  :: String -> Q Exp,

  • libraries/template-haskell-lift
    1 
    +Subproject commit 06c18dfc2d689baabf0e923e3fb9483ac89b8d01

  • libraries/template-haskell-quasiquoter
    1 
    +Subproject commit 65246071e82819aa27922c1172861ba346612230

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