X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FTcArrows.lhs;h=0b50b32e2411c259bf8a55d821ba5c70ed2a37b1;hb=d566d3ce56c583a74037e545312f30881b56f12e;hp=f0cb72aa4c6dd82c1e9b550e4e451cfa42ef028f;hpb=4226903dd2bd0a08e1b7e10547a57588e8371e78;p=ghc-hetmet.git diff --git a/compiler/typecheck/TcArrows.lhs b/compiler/typecheck/TcArrows.lhs index f0cb72a..0b50b32 100644 --- a/compiler/typecheck/TcArrows.lhs +++ b/compiler/typecheck/TcArrows.lhs @@ -14,8 +14,6 @@ Typecheck arrow notation module TcArrows ( tcProc ) where -#include "HsVersions.h" - import {-# SOURCE #-} TcExpr( tcMonoExpr, tcInferRho ) import HsSyn @@ -27,7 +25,6 @@ import TcType import TcMType import TcBinds import TcSimplify -import TcGadt import TcPat import TcUnify import TcRnMonad @@ -41,6 +38,7 @@ import Type import SrcLoc import Outputable +import FastString import Util import Control.Monad @@ -319,8 +317,8 @@ tc_cmd env cmd@(HsArrForm expr fixity cmd_args) (cmd_stk, res_ty) -- This is where expressions that aren't commands get rejected tc_cmd env cmd _ - = failWithTc (vcat [ptext SLIT("The expression"), nest 2 (ppr cmd), - ptext SLIT("was found where an arrow command was expected")]) + = failWithTc (vcat [ptext (sLit "The expression"), nest 2 (ppr cmd), + ptext (sLit "was found where an arrow command was expected")]) \end{code} @@ -346,20 +344,20 @@ arrowTyConKind = mkArrowKinds [liftedTypeKind, liftedTypeKind] liftedTypeKind %************************************************************************ \begin{code} -cmdCtxt cmd = ptext SLIT("In the command:") <+> ppr cmd +cmdCtxt cmd = ptext (sLit "In the command:") <+> ppr cmd caseScrutCtxt cmd - = hang (ptext SLIT("In the scrutinee of a case command:")) 4 (ppr cmd) + = hang (ptext (sLit "In the scrutinee of a case command:")) 4 (ppr cmd) nonEmptyCmdStkErr cmd - = hang (ptext SLIT("Non-empty command stack at command:")) + = hang (ptext (sLit "Non-empty command stack at command:")) 4 (ppr cmd) kappaUnderflow cmd - = hang (ptext SLIT("Command stack underflow at command:")) + = hang (ptext (sLit "Command stack underflow at command:")) 4 (ppr cmd) badFormFun i tup_ty' - = hang (ptext SLIT("The type of the") <+> speakNth i <+> ptext SLIT("argument of a command form has the wrong shape")) - 4 (ptext SLIT("Argument type:") <+> ppr tup_ty') + = hang (ptext (sLit "The type of the") <+> speakNth i <+> ptext (sLit "argument of a command form has the wrong shape")) + 4 (ptext (sLit "Argument type:") <+> ppr tup_ty') \end{code}