X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcArrows.lhs;h=794fa093c7429b758c334edc57e2525acf90fbfa;hb=1dfb756e01201c62ddde93010b3384d4d9644ad6;hp=d45c7f3a2b15ae03f301e08458923daae341b0f7;hpb=eace8501f73b0b2ee55e02d84e45cec03ab898d7;p=ghc-hetmet.git

diff --git a/ghc/compiler/typecheck/TcArrows.lhs b/ghc/compiler/typecheck/TcArrows.lhs
index d45c7f3..794fa09 100644
--- a/ghc/compiler/typecheck/TcArrows.lhs
+++ b/ghc/compiler/typecheck/TcArrows.lhs
@@ -231,14 +231,14 @@ tc_cmd env cmd@(HsDo do_or_lc stmts _ ty) (cmd_stk, res_ty)
 
 
 -----------------------------------------------------------------
---	Arrow ``forms''	      (| e |) c1 .. cn
+--	Arrow ``forms''	      (| e c1 .. cn |)
 --
 --	G      |-b  c : [s1 .. sm] s
 --	pop(G) |-   e : forall w. b ((w,s1) .. sm) s
 --			        -> a ((w,t1) .. tn) t
 --	e \not\in (s, s1..sm, t, t1..tn)
 --	----------------------------------------------
---	G |-a  (| e |) c  :  [t1 .. tn] t
+--	G |-a  (| e c |)  :  [t1 .. tn] t
 
 tc_cmd env cmd@(HsArrForm expr fixity cmd_args) (cmd_stk, res_ty)	
   = addErrCtxt (cmdCtxt cmd)	$
@@ -256,7 +256,7 @@ tc_cmd env cmd@(HsArrForm expr fixity cmd_args) (cmd_stk, res_ty)
 			      e_res_ty
 
 		-- Check expr
-	; (expr', lie) <- getLIE (tcCheckRho expr e_ty)
+	; (expr', lie) <- popArrowBinders (getLIE (tcCheckRho expr e_ty))
 	; inst_binds <- tcSimplifyCheck sig_msg [w_tv] [] lie
 
 		-- Check that the polymorphic variable hasn't been unified with anything