Skip to content

GHC 9.12 support #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rowanG077 merged 2 commits into from
Apr 21, 2026
Merged

GHC 9.12 support #33

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89ce23b
GHC 9.12 support
rowanG077 Apr 10, 2026
73f566c
Remove support for < GHC 9.6
rowanG077 Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@ jobs:
- "9.0.2"
- "9.2.8"
- "9.4.8"
- "9.6.4"
- "9.8.2"
- "9.10.1"
- "9.6.7"
- "9.8.4"
- "9.10.3"
- "9.12.4"

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion circuit-notation.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ library
, clash-prelude >= 1.0
, containers
, data-default
, ghc (>=8.6 && <8.8) || (>=8.10 && < 9.12)
, ghc (>=8.6 && <8.8) || (>=8.10 && < 9.13)
, lens
, mtl
, parsec
Expand Down
60 changes: 30 additions & 30 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

78 changes: 62 additions & 16 deletions src/CircuitNotation.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@
import qualified GHC.Parser.Annotation as GHC
#endif

#if __GLASGOW_HASKELL__ >= 910
import GHC.Hs (EpAnn)
#endif

#if __GLASGOW_HASKELL__ >= 900
import GHC.Data.Bag
import GHC.Data.FastString (mkFastString, unpackFS)
Expand Down Expand Up @@ -107,7 +103,11 @@
import qualified GHC.Driver.Config.Diagnostic as GHC
import qualified GHC.Driver.Errors.Types as GHC
import qualified GHC.Utils.Logger as GHC
#if __GLASGOW_HASKELL__ < 910
import qualified GHC.Parser.PostProcess as GHC
#else
import GHC.Parser.PostProcess () -- instances
#endif
#endif

#if __GLASGOW_HASKELL__ > 808
Expand Down Expand Up @@ -245,9 +245,6 @@
#if __GLASGOW_HASKELL__ >= 910
noExt :: NoAnn a => a
noExt = noAnn

instance NoAnn NoExtField where
noAnn = noExtField
#elif __GLASGOW_HASKELL__ > 900
noExt :: EpAnn ann
noExt = EpAnnNotUsed
Expand Down Expand Up @@ -532,7 +529,13 @@
appTy a b = noLoc (HsAppTy noExtField a (parenthesizeHsType GHC.appPrec b))

appE :: LHsExpr GhcPs -> LHsExpr GhcPs -> LHsExpr GhcPs
appE fun arg = L noSrcSpanA $ HsApp noExt fun (parenthesizeHsExpr GHC.appPrec arg)
appE fun arg = L noSrcSpanA $ HsApp
#if __GLASGOW_HASKELL__ >= 910
noExtField
#else
noAnn

Check failure on line 536 in src/CircuitNotation.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 8.10.7 

Variable not in scope: noAnn :: NoExtField

Check failure on line 536 in src/CircuitNotation.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 8.6.5 

Variable not in scope: noAnn :: NoExt

Check failure on line 536 in src/CircuitNotation.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest / ghc 9.0.2 

Variable not in scope: noAnn :: NoExtField
#endif
fun (parenthesizeHsExpr GHC.appPrec arg)

