X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FCheck.lhs;h=2fc2e8e0897247dcdba309b539d7c96ccc63c812;hb=16e4ce4c0c02650082f2e11982017c903c549ad5;hp=45a1ad8fcd981b72efc2e9c7bbb2bfb298e2971e;hpb=495ef8bd9ef30bffe50ea399b91e3ba09646b59a;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/Check.lhs b/ghc/compiler/deSugar/Check.lhs index 45a1ad8..2fc2e8e 100644 --- a/ghc/compiler/deSugar/Check.lhs +++ b/ghc/compiler/deSugar/Check.lhs @@ -11,32 +11,23 @@ module Check ( check , ExhaustivePat ) where import HsSyn -import TcHsSyn ( TypecheckedPat ) -import DsHsSyn ( outPatType ) -import CoreSyn - -import DsUtils ( EquationInfo(..), - MatchResult(..), - EqnSet, - CanItFail(..), - tidyLitPat +import TcHsSyn ( TypecheckedPat, hsPatType ) +import TcType ( tcTyConAppTyCon ) +import DsUtils ( EquationInfo(..), MatchResult(..), EqnSet, + CanItFail(..), tidyLitPat, tidyNPat, ) import Id ( idType ) -import DataCon ( DataCon, dataConTyCon, dataConArgTys, - dataConSourceArity, dataConFieldLabels ) -import Name ( Name, mkLocalName, getOccName, isDataSymOcc, getName, mkSrcVarOcc ) -import Type ( Type, splitAlgTyConApp, mkTyVarTys, - splitTyConApp_maybe - ) -import TysWiredIn ( nilDataCon, consDataCon, - mkListTy, mkTupleTy, tupleCon - ) -import Unique ( unboundKey ) +import DataCon ( DataCon, dataConTyCon, dataConOrigArgTys, dataConFieldLabels ) +import Name ( Name, mkInternalName, getOccName, isDataSymOcc, getName, mkVarOcc ) +import TysWiredIn +import PrelNames ( unboundKey ) import TyCon ( tyConDataCons, tupleTyConBoxity, isTupleTyCon ) import BasicTypes ( Boxity(..) ) import SrcLoc ( noSrcLoc ) import UniqSet +import Util ( takeList, splitAtList, notNull ) import Outputable +import FastString #include "HsVersions.h" \end{code} @@ -140,33 +131,27 @@ untidy_pars :: WarningPat -> WarningPat untidy_pars p = untidy True p untidy :: NeedPars -> WarningPat -> WarningPat -untidy _ p@WildPatIn = p -untidy _ p@(VarPatIn name) = p -untidy _ (LitPatIn lit) = LitPatIn (untidy_lit lit) -untidy _ p@(ConPatIn name []) = p -untidy b (ConPatIn name pats) = - pars b (ConPatIn name (map untidy_pars pats)) -untidy b (ConOpPatIn pat1 name fixity pat2) = - pars b (ConOpPatIn (untidy_pars pat1) name fixity (untidy_pars pat2)) -untidy _ (ListPatIn pats) = ListPatIn (map untidy_no_pars pats) -untidy _ (TuplePatIn pats boxed) = TuplePatIn (map untidy_no_pars pats) boxed - -untidy _ (SigPatIn pat ty) = panic "Check.untidy: SigPatIn" -untidy _ (LazyPatIn pat) = panic "Check.untidy: LazyPatIn" -untidy _ (AsPatIn name pat) = panic "Check.untidy: AsPatIn" -untidy _ (NPlusKPatIn name lit) = panic "Check.untidy: NPlusKPatIn" -untidy _ (NegPatIn ipat) = panic "Check.untidy: NegPatIn" -untidy _ (ParPatIn pat) = panic "Check.untidy: ParPatIn" -untidy _ (RecPatIn name fields) = panic "Check.untidy: RecPatIn" +untidy _ p@(WildPat _) = p +untidy _ p@(VarPat name) = p +untidy _ (LitPat lit) = LitPat (untidy_lit lit) +untidy _ p@(ConPatIn name (PrefixCon [])) = p +untidy b (ConPatIn name ps) = pars b (ConPatIn name (untidy_con ps)) +untidy _ (ListPat pats ty) = ListPat (map untidy_no_pars pats) ty +untidy _ (TuplePat pats boxed) = TuplePat (map untidy_no_pars pats) boxed +untidy _ (PArrPat _ _) = panic "Check.untidy: Shouldn't get a parallel array here!" +untidy _ (SigPatIn _ _) = panic "Check.untidy: SigPat" + +untidy_con (PrefixCon pats) = PrefixCon (map untidy_pars pats) +untidy_con (InfixCon p1 p2) = InfixCon (untidy_pars p1) (untidy_pars p2) +untidy_con (RecCon bs) = RecCon [(f,untidy_pars p) | (f,p) <- bs] pars :: NeedPars -> WarningPat -> WarningPat -pars True p = ParPatIn p +pars True p = ParPat p pars _ p = p untidy_lit :: HsLit -> HsLit untidy_lit (HsCharPrim c) = HsChar c ---untidy_lit (HsStringPrim s) = HsString s -untidy_lit lit = lit +untidy_lit lit = lit \end{code} This equation is the same that check, the only difference is that the @@ -201,7 +186,7 @@ check' :: [EquationInfo] -> ([ExhaustivePat],EqnSet) check' [] = ([([],[])],emptyUniqSet) check' [EqnInfo n ctx ps (MatchResult CanFail _)] - | all_vars ps = ([(take (length ps) (repeat new_wild_pat),[])], unitUniqSet n) + | all_vars ps = ([(takeList ps (repeat new_wild_pat),[])], unitUniqSet n) check' qs@((EqnInfo n ctx ps (MatchResult CanFail _)):rs) | all_vars ps = (pats, addOneToUniqSet indexs n) @@ -215,13 +200,14 @@ check' qs@((EqnInfo n ctx ps result):_) | literals = split_by_literals qs | constructors = split_by_constructor qs | only_vars = first_column_only_vars qs - | otherwise = panic "Check.check': Not implemented :-(" + | otherwise = pprPanic "Check.check': Not implemented :-(" (ppr first_pats) where -- Note: RecPats will have been simplified to ConPats -- at this stage. - constructors = or (map is_con qs) - literals = or (map is_lit qs) - only_vars = and (map is_var qs) + first_pats = ASSERT2( okGroup qs, pprGroup qs ) map firstPat qs + constructors = any is_con first_pats + literals = any is_lit first_pats + only_vars = all is_var first_pats -- npat = or (map is_npat qs) -- nplusk = or (map is_nplusk qs) \end{code} @@ -258,11 +244,12 @@ must be one Variable to be complete. process_literals :: [HsLit] -> [EquationInfo] -> ([ExhaustivePat],EqnSet) process_literals used_lits qs - | length default_eqns == 0 = ([make_row_vars used_lits (head qs)]++pats,indexs) - | otherwise = (pats_default,indexs_default) + | null default_eqns = ([make_row_vars used_lits (head qs)]++pats,indexs) + | otherwise = (pats_default,indexs_default) where (pats,indexs) = process_explicit_literals used_lits qs - default_eqns = (map remove_var (filter is_var qs)) + default_eqns = ASSERT2( okGroup qs, pprGroup qs ) + map remove_var (filter (is_var . firstPat) qs) (pats',indexs') = check' default_eqns pats_default = [(new_wild_pat:ps,constraints) | (ps,constraints) <- (pats')] ++ pats indexs_default = unionUniqSets indexs' indexs @@ -277,13 +264,14 @@ construct_literal_matrix lit qs = (map (\ (xs,ys) -> (new_lit:xs,ys)) pats,indexs) where (pats,indexs) = (check' (remove_first_column_lit lit qs)) - new_lit = LitPatIn lit + new_lit = LitPat lit remove_first_column_lit :: HsLit -> [EquationInfo] -> [EquationInfo] -remove_first_column_lit lit qs = - map shift_pat (filter (is_var_lit lit) qs) +remove_first_column_lit lit qs + = ASSERT2( okGroup qs, pprGroup qs ) + map shift_pat (filter (is_var_lit lit . firstPat) qs) where shift_pat (EqnInfo n ctx [] result) = panic "Check.shift_var: no patterns" shift_pat (EqnInfo n ctx (_:ps) result) = EqnInfo n ctx ps result @@ -297,8 +285,9 @@ same constructor. split_by_constructor :: [EquationInfo] -> ([ExhaustivePat],EqnSet) -split_by_constructor qs | length unused_cons /= 0 = need_default_case used_cons unused_cons qs - | otherwise = no_need_default_case used_cons qs +split_by_constructor qs + | notNull unused_cons = need_default_case used_cons unused_cons qs + | otherwise = no_need_default_case used_cons qs where used_cons = get_used_cons qs unused_cons = get_unused_cons used_cons @@ -333,11 +322,11 @@ no_need_default_case cons qs = (concat pats, unionManyUniqSets indexs) need_default_case :: [TypecheckedPat] -> [DataCon] -> [EquationInfo] -> ([ExhaustivePat],EqnSet) need_default_case used_cons unused_cons qs - | length default_eqns == 0 = (pats_default_no_eqns,indexs) - | otherwise = (pats_default,indexs_default) + | null default_eqns = (pats_default_no_eqns,indexs) + | otherwise = (pats_default,indexs_default) where (pats,indexs) = no_need_default_case used_cons qs - default_eqns = (map remove_var (filter is_var qs)) + default_eqns = ASSERT2( okGroup qs, pprGroup qs ) map remove_var (filter (is_var . firstPat) qs) (pats',indexs') = check' default_eqns pats_default = [(make_whole_con c:ps,constraints) | c <- unused_cons, (ps,constraints) <- pats'] ++ pats @@ -370,11 +359,12 @@ is transformed in: remove_first_column :: TypecheckedPat -- Constructor -> [EquationInfo] -> [EquationInfo] -remove_first_column (ConPat con _ _ _ con_pats) qs = - map shift_var (filter (is_var_con con) qs) +remove_first_column (ConPatOut con (PrefixCon con_pats) _ _ _) qs + = ASSERT2( okGroup qs, pprGroup qs ) + map shift_var (filter (is_var_con con . firstPat) qs) where - new_wilds = [WildPat (outPatType arg_pat) | arg_pat <- con_pats] - shift_var (EqnInfo n ctx (ConPat _ _ _ _ ps':ps) result) = + new_wilds = [WildPat (hsPatType arg_pat) | arg_pat <- con_pats] + shift_var (EqnInfo n ctx (ConPatOut _ (PrefixCon ps') _ _ _:ps) result) = EqnInfo n ctx (ps'++ps) result shift_var (EqnInfo n ctx (WildPat _ :ps) result) = EqnInfo n ctx (new_wilds ++ ps) result @@ -382,18 +372,18 @@ remove_first_column (ConPat con _ _ _ con_pats) qs = make_row_vars :: [HsLit] -> EquationInfo -> ExhaustivePat make_row_vars used_lits (EqnInfo _ _ pats _ ) = - (VarPatIn new_var:take (length (tail pats)) (repeat new_wild_pat),[(new_var,used_lits)]) + (VarPat new_var:takeList (tail pats) (repeat new_wild_pat),[(new_var,used_lits)]) where new_var = hash_x -hash_x = mkLocalName unboundKey {- doesn't matter much -} - (mkSrcVarOcc SLIT("#x")) +hash_x = mkInternalName unboundKey {- doesn't matter much -} + (mkVarOcc FSLIT("#x")) noSrcLoc make_row_vars_for_constructor :: EquationInfo -> [WarningPat] -make_row_vars_for_constructor (EqnInfo _ _ pats _ ) = take (length (tail pats)) (repeat new_wild_pat) +make_row_vars_for_constructor (EqnInfo _ _ pats _ ) = takeList (tail pats) (repeat new_wild_pat) compare_cons :: TypecheckedPat -> TypecheckedPat -> Bool -compare_cons (ConPat id1 _ _ _ _) (ConPat id2 _ _ _ _) = id1 == id2 +compare_cons (ConPatOut id1 _ _ _ _) (ConPatOut id2 _ _ _ _) = id1 == id2 remove_dups :: [TypecheckedPat] -> [TypecheckedPat] remove_dups [] = [] @@ -401,7 +391,7 @@ remove_dups (x:xs) | or (map (\y -> compare_cons x y) xs) = remove_dups xs | otherwise = x : remove_dups xs get_used_cons :: [EquationInfo] -> [TypecheckedPat] -get_used_cons qs = remove_dups [con | (EqnInfo _ _ (con@(ConPat _ _ _ _ _):_) _) <- qs ] +get_used_cons qs = remove_dups [con | (EqnInfo _ _ (con@(ConPatOut _ _ _ _ _):_) _) <- qs ] remove_dups' :: [HsLit] -> [HsLit] remove_dups' [] = [] @@ -416,9 +406,9 @@ get_used_lits qs = remove_dups' all_literals get_used_lits' :: [EquationInfo] -> [HsLit] get_used_lits' [] = [] -get_used_lits' ((EqnInfo _ _ ((LitPat lit _):_) _):qs) = +get_used_lits' ((EqnInfo _ _ ((LitPat lit):_) _):qs) = lit : get_used_lits qs -get_used_lits' ((EqnInfo _ _ ((NPat lit _ _):_) _):qs) = +get_used_lits' ((EqnInfo _ _ ((NPatOut lit _ _):_) _):qs) = lit : get_used_lits qs get_used_lits' (q:qs) = get_used_lits qs @@ -426,14 +416,13 @@ get_used_lits' (q:qs) = get_unused_cons :: [TypecheckedPat] -> [DataCon] get_unused_cons used_cons = unused_cons where - (ConPat _ ty _ _ _) = head used_cons - Just (ty_con,_) = splitTyConApp_maybe ty - all_cons = tyConDataCons ty_con - used_cons_as_id = map (\ (ConPat d _ _ _ _) -> d) used_cons - unused_cons = uniqSetToList + (ConPatOut _ _ ty _ _) = head used_cons + ty_con = tcTyConAppTyCon ty -- Newtype observable + all_cons = tyConDataCons ty_con + used_cons_as_id = map (\ (ConPatOut d _ _ _ _) -> d) used_cons + unused_cons = uniqSetToList (mkUniqSet all_cons `minusUniqSet` mkUniqSet used_cons_as_id) - all_vars :: [TypecheckedPat] -> Bool all_vars [] = True all_vars (WildPat _:ps) = all_vars ps @@ -444,37 +433,56 @@ remove_var (EqnInfo n ctx (WildPat _:ps) result) = EqnInfo n ctx ps result remove_var _ = panic "Check.remove_var: equation does not begin with a variable" -is_con :: EquationInfo -> Bool -is_con (EqnInfo _ _ ((ConPat _ _ _ _ _):_) _) = True -is_con _ = False - -is_lit :: EquationInfo -> Bool -is_lit (EqnInfo _ _ ((LitPat _ _):_) _) = True -is_lit (EqnInfo _ _ ((NPat _ _ _):_) _) = True -is_lit _ = False - -is_npat :: EquationInfo -> Bool -is_npat (EqnInfo _ _ ((NPat _ _ _):_) _) = True -is_npat _ = False - -is_nplusk :: EquationInfo -> Bool -is_nplusk (EqnInfo _ _ ((NPlusKPat _ _ _ _ _):_) _) = True -is_nplusk _ = False - -is_var :: EquationInfo -> Bool -is_var (EqnInfo _ _ ((WildPat _):_) _) = True -is_var _ = False - -is_var_con :: DataCon -> EquationInfo -> Bool -is_var_con con (EqnInfo _ _ ((WildPat _):_) _) = True -is_var_con con (EqnInfo _ _ ((ConPat id _ _ _ _):_) _) | id == con = True -is_var_con con _ = False - -is_var_lit :: HsLit -> EquationInfo -> Bool -is_var_lit lit (EqnInfo _ _ ((WildPat _):_) _) = True -is_var_lit lit (EqnInfo _ _ ((LitPat lit' _):_) _) | lit == lit' = True -is_var_lit lit (EqnInfo _ _ ((NPat lit' _ _):_) _) | lit == lit' = True -is_var_lit lit _ = False +----------------------- +eqnPats :: EquationInfo -> [TypecheckedPat] +eqnPats (EqnInfo _ _ ps _) = ps + +firstPat :: EquationInfo -> TypecheckedPat +firstPat eqn_info = head (eqnPats eqn_info) + +okGroup :: [EquationInfo] -> Bool +-- True if all equations have at least one pattern, and +-- all have the same number of patterns +okGroup [] = True +okGroup (e:es) = n_pats > 0 && and [length (eqnPats e) == n_pats | e <- es] + where + n_pats = length (eqnPats e) + +-- Half-baked print +pprGroup es = vcat (map pprEqnInfo es) +pprEqnInfo e = ppr (eqnPats e) + +is_con :: TypecheckedPat -> Bool +is_con (ConPatOut _ _ _ _ _) = True +is_con _ = False + +is_lit :: TypecheckedPat -> Bool +is_lit (LitPat _) = True +is_lit (NPatOut _ _ _) = True +is_lit _ = False + +is_npat :: TypecheckedPat -> Bool +is_npat (NPatOut _ _ _) = True +is_npat _ = False + +is_nplusk :: TypecheckedPat -> Bool +is_nplusk (NPlusKPatOut _ _ _ _) = True +is_nplusk _ = False + +is_var :: TypecheckedPat -> Bool +is_var (WildPat _) = True +is_var _ = False + +is_var_con :: DataCon -> TypecheckedPat -> Bool +is_var_con con (WildPat _) = True +is_var_con con (ConPatOut id _ _ _ _) | id == con = True +is_var_con con _ = False + +is_var_lit :: HsLit -> TypecheckedPat -> Bool +is_var_lit lit (WildPat _) = True +is_var_lit lit (LitPat lit') | lit == lit' = True +is_var_lit lit (NPatOut lit' _ _) | lit == lit' = True +is_var_lit lit _ = False \end{code} The difference beteewn @make_con@ and @make_whole_con@ is that @@ -517,47 +525,47 @@ not the second. \fbox{\ ???\ } \begin{code} isInfixCon con = isDataSymOcc (getOccName con) -is_nil (ConPatIn con []) = con == getName nilDataCon -is_nil _ = False +is_nil (ConPatIn con (PrefixCon [])) = con == getName nilDataCon +is_nil _ = False -is_list (ListPatIn _) = True +is_list (ListPat _ _) = True is_list _ = False return_list id q = id == consDataCon && (is_nil q || is_list q) -make_list p q | is_nil q = ListPatIn [p] -make_list p (ListPatIn ps) = ListPatIn (p:ps) -make_list _ _ = panic "Check.make_list: Invalid argument" +make_list p q | is_nil q = ListPat [p] placeHolderType +make_list p (ListPat ps ty) = ListPat (p:ps) ty +make_list _ _ = panic "Check.make_list: Invalid argument" make_con :: TypecheckedPat -> ExhaustivePat -> ExhaustivePat -make_con (ConPat id _ _ _ _) (p:q:ps, constraints) +make_con (ConPatOut id _ _ _ _) (p:q:ps, constraints) | return_list id q = (make_list p q : ps, constraints) - | isInfixCon id = ((ConOpPatIn p name fixity q) : ps, constraints) - where name = getName id - fixity = panic "Check.make_con: Guessing fixity" - -make_con (ConPat id _ _ _ pats) (ps,constraints) - | isTupleTyCon tc = (TuplePatIn pats_con (tupleTyConBoxity tc) : rest_pats, constraints) - | otherwise = (ConPatIn name pats_con : rest_pats, constraints) - where num_args = length pats - name = getName id - pats_con = take num_args ps - rest_pats = drop num_args ps - tc = dataConTyCon id - + | isInfixCon id = (ConPatIn (getName id) (InfixCon p q) : ps, constraints) + +make_con (ConPatOut id (PrefixCon pats) _ _ _) (ps, constraints) + | isTupleTyCon tc = (TuplePat pats_con (tupleTyConBoxity tc) : rest_pats, constraints) + | isPArrFakeCon id = (PArrPat pats_con placeHolderType : rest_pats, constraints) + | otherwise = (ConPatIn name (PrefixCon pats_con) : rest_pats, constraints) + where + name = getName id + (pats_con, rest_pats) = splitAtList pats ps + tc = dataConTyCon id + +-- reconstruct parallel array pattern +-- +-- * don't check for the type only; we need to make sure that we are really +-- dealing with one of the fake constructors and not with the real +-- representation make_whole_con :: DataCon -> WarningPat -make_whole_con con | isInfixCon con = ConOpPatIn new_wild_pat name fixity new_wild_pat - | otherwise = ConPatIn name pats +make_whole_con con | isInfixCon con = ConPatIn name (InfixCon new_wild_pat new_wild_pat) + | otherwise = ConPatIn name (PrefixCon pats) where - fixity = panic "Check.make_whole_con: Guessing fixity" name = getName con - arity = dataConSourceArity con - pats = take arity (repeat new_wild_pat) - + pats = [new_wild_pat | t <- dataConOrigArgTys con] new_wild_pat :: WarningPat -new_wild_pat = WildPatIn +new_wild_pat = WildPat placeHolderType \end{code} This equation makes the same thing as @tidy@ in @Match.lhs@, the @@ -579,61 +587,53 @@ simplify_pat :: TypecheckedPat -> TypecheckedPat simplify_pat pat@(WildPat gt) = pat simplify_pat (VarPat id) = WildPat (idType id) -simplify_pat (LazyPat p) = simplify_pat p -simplify_pat (AsPat id p) = simplify_pat p +simplify_pat (ParPat p) = simplify_pat p +simplify_pat (LazyPat p) = simplify_pat p +simplify_pat (AsPat id p) = simplify_pat p +simplify_pat (SigPatOut p ty fn) = simplify_pat p -- I'm not sure this is right -simplify_pat (ConPat id ty tvs dicts ps) = ConPat id ty tvs dicts (map simplify_pat ps) +simplify_pat (ConPatOut id ps ty tvs dicts) = ConPatOut id (simplify_con id ps) ty tvs dicts -simplify_pat (ListPat ty ps) = foldr (\ x -> \y -> ConPat consDataCon list_ty [] [] [x, y]) - (ConPat nilDataCon list_ty [] [] []) +simplify_pat (ListPat ps ty) = foldr (\ x y -> mkPrefixConPat consDataCon [x,y] list_ty) + (mkNilPat list_ty) (map simplify_pat ps) where list_ty = mkListTy ty - -simplify_pat (TuplePat ps boxity) - = ConPat (tupleCon boxity arity) - (mkTupleTy boxity arity (map outPatType ps)) [] [] - (map simplify_pat ps) +-- introduce fake parallel array constructors to be able to handle parallel +-- arrays with the existing machinery for constructor pattern +-- +simplify_pat (PArrPat ps ty) + = ConPatOut (parrFakeCon arity) + (PrefixCon (map simplify_pat ps)) + (mkPArrTy ty) [] [] where arity = length ps -simplify_pat (RecPat dc ty ex_tvs dicts []) - = ConPat dc ty ex_tvs dicts all_wild_pats +simplify_pat (TuplePat ps boxity) + = ConPatOut (tupleCon boxity arity) + (PrefixCon (map simplify_pat ps)) + (mkTupleTy boxity arity (map hsPatType ps)) [] [] where - all_wild_pats = map WildPat con_arg_tys + arity = length ps - -- identical to machinations in Match.tidy1: - (_, inst_tys, _) = splitAlgTyConApp ty - con_arg_tys = dataConArgTys dc (inst_tys ++ mkTyVarTys ex_tvs) +simplify_pat pat@(LitPat lit) = tidyLitPat lit pat -simplify_pat (RecPat dc ty ex_tvs dicts idps) - = ConPat dc ty ex_tvs dicts pats +-- unpack string patterns fully, so we can see when they overlap with +-- each other, or even explicit lists of Chars. +simplify_pat pat@(NPatOut (HsString s) _ _) = + foldr (\c pat -> ConPatOut consDataCon (PrefixCon [mk_char_lit c,pat]) stringTy [] []) + (ConPatOut nilDataCon (PrefixCon []) stringTy [] []) (unpackIntFS s) where - pats = map (simplify_pat.snd) all_pats + mk_char_lit c = ConPatOut charDataCon (PrefixCon [LitPat (HsCharPrim c)]) + charTy [] [] - -- pad out all the missing fields with WildPats. - field_pats = map (\ f -> (getName f, WildPat (panic "simplify_pat(RecPat-2)"))) - (dataConFieldLabels dc) - all_pats = - foldr - ( \ (id,p,_) acc -> insertNm (getName id) p acc) - field_pats - idps - - insertNm nm p [] = [(nm,p)] - insertNm nm p (x@(n,_):xs) - | nm == n = (nm,p):xs - | otherwise = x : insertNm nm p xs - -simplify_pat pat@(LitPat lit lit_ty) = tidyLitPat lit lit_ty pat -simplify_pat pat@(NPat lit lit_ty hsexpr) = tidyLitPat lit lit_ty pat +simplify_pat pat@(NPatOut lit lit_ty hsexpr) = tidyNPat lit lit_ty pat -simplify_pat (NPlusKPat id hslit ty hsexpr1 hsexpr2) = - WildPat ty - where ty = panic "Check.simplify_pat: Gessing ty" +simplify_pat (NPlusKPatOut id hslit hsexpr1 hsexpr2) + = WildPat (idType id) -simplify_pat (DictPat dicts methods) = - case num_of_d_and_ms of +simplify_pat (DictPat dicts methods) + = case num_of_d_and_ms of 0 -> simplify_pat (TuplePat [] Boxed) 1 -> simplify_pat (head dict_and_method_pats) _ -> simplify_pat (TuplePat dict_and_method_pats Boxed) @@ -641,4 +641,24 @@ simplify_pat (DictPat dicts methods) = num_of_d_and_ms = length dicts + length methods dict_and_method_pats = map VarPat (dicts ++ methods) +----------------- +simplify_con con (PrefixCon ps) = PrefixCon (map simplify_pat ps) +simplify_con con (InfixCon p1 p2) = PrefixCon [simplify_pat p1, simplify_pat p2] +simplify_con con (RecCon fs) + | null fs = PrefixCon [wild_pat | t <- dataConOrigArgTys con] + -- Special case for null patterns; maybe not a record at all + | otherwise = PrefixCon (map (simplify_pat.snd) all_pats) + where + -- pad out all the missing fields with WildPats. + field_pats = map (\ f -> (getName f, wild_pat)) + (dataConFieldLabels con) + all_pats = foldr (\ (id,p) acc -> insertNm (getName id) p acc) + field_pats fs + + insertNm nm p [] = [(nm,p)] + insertNm nm p (x@(n,_):xs) + | nm == n = (nm,p):xs + | otherwise = x : insertNm nm p xs + + wild_pat = WildPat (panic "Check.simplify_con") \end{code}