Update GHC and Clash

src/FSM/DescGenADT.hs

@@ -99,12 +99,12 @@ compileFSM fsm = do
         (tps, tp) <- compilePat $ fsmStateParams s 
         return (tps, TH.NormalC (conName cn n) [(b, tp)])
     let stateCons = map snd stateData
-    let tvars = map TH.PlainTV $ fst =<< stateData
+    let tvars = map (flip TH.PlainTV ()) $ fst =<< stateData
     funcClauses <- forM (M.assocs $ fsmStates fsm) $ \(n, s) -> do
         TH.clause [TH.conP (conName cn n) [pure $ fsmStateParams s], pure $ wildUnused (freeVars $ fsmStateTrans s) $ maybe (TH.TupP []) id $ fsmInputs fsm] (TH.normalB $ compileDT cn $ fsmStateTrans s) []
     contDecls <- forM (M.assocs $ fsmConts fsm) $ \(n, cs) -> do
         contCons <- forM (M.assocs cs) $ \(n', ns) -> return $ TH.NormalC n' [(b, tupT $ map TH.VarT ns)]
-        let contTvars = map TH.PlainTV $ nub $ concat (M.elems cs)
+        let contTvars = map (flip TH.PlainTV ()) $ nub $ concat (M.elems cs)
         return $ TH.DataD [] n contTvars Nothing contCons [derivclause]
     return $ TH.DataD [] stateName tvars Nothing stateCons [derivclause] :
                 TH.SigD (fsmName fsm) (fsmType fsm) :

src/FSM/FreeVars.hs

@@ -116,8 +116,8 @@ instance FreeVars TH.Exp where
     freeVars (TH.MultiIfE ges) = mconcat $ map freeVarsGuardedExp ges
     freeVars (TH.LetE ds e) = freeVars e `freeVarsUnderPat` ds
     freeVars (TH.CaseE e ms) = freeVars e <> freeVars ms
-    freeVars (TH.DoE ss) = freeVarsStmts ss
-    freeVars (TH.MDoE ss) = freeVarsStmts ss
+    freeVars (TH.DoE _ ss) = freeVarsStmts ss
+    freeVars (TH.MDoE _ ss) = freeVarsStmts ss
     freeVars (TH.CompE ss) = freeVarsStmts ss
     freeVars (TH.ArithSeqE r) = freeVars r
     freeVars (TH.ListE es) = freeVars es
@@ -247,8 +247,8 @@ instance Subst TH.Exp where
     subst s   (TH.MultiIfE ges) = TH.MultiIfE $ map (\(g, e) -> (subst s g, subst (cutSubstPat g s) e)) ges
     subst s   (TH.LetE ds e) = TH.LetE (subst s ds) (subst (cutSubstPat ds s) e)
     subst s   (TH.CaseE e ms) = TH.CaseE (subst s e) (subst s ms) 
-    subst s   (TH.DoE ss) = TH.DoE $ substStmts s ss
-    subst s   (TH.MDoE ss) = TH.MDoE $ substStmts s ss
+    subst s   (TH.DoE mm ss) = TH.DoE mm $ substStmts s ss
+    subst s   (TH.MDoE mm ss) = TH.MDoE mm $ substStmts s ss
     subst s   (TH.CompE ss) = TH.CompE $ substStmts s ss
     subst s   (TH.ArithSeqE r) = TH.ArithSeqE $ subst s r
     subst s   (TH.ListE es) = TH.ListE $ map (subst s) es
@@ -426,8 +426,8 @@ isConstructorExpr (TH.CondE _ _ _) = False
 isConstructorExpr (TH.MultiIfE _) = False
 isConstructorExpr (TH.LetE _ _) = False
 isConstructorExpr (TH.CaseE _ _) = False
-isConstructorExpr (TH.DoE _) = False
-isConstructorExpr (TH.MDoE _) = False
+isConstructorExpr (TH.DoE _ _) = False
+isConstructorExpr (TH.MDoE _ _) = False
 isConstructorExpr (TH.CompE _) = False
 isConstructorExpr (TH.ArithSeqE r) = isConstantRange r
 isConstructorExpr (TH.ListE es) = all isConstantExpr es

src/FSM/Process/CleanUnusedConstructors.hs

@@ -36,8 +36,8 @@ instance FreeConstructors TH.Exp where
     freeConstructorsPat (TH.MultiIfE ges) = mconcat $ map freeConstructorsPat ges
     freeConstructorsPat (TH.LetE ds e) = freeConstructorsPat e <> freeConstructorsPat ds
     freeConstructorsPat (TH.CaseE e ms) = freeConstructorsPat e <> freeConstructorsPat ms
-    freeConstructorsPat (TH.DoE ss) = freeConstructorsPat ss
-    freeConstructorsPat (TH.MDoE ss) = freeConstructorsPat ss
+    freeConstructorsPat (TH.DoE _ ss) = freeConstructorsPat ss
+    freeConstructorsPat (TH.MDoE _ ss) = freeConstructorsPat ss
     freeConstructorsPat (TH.CompE ss) = freeConstructorsPat ss
     freeConstructorsPat (TH.ArithSeqE r) = freeConstructorsPat r
     freeConstructorsPat (TH.ListE es) = freeConstructorsPat es

src/FSM/Process/CleanUnusedConts.hs

@@ -47,8 +47,8 @@ instance CleanConts TH.Exp where
     cleanConts ns (TH.MultiIfE ges) = TH.MultiIfE (cleanConts ns ges)
     cleanConts ns (TH.LetE ds e) = TH.LetE (cleanConts ns ds) (cleanConts ns e)
     cleanConts ns (TH.CaseE e ms) = TH.CaseE (cleanConts ns e) (cleanConts ns ms)
-    cleanConts ns (TH.DoE ss) = TH.DoE (cleanConts ns ss)
-    cleanConts ns (TH.MDoE ss) = TH.MDoE (cleanConts ns ss)
+    cleanConts ns (TH.DoE mm ss) = TH.DoE mm (cleanConts ns ss)
+    cleanConts ns (TH.MDoE mm ss) = TH.MDoE mm (cleanConts ns ss)
     cleanConts ns (TH.CompE ss) = TH.CompE (cleanConts ns ss)
     cleanConts ns (TH.ArithSeqE r) = TH.ArithSeqE (cleanConts ns r)
     cleanConts ns (TH.ListE es) = TH.ListE (cleanConts ns es)

stack.yaml

@@ -1 +1 @@
-resolver: lts-18.17
+resolver: lts-19.25

yieldfsm.cabal

@@ -1,6 +1,6 @@
 cabal-version:       2.4
 name:                yieldfsm
-version:             0.1
+version:             0.2.0
 license:             BSD-2-Clause
 author:              Marek Materzok <[email protected]>
 maintainer:          Marek Materzok <[email protected]>
@@ -65,21 +65,21 @@ common common-options
     -- a no-specialize pragma to every function with a blackbox.
     -fno-worker-wrapper
   build-depends:
-    base >= 4.14 && < 4.15,
+    base >= 4.15 && < 4.16,
     Cabal,
     template-haskell,
     containers >= 0.6 && < 0.7,
-    megaparsec >= 9.0.0 && < 9.1,
+    megaparsec >= 9.2.2 && < 9.3,
     unordered-containers >= 0.2 && < 0.3,
     haskell-src-meta >= 0.8 && < 0.9,
     haskell-src-exts >= 1.23 && < 1.24,
     pretty >= 1.1 && < 1.2,
     mtl >= 2.2 && < 2.3,
-    lens >= 4.19 && < 4.20,
+    lens >= 5.0.1 && < 5.1,
     keys >= 3.12 && < 3.13,
 
     -- clash-prelude will set suitable version bounds for the plugins
-    clash-prelude >= 1.2.5 && < 1.6,
+    clash-prelude >= 1.6.4 && < 1.7,
     ghc-typelits-natnormalise,
     ghc-typelits-extra,
     ghc-typelits-knownnat