X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FMatchLit.lhs;h=24dff8d5bb91a4a7e6b1907321a3d743525aa7c7;hb=0c6b69eada9cb7a6302f98f4de70cc71d3544c44;hp=e0a76011b6119137a62cdda39858b363e4a18932;hpb=4ae1e17253f4417303e46d59f5a737cc1d7fd78e;p=ghc-hetmet.git diff --git a/compiler/deSugar/MatchLit.lhs b/compiler/deSugar/MatchLit.lhs index e0a7601..24dff8d 100644 --- a/compiler/deSugar/MatchLit.lhs +++ b/compiler/deSugar/MatchLit.lhs @@ -6,6 +6,13 @@ Pattern-matching literal patterns \begin{code} +{-# OPTIONS -w #-} +-- The above warning supression flag is a temporary kludge. +-- While working on this module you are encouraged to remove it and fix +-- any warnings in the module. See +-- http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings +-- for details + module MatchLit ( dsLit, dsOverLit, hsLitKey, hsOverLitKey, tidyLitPat, tidyNPat, matchLiterals, matchNPlusKPats, matchNPats ) where @@ -27,12 +34,10 @@ import TcType import Type import PrelNames import TysWiredIn -import PrelNames import Unique import Literal import SrcLoc import Ratio -import SrcLoc import Outputable import Util import FastString @@ -61,33 +66,33 @@ See also below where we look for @DictApps@ for \tr{plusInt}, etc. \begin{code} dsLit :: HsLit -> DsM CoreExpr -dsLit (HsStringPrim s) = returnDs (mkLit (MachStr s)) -dsLit (HsCharPrim c) = returnDs (mkLit (MachChar c)) -dsLit (HsIntPrim i) = returnDs (mkLit (MachInt i)) -dsLit (HsFloatPrim f) = returnDs (mkLit (MachFloat f)) -dsLit (HsDoublePrim d) = returnDs (mkLit (MachDouble d)) +dsLit (HsStringPrim s) = return (mkLit (MachStr s)) +dsLit (HsCharPrim c) = return (mkLit (MachChar c)) +dsLit (HsIntPrim i) = return (mkLit (MachInt i)) +dsLit (HsFloatPrim f) = return (mkLit (MachFloat f)) +dsLit (HsDoublePrim d) = return (mkLit (MachDouble d)) -dsLit (HsChar c) = returnDs (mkCharExpr c) +dsLit (HsChar c) = return (mkCharExpr c) dsLit (HsString str) = mkStringExprFS str dsLit (HsInteger i _) = mkIntegerExpr i -dsLit (HsInt i) = returnDs (mkIntExpr i) +dsLit (HsInt i) = return (mkIntExpr i) -dsLit (HsRat r ty) - = mkIntegerExpr (numerator r) `thenDs` \ num -> - mkIntegerExpr (denominator r) `thenDs` \ denom -> - returnDs (mkConApp ratio_data_con [Type integer_ty, num, denom]) +dsLit (HsRat r ty) = do + num <- mkIntegerExpr (numerator r) + denom <- mkIntegerExpr (denominator r) + return (mkConApp ratio_data_con [Type integer_ty, num, denom]) where (ratio_data_con, integer_ty) - = case tcSplitTyConApp ty of - (tycon, [i_ty]) -> ASSERT(isIntegerTy i_ty && tycon `hasKey` ratioTyConKey) - (head (tyConDataCons tycon), i_ty) + = case tcSplitTyConApp ty of + (tycon, [i_ty]) -> ASSERT(isIntegerTy i_ty && tycon `hasKey` ratioTyConKey) + (head (tyConDataCons tycon), i_ty) dsOverLit :: HsOverLit Id -> DsM CoreExpr -- Post-typechecker, the SyntaxExpr field of an OverLit contains -- (an expression for) the literal value itself -dsOverLit (HsIntegral _ lit) = dsExpr lit -dsOverLit (HsFractional _ lit) = dsExpr lit -dsOverLit (HsIsString _ lit) = dsExpr lit +dsOverLit (HsIntegral _ lit _) = dsExpr lit +dsOverLit (HsFractional _ lit _) = dsExpr lit +dsOverLit (HsIsString _ lit _) = dsExpr lit \end{code} \begin{code} @@ -106,11 +111,11 @@ hsLitKey (HsString s) = MachStr s hsOverLitKey :: HsOverLit a -> Bool -> Literal -- Ditto for HsOverLit; the boolean indicates to negate -hsOverLitKey (HsIntegral i _) False = MachInt i -hsOverLitKey (HsIntegral i _) True = MachInt (-i) -hsOverLitKey (HsFractional r _) False = MachFloat r -hsOverLitKey (HsFractional r _) True = MachFloat (-r) -hsOverLitKey (HsIsString s _) False = MachStr s +hsOverLitKey (HsIntegral i _ _) False = MachInt i +hsOverLitKey (HsIntegral i _ _) True = MachInt (-i) +hsOverLitKey (HsFractional r _ _) False = MachFloat r +hsOverLitKey (HsFractional r _ _) True = MachFloat (-r) +hsOverLitKey (HsIsString s _ _) False = MachStr s -- negated string should never happen \end{code} @@ -137,36 +142,36 @@ tidyLitPat (HsString s) tidyLitPat lit = LitPat lit ---------------- -tidyNPat :: HsOverLit Id -> Maybe (SyntaxExpr Id) -> SyntaxExpr Id - -> Type -> Pat Id -tidyNPat over_lit mb_neg eq lit_ty - | isIntTy lit_ty = mk_con_pat intDataCon (HsIntPrim int_val) - | isFloatTy lit_ty = mk_con_pat floatDataCon (HsFloatPrim rat_val) - | isDoubleTy lit_ty = mk_con_pat doubleDataCon (HsDoublePrim rat_val) +tidyNPat :: HsOverLit Id -> Maybe (SyntaxExpr Id) -> SyntaxExpr Id -> Pat Id +tidyNPat over_lit mb_neg eq + | isIntTy (overLitType over_lit) = mk_con_pat intDataCon (HsIntPrim int_val) + | isFloatTy (overLitType over_lit) = mk_con_pat floatDataCon (HsFloatPrim rat_val) + | isDoubleTy (overLitType over_lit) = mk_con_pat doubleDataCon (HsDoublePrim rat_val) -- | isStringTy lit_ty = mk_con_pat stringDataCon (HsStringPrim str_val) - | otherwise = NPat over_lit mb_neg eq lit_ty + | otherwise = NPat over_lit mb_neg eq where mk_con_pat :: DataCon -> HsLit -> Pat Id - mk_con_pat con lit = unLoc (mkPrefixConPat con [noLoc $ LitPat lit] lit_ty) + mk_con_pat con lit = unLoc (mkPrefixConPat con [noLoc $ LitPat lit] (overLitType over_lit)) + neg_lit = case (mb_neg, over_lit) of (Nothing, _) -> over_lit - (Just _, HsIntegral i s) -> HsIntegral (-i) s - (Just _, HsFractional f s) -> HsFractional (-f) s + (Just _, HsIntegral i s ty) -> HsIntegral (-i) s ty + (Just _, HsFractional f s ty) -> HsFractional (-f) s ty int_val :: Integer int_val = case neg_lit of - HsIntegral i _ -> i - HsFractional f _ -> panic "tidyNPat" + HsIntegral i _ _ -> i + HsFractional f _ _ -> panic "tidyNPat" rat_val :: Rational rat_val = case neg_lit of - HsIntegral i _ -> fromInteger i - HsFractional f _ -> f + HsIntegral i _ _ -> fromInteger i + HsFractional f _ _ -> f str_val :: FastString str_val = case neg_lit of - HsIsString s _ -> s - _ -> error "tidyNPat" + HsIsString s _ _ -> s + _ -> error "tidyNPat" \end{code} @@ -227,7 +232,7 @@ matchNPats vars ty groups ; return (foldr1 combineMatchResults match_results) } matchOneNPat (var:vars) ty (eqn1:eqns) -- All for the same literal - = do { let NPat lit mb_neg eq_chk _ = firstPat eqn1 + = do { let NPat lit mb_neg eq_chk = firstPat eqn1 ; lit_expr <- dsOverLit lit ; neg_lit <- case mb_neg of Nothing -> return lit_expr