ngws
/
mad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unneeded type constraints

This commit is contained in:
Niels G. W. Serup 2024-09-24 21:25:58 +02:00
parent f4bca41377
commit ad3bba2d1a
No known key found for this signature in database
GPG Key ID: 38EEEBCE67324F19
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
byg/src/DependencyGenerator.hs
View File

@ -26,7 +26,6 @@ import Types.Dependency (Action(..), Dependency, makeDependency)
import Control.Monad.State (MonadState, State, runState, put, get) import Control.Monad.State (MonadState, State, runState, put, get)
import Control.Monad.Writer (MonadWriter, WriterT, execWriterT, tell) import Control.Monad.Writer (MonadWriter, WriterT, execWriterT, tell)
import Language.Haskell.TH.Syntax (Lift)
newtype DepGenM' a = DepGenM { unDepGenM :: WriterT [Dependency] (State Int) a } newtype DepGenM' a = DepGenM { unDepGenM :: WriterT [Dependency] (State Int) a }
deriving (Functor, Applicative, Monad, MonadState Int, MonadWriter [Dependency]) deriving (Functor, Applicative, Monad, MonadState Int, MonadWriter [Dependency])
@ -42,7 +41,7 @@ evalDepGenM m = fst (evalDepGenM' 0 m)
tellDep :: Dependency -> DepGenM' () tellDep :: Dependency -> DepGenM' ()
tellDep dep = tell [dep] tellDep dep = tell [dep]
genDependencyM :: (Show a, Lift a) => (Token a -> DepGenM' Dependency) -> DepGenM a genDependencyM :: (Token a -> DepGenM' Dependency) -> DepGenM a
genDependencyM f = do genDependencyM f = do
top <- get top <- get
let top' = top + 1 let top' = top + 1
@ -52,27 +51,27 @@ genDependencyM f = do
tellDep result tellDep result
pure target pure target
genDependency :: (Show a, Lift a) => (Token a -> Dependency) -> DepGenM a genDependency :: (Token a -> Dependency) -> DepGenM a
genDependency f = genDependencyM (pure . f) genDependency f = genDependencyM (pure . f)
inject :: (Show a, Lift a, Valuable a) => a -> DepGenM a inject :: Valuable a => a -> DepGenM a
inject x = genDependency (makeDependency NoToken (Inject (toValue x))) inject x = genDependency (makeDependency NoToken (Inject (toValue x)))
getListElem :: (Show a, Lift a) => Token [a] -> DepGenM a getListElem :: Token [a] -> DepGenM a
getListElem outer = genDependency (makeDependency outer GetListElem) getListElem outer = genDependency (makeDependency outer GetListElem)
setListElem :: (Show a, Lift a) => Token a -> Token [a] -> DepGenM () setListElem :: Token a -> Token [a] -> DepGenM ()
setListElem a outer = do setListElem a outer = do
tellDep (makeDependency a SetListElem outer) tellDep (makeDependency a SetListElem outer)
pure NoToken pure NoToken
runFunction :: (Show a, Show b, Lift a, Lift b) => Function -> Token a -> DepGenM b runFunction :: Function -> Token a -> DepGenM b
runFunction f input = genDependency (makeDependency input (Function f)) runFunction f input = genDependency (makeDependency input (Function f))
runFunctionIO :: (Show a, Show b, Lift a, Lift b) => FunctionIO -> Token a -> DepGenM b runFunctionIO :: FunctionIO -> Token a -> DepGenM b
runFunctionIO f input = genDependency (makeDependency input (FunctionIO f)) runFunctionIO f input = genDependency (makeDependency input (FunctionIO f))
mapDepGenM :: (Show a, Show b, Lift a, Lift b) => (Token a -> DepGenM b) -> Token [a] -> DepGenM [b] mapDepGenM :: (Token a -> DepGenM b) -> Token [a] -> DepGenM [b]
mapDepGenM f input = genDependencyM $ \target -> do mapDepGenM f input = genDependencyM $ \target -> do
top <- get top <- get
let (res, top') = evalDepGenM' top $ do let (res, top') = evalDepGenM' top $ do
@ -82,12 +81,12 @@ mapDepGenM f input = genDependencyM $ \target -> do
put top' put top'
pure (makeDependency input (MapComp res) target) pure (makeDependency input (MapComp res) target)
mapDepGenM_ :: (Show a, Lift a) => (Token a -> DepGenM ()) -> Token [a] -> DepGenM () mapDepGenM_ :: (Token a -> DepGenM ()) -> Token [a] -> DepGenM ()
mapDepGenM_ f input = do mapDepGenM_ f input = do
_ <- mapDepGenM f input _ <- mapDepGenM f input
pure NoToken pure NoToken
filterDepGenM :: (Show a, Lift a) => (Token a -> DepGenM Bool) -> Token [a] -> DepGenM [a] filterDepGenM :: (Token a -> DepGenM Bool) -> Token [a] -> DepGenM [a]
filterDepGenM f input = do filterDepGenM f input = do
conds <- mapDepGenM f input conds <- mapDepGenM f input
genDependency (makeDependency (TupleToken input conds) FilterComp) genDependency (makeDependency (TupleToken input conds) FilterComp)

2
byg/src/Types/Dependency.hs
View File

@ -30,7 +30,7 @@ data UToken = UToken Int
data Dependency = Dependency UToken Action UToken data Dependency = Dependency UToken Action UToken
deriving (Show, Lift) deriving (Show, Lift)
makeDependency :: (Show a, Show b, Lift a, Lift b) => Token a -> Action -> Token b -> Dependency makeDependency :: Token a -> Action -> Token b -> Dependency
makeDependency a action b = Dependency (makeUToken a) action (makeUToken b) makeDependency a action b = Dependency (makeUToken a) action (makeUToken b)
makeUToken :: Token a -> UToken makeUToken :: Token a -> UToken