From: simonpj Date: Mon, 4 Apr 2005 13:26:59 +0000 (+0000) Subject: [project @ 2005-04-04 13:26:59 by simonpj] X-Git-Tag: Initial_conversion_from_CVS_complete~823 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=6d0a6464e9fa5297a75c31217cb5a1ea577292d0;p=ghc-hetmet.git [project @ 2005-04-04 13:26:59 by simonpj] Wibble: invert sense of test --- diff --git a/ghc/compiler/typecheck/Inst.lhs b/ghc/compiler/typecheck/Inst.lhs index 7cde236..1be79b2 100644 --- a/ghc/compiler/typecheck/Inst.lhs +++ b/ghc/compiler/typecheck/Inst.lhs @@ -368,7 +368,7 @@ tcOverloadedLit :: InstOrigin -> TcType -> TcM (HsOverLit TcId) tcOverloadedLit orig lit@(HsIntegral i fi) expected_ty - | fi `isHsVar` fromIntegerName -- Do not generate a LitInst for rebindable syntax. + | not (fi `isHsVar` fromIntegerName) -- Do not generate a LitInst for rebindable syntax. -- Reason: If we do, tcSimplify will call lookupInst, which -- will call tcSyntaxName, which does unification, -- which tcSimplify doesn't like @@ -385,7 +385,7 @@ tcOverloadedLit orig lit@(HsIntegral i fi) expected_ty ; return (HsIntegral i expr) } tcOverloadedLit orig lit@(HsFractional r fr) expected_ty - | fr `isHsVar` fromRationalName -- c.f. HsIntegral case + | not (fr `isHsVar` fromRationalName) -- c.f. HsIntegral case = do { rat_ty <- tcMetaTy rationalTyConName ; fr' <- tcSyntaxOp orig fr (mkFunTy rat_ty expected_ty) ; return (HsFractional r (HsApp (noLoc fr') (nlHsLit (HsRat r rat_ty)))) }