From: sof Date: Tue, 7 Apr 1998 21:41:55 +0000 (+0000) Subject: [project @ 1998-04-07 21:40:31 by sof] X-Git-Tag: Approx_2487_patches~822 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=ffe6bc6201801ef7f096e801cbe8cde182883c8f;p=ghc-hetmet.git [project @ 1998-04-07 21:40:31 by sof] Undo previous commit --- diff --git a/ghc/compiler/deSugar/Check.lhs b/ghc/compiler/deSugar/Check.lhs index 1d4edf0..0504989 100644 --- a/ghc/compiler/deSugar/Check.lhs +++ b/ghc/compiler/deSugar/Check.lhs @@ -540,7 +540,7 @@ simplify_pat pat@(LitPat lit lit_ty) | lit_ty == charTy = ConPat charDataCon charTy [LitPat (mk_char lit) charPrimTy] - | otherwise = pat --pprPanic "tidy1:LitPat:" (ppr pat) + | otherwise = pprPanic "tidy1:LitPat:" (ppr pat) where mk_char (HsChar c) = HsCharPrim c diff --git a/ghc/compiler/deSugar/Match.lhs b/ghc/compiler/deSugar/Match.lhs index a147fbf..d7c3bdb 100644 --- a/ghc/compiler/deSugar/Match.lhs +++ b/ghc/compiler/deSugar/Match.lhs @@ -499,9 +499,7 @@ tidy1 v pat@(LitPat lit lit_ty) match_result = returnDs (ConPat charDataCon charTy [LitPat (mk_char lit) charPrimTy], match_result) - | otherwise - --= pprPanic "tidy1:LitPat:" (ppr pat) - = returnDs (pat, match_result) + | otherwise = pprPanic "tidy1:LitPat:" (ppr pat) where mk_char (HsChar c) = HsCharPrim c diff --git a/ghc/compiler/deSugar/MatchLit.lhs b/ghc/compiler/deSugar/MatchLit.lhs index 5017e6c..7ffbdae 100644 --- a/ghc/compiler/deSugar/MatchLit.lhs +++ b/ghc/compiler/deSugar/MatchLit.lhs @@ -73,8 +73,8 @@ matchLiterals all_vars@(var:vars) eqns_info@(EqnInfo n ctx (LitPat literal lit_t mk_core_lit ty (HsStringPrim s) = MachStr s mk_core_lit ty (HsFloatPrim f) = MachFloat f mk_core_lit ty (HsDoublePrim d) = MachDouble d - mk_core_lit ty (HsLitLit s) = --ASSERT(isUnpointedType ty) - MachLitLit s IntRep -- (panic "MatchLit.matchLiterals:mk_core_lit:HsLitLit; typePrimRep???") + mk_core_lit ty (HsLitLit s) = ASSERT(isUnpointedType ty) + achLitLit s (panic "MatchLit.matchLiterals:mk_core_lit:HsLitLit; typePrimRep???") mk_core_lit ty other = panic "matchLiterals:mk_core_lit:unhandled" \end{code}