Skip to content

Commit

Permalink
update to LTS 20.6 == ghc 9.2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
davdar committed Jan 12, 2023
1 parent 9270646 commit a0ac0d7
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/UVMHS/Core/LensDeriving.hs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ makePrismLogic cx ty tyargs con fieldtys numcons = do
(TH.LamE [tup $ map TH.VarP tmpˣˢ] $ TH.ConE con ⊙⋆ map TH.VarE tmpˣˢ)
(TH.LamE [TH.VarP tmpˣ] $
TH.CaseE (TH.VarE tmpˣ) $ concat
[ single $ thSingleMatch (TH.ConP con $ tohs (map TH.VarP tmpˣˢ)) $
[ single $ thSingleMatch (TH.ConP con [] $ tohs (map TH.VarP tmpˣˢ)) $
TH.ConE 'Some tup (map TH.VarE tmpˣˢ)
, case numcons 1 of
-- avoids generating code that has a dead branch
Expand Down
4 changes: 2 additions & 2 deletions src/UVMHS/Core/TH.hs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ instance Tup TH.Exp where

instance Tup TH.Pat where
tup ps = case list ps of
Nil TH.ConP '() []
p :& ps' foldOnFrom ps' p $ \ p' pᵢ TH.ConP '(:*) [pᵢ,p']
Nil TH.ConP '() [] []
p :& ps' foldOnFrom ps' p $ \ p' pᵢ TH.ConP '(:*) [] [pᵢ,p']

instance Tup TH.Type where
tup ts = case list ts of
Expand Down
4 changes: 2 additions & 2 deletions src/UVMHS/Lib/Pretty/Deriving.hs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ makePrettySumLogic cx ty tyargs concontys = do
let conString = thString $ string $ TH.nameBase con
prettyCon = TH.VarE 'ppCon conString
prettyXs = mapOn tmpˣˢ $ \ x TH.VarE 'pretty TH.VarE x
in thSingleClause (single $ TH.ConP con $ tohs $ map TH.VarP tmpˣˢ) $ TH.VarE 'ppApp prettyCon ⊙$ TH.VarE 'list ⊙$ TH.ListE (tohs prettyXs)
in thSingleClause (single $ TH.ConP con [] $ tohs $ map TH.VarP tmpˣˢ) $ TH.VarE 'ppApp prettyCon ⊙$ TH.VarE 'list ⊙$ TH.ListE (tohs prettyXs)
return $ single $ TH.InstanceD (tohs None) (tohs instanceCx) instanceTy $ single instanceDec

makePrettySum TH.Name TH.Q [TH.Dec]
Expand Down Expand Up @@ -66,7 +66,7 @@ makePrettyUnionLogic cx ty tyargs concontys = do
instanceTy = TH.ConT ''Pretty (TH.ConT ty ⊙⋆ tyargVars)
instanceDec TH.Dec
instanceDec = TH.FunD 'pretty $ tohs $ mapOn conxs $ \ (con :* tmpˣˢ)
thSingleClause (single $ TH.ConP con $ tohs $ map TH.VarP tmpˣˢ) $ case tmpˣˢ of
thSingleClause (single $ TH.ConP con [] $ tohs $ map TH.VarP tmpˣˢ) $ case tmpˣˢ of
Nil TH.VarE 'pretty TH.ConE '()
x :& Nil TH.VarE 'pretty TH.VarE x
_
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
packages: ["."]
resolver: lts-19.17
resolver: lts-20.6
8 changes: 4 additions & 4 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
packages: []
snapshots:
- completed:
size: 619161
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/17.yaml
sha256: 7f47507fd037228a8d23cf830f5844e1f006221acebdd7cb49f2f5fb561e0546
original: lts-19.17
sha256: 4905c93319aa94aa53da8f41d614d7bacdbfe6c63a8c6132d32e6e62f24a9af4
size: 649315
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/6.yaml
original: lts-20.6

0 comments on commit a0ac0d7

Please sign in to comment.