varE :: SrcSpanAnnA -> GHC.RdrName -> LHsExpr GhcPs
varE loc rdr = L loc (HsVar noExtField (noLoc rdr))
Expand Down Expand Up @@ -566,15 +569,27 @@
[] -> go srcLoc []
as -> parenE $ go srcLoc as
where
go loc (e@(L l _):es) = L loc $ OpApp noExt e (varE l (thName '(:>))) (go loc es)
go loc (e@(L l _):es) = L loc $ OpApp
#if __GLASGOW_HASKELL__ >= 912
noExtField
#else
noExt
#endif
e (varE l (thName '(:>))) (go loc es)
go loc [] = varE loc (thName 'Nil)

tupE :: p ~ GhcPs => SrcSpanAnnA -> [LHsExpr p] -> LHsExpr p
tupE _ [ele] = ele
tupE loc elems = L loc $ ExplicitTuple noExt tupArgs GHC.Boxed
where
#if __GLASGOW_HASKELL__ >= 902
tupArgs = map (Present noExt) elems
tupArgs = map
#if __GLASGOW_HASKELL__ >= 910
(Present noExtField)
#else
(Present noAnn)
#endif
elems
#else
tupArgs = map (\arg@(L l _) -> L l (Present noExt arg)) elems
#endif
Expand Down Expand Up @@ -612,7 +627,11 @@
#else
HsLam _ _ (MG _x alts) <- Just expr
#endif
#if __GLASGOW_HASKELL__ >= 912
L _ [L _ (Match _matchX _matchContext (L _ matchPats) matchGr)] <- Just alts
#else
L _ [L _ (Match _matchX _matchContext matchPats matchGr)] <- Just alts
#endif
GRHSs _grX grHss _grLocalBinds <- Just matchGr
[L _ (GRHS _ _ body)] <- Just grHss
Just (matchPats, body)
Expand Down Expand Up @@ -660,7 +679,11 @@
valBinds = ValBinds noAnnSortKey hsBinds sigs

hsBinds :: LHsBindsLR GhcPs GhcPs
#if __GLASGOW_HASKELL__ >= 912
hsBinds = binds
#else
hsBinds = listToBag binds
#endif

-- | Simple construction of a lambda expression
lamE :: [LPat GhcPs] -> LHsExpr GhcPs -> LHsExpr GhcPs
Expand All @@ -682,11 +705,18 @@
mg = MG (GHC.Generated GHC.OtherExpansion GHC.DoPmc) matches
#endif

#if __GLASGOW_HASKELL__ >= 912
matches :: XRec GhcPs [LMatch GhcPs (GenLocated SrcSpanAnnA (HsExpr GhcPs))]
matches = noLoc [singleMatch]
#else
matches :: GenLocated SrcSpanAnnL [GenLocated SrcSpanAnnA (Match GhcPs (GenLocated SrcSpanAnnA (HsExpr GhcPs)))]
matches = noLoc $ [singleMatch]
#endif

singleMatch :: GenLocated SrcSpanAnnA (Match GhcPs (GenLocated SrcSpanAnnA (HsExpr GhcPs)))
#if __GLASGOW_HASKELL__ >= 910
#if __GLASGOW_HASKELL__ >= 912
singleMatch = noLoc $ Match noExtField (LamAlt LamSingle) (L (EpaSpan noSrcSpan) pats) grHss
#elif __GLASGOW_HASKELL__ >= 910
singleMatch = noLoc $ Match noExt (LamAlt LamSingle) pats grHss
#else
singleMatch = noLoc $ Match noExt LambdaExpr pats grHss
Expand Down Expand Up @@ -790,7 +820,11 @@
-- a regular let bindings
case letBind of
HsValBinds _ (ValBinds _ valBinds sigs) -> do
#if __GLASGOW_HASKELL__ >= 912
circuitLets <>= valBinds
#else
circuitLets <>= bagToList valBinds
#endif
circuitTypes <>= sigs
_ -> errM (locA loc) ("Unhandled let statement" <> show (Data.toConstr letBind))
BodyStmt _xbody body _idr _idr' ->
Expand Down Expand Up @@ -1035,7 +1069,13 @@
-> PortDescription PortName
-- ^ master ports
-> LHsExpr p
createInputs dir slaves masters = noLoc $ OpApp noExt s2m (varE noSrcSpanA (fwdBwdCon ?nms)) m2s
createInputs dir slaves masters = noLoc $ OpApp
#if __GLASGOW_HASKELL__ >= 912
noExtField
#else
noExt
#endif
s2m (varE noSrcSpanA (fwdBwdCon ?nms)) m2s
where
m2s = expWithSuffix (revDirec dir) masters
s2m = expWithSuffix dir slaves
Expand All @@ -1048,13 +1088,13 @@
in patBind bindPat bod

patBind :: LPat GhcPs -> LHsExpr GhcPs -> HsBind GhcPs
patBind lhs expr =
patBind lhs expr =
#if __GLASGOW_HASKELL__ < 906
PatBind noExt lhs rhs ([], [])
#elif __GLASGOW_HASKELL__ < 910
PatBind noExt lhs rhs
#else
PatBind noExt lhs (HsNoMultAnn noExt) rhs
PatBind noExtField lhs (HsNoMultAnn noExtField) rhs
#endif
where
rhs :: GRHSs GhcPs (GenLocated SrcSpanAnnA (HsExpr GhcPs))
Expand Down Expand Up @@ -1153,7 +1193,7 @@
hsFunTy :: (p ~ GhcPs) => LHsType p -> LHsType p -> HsType p
hsFunTy =
#if __GLASGOW_HASKELL__ >= 910
HsFunTy noExt (HsUnrestrictedArrow noExt)
HsFunTy noExtField (HsUnrestrictedArrow noAnn)
#elif __GLASGOW_HASKELL__ >= 904
HsFunTy noExt (HsUnrestrictedArrow $ L NoTokenLoc HsNormalTok)
#elif __GLASGOW_HASKELL__ >= 900
Expand Down Expand Up @@ -1189,7 +1229,13 @@
#if __GLASGOW_HASKELL__ < 904
noLoc $ HsOpTy noExtField a (noLoc eqTyCon_RDR) b
#else
noLoc $ HsOpTy noAnn NotPromoted a (noLoc eqTyCon_RDR) b
noLoc $ HsOpTy
#if __GLASGOW_HASKELL__ >= 912
noExtField
#else
noExt
#endif
NotPromoted a (noLoc eqTyCon_RDR) b
#endif
-- eqTyCon is a special name that has to be exactly correct for ghc to recognise it. In 8.6 this
-- lives in PrelNames and is called eqTyCon_RDR, in later ghcs it's from TysWiredIn.
Expand Down
Loading