diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-07-27 06:22:26 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-07-27 06:22:26 +0100 |
| commit | e2ba86228445cfe5faeedccb73a3ddea0a3b9026 (patch) | |
| tree | 2bcb35b0a33d57b862f5dd4ed71b01a514c0164a | |
| parent | 921b1b3286d95fccb03ec6c31e8abd02fde1bab9 (diff) | |
| download | haskell-e2ba86228445cfe5faeedccb73a3ddea0a3b9026.tar.gz | |
Fix comments and documentation on monad comprehensions
| -rw-r--r-- | compiler/hsSyn/HsExpr.lhs | 8 | ||||
| -rw-r--r-- | docs/users_guide/glasgow_exts.xml | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/compiler/hsSyn/HsExpr.lhs b/compiler/hsSyn/HsExpr.lhs index 4179423c3f..1b556f3d3c 100644 --- a/compiler/hsSyn/HsExpr.lhs +++ b/compiler/hsSyn/HsExpr.lhs @@ -944,10 +944,10 @@ data StmtLR idL idR } deriving (Data, Typeable) -data TransForm -- The 'f' below is the 'using' function, 'e' is the by function - = ThenForm -- then f or then f by e - | GroupFormU -- group using f or group using f by e - | GroupFormB -- group by e +data TransForm -- The 'f' below is the 'using' function, 'e' is the by function + = ThenForm -- then f or then f by e (depending on trS_by) + | GroupFormU -- group using f or group using f by e (depending on trS_by) + | GroupFormB -- group by e -- In the GroupByFormB, trS_using is filled in with -- 'groupWith' (list comprehensions) or -- 'groupM' (monad comprehensions) diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml index 77d37c8f7a..8aca42c2ea 100644 --- a/docs/users_guide/glasgow_exts.xml +++ b/docs/users_guide/glasgow_exts.xml @@ -1382,13 +1382,15 @@ D[ e | (Q | R), S ] = mzip D[ Qv | Q ] D[ Rv | R ] >>= \(Qv,Rv) -> D -- Transform comprehensions D[ e | Q then f, R ] = f D[ Qv | Q ] >>= \Qv -> D[ e | R ] -D[ e | Q then f by b, R ] = f b D[ Qv | Q ] >>= \Qv -> D[ e | R ] +D[ e | Q then f by b, R ] = f (\Qv -> b) D[ Qv | Q ] >>= \Qv -> D[ e | R ] D[ e | Q then group using f, R ] = f D[ Qv | Q ] >>= \ys -> case (fmap selQv1 ys, ..., fmap selQvn ys) of Qv -> D[ e | R ] -D[ e | Q then group by b using f, R ] = f b D[ Qv | Q ] >>= \ys -> +D[ e | Q then group by b, R ] = D[ e | Q then group by b using mgroupWith, R ] + +D[ e | Q then group by b using f, R ] = f (\Qv -> b) D[ Qv | Q ] >>= \ys -> case (fmap selQv1 ys, ..., fmap selQvn ys) of Qv -> D[ e | R ] |