suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use forall to remove some repeated monad constraints.

Browse Source
This commit is contained in:
Adam Sampson 2008-04-06 11:19:43 +00:00
parent 8a914cd19a
commit 9838cf7b8c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/EvalConstants.hs
View File

@ -275,7 +275,7 @@ renderValue m _ (OccBool False) = return $ A.False m
renderValue m t v = renderLiteral m t v >>* A.Literal m t renderValue m t v = renderLiteral m t v >>* A.Literal m t
-- | Convert an 'OccValue' back into a 'LiteralRepr'. -- | Convert an 'OccValue' back into a 'LiteralRepr'.
renderLiteral :: (CSMR m, Die m) => Meta -> A.Type -> OccValue -> m A.LiteralRepr renderLiteral :: forall m. (CSMR m, Die m) => Meta -> A.Type -> OccValue -> m A.LiteralRepr
renderLiteral m t v renderLiteral m t v
= case v of = case v of
OccByte c -> OccByte c ->
@ -303,23 +303,23 @@ renderLiteral m t v
| otherwise = [c] | otherwise = [c]
where o = ord c where o = ord c
renderInt :: (Show s, CSMR m, Die m) => s -> m A.LiteralRepr renderInt :: Show s => s -> m A.LiteralRepr
renderInt i = return $ A.IntLiteral m $ show i renderInt i = return $ A.IntLiteral m $ show i
renderArray :: (CSMR m, Die m) => [OccValue] -> m A.LiteralRepr renderArray :: [OccValue] -> m A.LiteralRepr
renderArray vs renderArray vs
= do subT <- trivialSubscriptType m t = do subT <- trivialSubscriptType m t
aes <- mapM (renderArrayElem subT) vs aes <- mapM (renderArrayElem subT) vs
return $ A.ArrayLiteral m aes return $ A.ArrayLiteral m aes
renderArrayElem :: (CSMR m, Die m) => A.Type -> OccValue -> m A.ArrayElem renderArrayElem :: A.Type -> OccValue -> m A.ArrayElem
renderArrayElem t (OccArray vs) renderArrayElem t (OccArray vs)
= do subT <- trivialSubscriptType m t = do subT <- trivialSubscriptType m t
aes <- mapM (renderArrayElem subT) vs aes <- mapM (renderArrayElem subT) vs
return $ A.ArrayElemArray aes return $ A.ArrayElemArray aes
renderArrayElem t v = renderValue m t v >>* A.ArrayElemExpr renderArrayElem t v = renderValue m t v >>* A.ArrayElemExpr
renderRecord :: (CSMR m, Die m) => [OccValue] -> m A.LiteralRepr renderRecord :: [OccValue] -> m A.LiteralRepr
renderRecord vs renderRecord vs
= do ts <- case t of = do ts <- case t of
A.Infer -> return [A.Infer | _ <- vs] A.Infer -> return [A.Infer | _ <- vs]