X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Freader%2FLex.lhs;h=43469027cd4a0942c4909d5758d2f9b03b21a1e3;hb=b8fac567df42b0413fe3a2dec718937897e290a4;hp=70d6b6b0a89cff4fa481f9f50295bb3c7250a38b;hpb=0fffbea841d9647388a7b845808a9757782da663;p=ghc-hetmet.git diff --git a/ghc/compiler/reader/Lex.lhs b/ghc/compiler/reader/Lex.lhs index 70d6b6b..4346902 100644 --- a/ghc/compiler/reader/Lex.lhs +++ b/ghc/compiler/reader/Lex.lhs @@ -47,7 +47,7 @@ import BasicTypes ( NewOrData(..), IfaceFlavour(..) ) import SrcLoc ( SrcLoc, incSrcLine, srcLocFile ) import Maybes ( MaybeErr(..) ) -import ErrUtils ( ErrMsg ) +import ErrUtils ( Message ) import Outputable import FastString @@ -657,6 +657,7 @@ ifaceKeywordsFM = listToUFM $ ("__Ux", ITunfold IAmALoopBreaker), ("__ccall", ITccall (False, False, False)), + ("__ccall_GC", ITccall (False, False, True)), ("__dyn_ccall", ITccall (True, False, False)), ("__dyn_ccall_GC", ITccall (True, False, True)), ("__casm", ITccall (False, True, False)), @@ -758,7 +759,7 @@ doDiscard inStr buf = \begin{code} type IfM a = StringBuffer -- Input string -> SrcLoc - -> MaybeErr a ErrMsg + -> MaybeErr a {-error-}Message returnIf :: a -> IfM a returnIf a s l = Succeeded a @@ -801,7 +802,7 @@ checkVersion mb@Nothing s l ----------------------------------------------------------------- -ifaceParseErr :: StringBuffer -> SrcLoc -> ErrMsg +ifaceParseErr :: StringBuffer -> SrcLoc -> Message ifaceParseErr s l = hsep [ppr l, ptext SLIT("Interface-file parse error;"), ptext SLIT("current input ="), text first_bit]