Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/aef8ac55833b1431fe078ca2b971ddbb0a4a6012 >--------------------------------------------------------------- commit aef8ac55833b1431fe078ca2b971ddbb0a4a6012 Author: Simon Peyton Jones <[email protected]> Date: Mon May 9 11:37:40 2011 +0100 Track monad-comp error message changes >--------------------------------------------------------------- tests/ghc-regress/ghci/prog011/prog011.stderr | 2 +- tests/ghc-regress/rebindable/DoParamM.stderr | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/ghc-regress/ghci/prog011/prog011.stderr b/tests/ghc-regress/ghci/prog011/prog011.stderr index 2eccd91..6ee1fac 100644 --- a/tests/ghc-regress/ghci/prog011/prog011.stderr +++ b/tests/ghc-regress/ghci/prog011/prog011.stderr @@ -1,2 +1,2 @@ -prog011.hx:14:22: Empty 'do' construct +prog011.hx:14:22: Empty 'do' block diff --git a/tests/ghc-regress/rebindable/DoParamM.stderr b/tests/ghc-regress/rebindable/DoParamM.stderr index 8e228d9..7abfdd4 100644 --- a/tests/ghc-regress/rebindable/DoParamM.stderr +++ b/tests/ghc-regress/rebindable/DoParamM.stderr @@ -3,13 +3,13 @@ DoParamM.hs:146:25: Couldn't match expected type `Int' with actual type `Char' In the second argument of `(==)', namely `v'' In the first argument of `return', namely `(v == v')' - In the expression: return (v == v') + In a stmt of a 'do' block: return (v == v') DoParamM.hs:286:28: Couldn't match expected type `Locked' with actual type `Unlocked' Expected type: LIO Locked r0 b0 Actual type: LIO Unlocked Locked () - In the expression: tlock2_do + In a stmt of a 'do' block: tlock2_do In the expression: do { tlock2_do; tlock2_do } @@ -18,7 +18,7 @@ DoParamM.hs:302:37: Couldn't match expected type `Unlocked' with actual type `Locked' Expected type: LIO Unlocked r0 b0 Actual type: LIO Locked Unlocked () - In the expression: unlock + In a stmt of a 'do' block: unlock In the expression: do { tlock2_do; unlock; _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
