X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Ftypecheck%2FTcGenDeriv.lhs;h=81b6a893ef82af8a7e49bcb9e423de8bdfa037c7;hb=b732f90c9e6b1c0177e04a5f84abac7f50cca4e4;hp=2819e6a353c9f8ac8eb3d392d05ed22073fce85a;hpb=39df665783d440ee888bacdec29b4f0164646416;p=ghc-hetmet.git diff --git a/ghc/compiler/typecheck/TcGenDeriv.lhs b/ghc/compiler/typecheck/TcGenDeriv.lhs index 2819e6a..81b6a89 100644 --- a/ghc/compiler/typecheck/TcGenDeriv.lhs +++ b/ghc/compiler/typecheck/TcGenDeriv.lhs @@ -28,27 +28,31 @@ module TcGenDeriv ( import HsSyn ( InPat(..), HsExpr(..), MonoBinds(..), Match(..), GRHSs(..), Stmt(..), HsLit(..), - HsBinds(..), StmtCtxt(..), - unguardedRHS, mkSimpleMatch + HsBinds(..), StmtCtxt(..), HsType(..), + unguardedRHS, mkSimpleMatch, mkMonoBind, andMonoBindList + ) +import RdrHsSyn ( mkHsOpApp, RdrNameMonoBinds, RdrNameHsExpr, RdrNamePat ) +import RdrName ( RdrName, mkUnqual ) +import BasicTypes ( RecFlag(..), Fixity(..), FixityDirection(..) + , maxPrecedence + , Boxity(..) ) -import RdrHsSyn ( mkOpApp, RdrNameMonoBinds, RdrNameHsExpr, RdrNamePat ) -import RdrName ( RdrName, mkSrcUnqual ) -import BasicTypes ( RecFlag(..) ) import FieldLabel ( fieldLabelName ) import DataCon ( isNullaryDataCon, dataConTag, - dataConRawArgTys, fIRST_TAG, - DataCon, ConTag, + dataConOrigArgTys, dataConSourceArity, fIRST_TAG, + DataCon, dataConFieldLabels ) import Name ( getOccString, getOccName, getSrcLoc, occNameString, - nameRdrName, varName, - OccName, Name, NamedThing(..), NameSpace + occNameUserString, nameRdrName, varName, + Name, NamedThing(..), + isDataSymOcc, isSymOcc ) +import HscTypes ( GlobalSymbolTable, lookupFixityEnv ) -import PrimOp ( PrimOp(..) ) import PrelInfo -- Lots of RdrNames -import SrcLoc ( mkGeneratedSrcLoc, SrcLoc ) +import SrcLoc ( generatedSrcLoc, SrcLoc ) import TyCon ( TyCon, isNewTyCon, tyConDataCons, isEnumerationTyCon, - maybeTyConSingleCon + maybeTyConSingleCon, tyConFamilySize ) import Type ( isUnLiftedType, isUnboxedType, Type ) import TysPrim ( charPrimTy, intPrimTy, wordPrimTy, addrPrimTy, @@ -58,7 +62,13 @@ import Util ( mapAccumL, zipEqual, zipWithEqual, zipWith3Equal, nOfThem ) import Panic ( panic, assertPanic ) import Maybes ( maybeToBool ) +import Constants import List ( partition, intersperse ) +import Outputable ( pprPanic, ppr ) + +#if __GLASGOW_HASKELL__ >= 404 +import GlaExts ( fromInt ) +#endif \end{code} %************************************************************************ @@ -172,7 +182,7 @@ gen_Eq_binds tycon case maybeTyConSingleCon tycon of Just _ -> [] Nothing -> -- if cons don't match, then False - [([a_Pat, b_Pat], false_Expr)] + [([wildPat, wildPat], false_Expr)] else -- calc. and compare the tags [([a_Pat, b_Pat], untag_Expr tycon [(a_RDR,ah_RDR), (b_RDR,bh_RDR)] @@ -193,7 +203,7 @@ gen_Eq_binds tycon con_arity = length tys_needed as_needed = take con_arity as_RDRs bs_needed = take con_arity bs_RDRs - tys_needed = dataConRawArgTys data_con + tys_needed = dataConOrigArgTys data_con in ([con1_pat, con2_pat], nested_eq_expr tys_needed as_needed bs_needed) where @@ -304,7 +314,8 @@ JJQC-30-Nov-1997 gen_Ord_binds :: TyCon -> RdrNameMonoBinds gen_Ord_binds tycon - = defaulted `AndMonoBinds` compare + = compare -- `AndMonoBinds` compare + -- The default declaration in PrelBase handles this where tycon_loc = getSrcLoc tycon -------------------------------------------------------------------- @@ -370,7 +381,7 @@ gen_Ord_binds tycon con_arity = length tys_needed as_needed = take con_arity as_RDRs bs_needed = take con_arity bs_RDRs - tys_needed = dataConRawArgTys data_con + tys_needed = dataConOrigArgTys data_con nested_compare_expr [ty] [a] [b] = careful_compare_Case ty ltTag_Expr eqTag_Expr gtTag_Expr (HsVar a) (HsVar b) @@ -385,21 +396,24 @@ gen_Ord_binds tycon -- Tags are equal, no args => return EQ -------------------------------------------------------------------- +{- Not necessary: the default decls in PrelBase handle these + defaulted = foldr1 AndMonoBinds [lt, le, ge, gt, max_, min_] -lt = mk_easy_FunMonoBind mkGeneratedSrcLoc lt_RDR [a_Pat, b_Pat] [] ( +lt = mk_easy_FunMonoBind generatedSrcLoc lt_RDR [a_Pat, b_Pat] [] ( compare_Case true_Expr false_Expr false_Expr a_Expr b_Expr) -le = mk_easy_FunMonoBind mkGeneratedSrcLoc le_RDR [a_Pat, b_Pat] [] ( +le = mk_easy_FunMonoBind generatedSrcLoc le_RDR [a_Pat, b_Pat] [] ( compare_Case true_Expr true_Expr false_Expr a_Expr b_Expr) -ge = mk_easy_FunMonoBind mkGeneratedSrcLoc ge_RDR [a_Pat, b_Pat] [] ( +ge = mk_easy_FunMonoBind generatedSrcLoc ge_RDR [a_Pat, b_Pat] [] ( compare_Case false_Expr true_Expr true_Expr a_Expr b_Expr) -gt = mk_easy_FunMonoBind mkGeneratedSrcLoc gt_RDR [a_Pat, b_Pat] [] ( +gt = mk_easy_FunMonoBind generatedSrcLoc gt_RDR [a_Pat, b_Pat] [] ( compare_Case false_Expr false_Expr true_Expr a_Expr b_Expr) -max_ = mk_easy_FunMonoBind mkGeneratedSrcLoc max_RDR [a_Pat, b_Pat] [] ( +max_ = mk_easy_FunMonoBind generatedSrcLoc max_RDR [a_Pat, b_Pat] [] ( compare_Case b_Expr a_Expr a_Expr a_Expr b_Expr) -min_ = mk_easy_FunMonoBind mkGeneratedSrcLoc min_RDR [a_Pat, b_Pat] [] ( +min_ = mk_easy_FunMonoBind generatedSrcLoc min_RDR [a_Pat, b_Pat] [] ( compare_Case a_Expr b_Expr b_Expr a_Expr b_Expr) +-} \end{code} %************************************************************************ @@ -512,8 +526,8 @@ gen_Enum_binds tycon (mk_easy_App mkInt_RDR [ah_RDR]) (mk_easy_App mkInt_RDR [bh_RDR]) (HsIf (HsApp (HsApp (HsVar gt_RDR) - (HsVar a_RDR)) - (HsVar b_RDR)) + (mk_easy_App mkInt_RDR [ah_RDR])) + (mk_easy_App mkInt_RDR [bh_RDR])) (HsLit (HsInt 0)) (HsVar (maxtag_RDR tycon)) tycon_loc)) @@ -551,7 +565,7 @@ gen_Bounded_binds tycon data_con_N_RDR = qual_orig_name data_con_N ----- single-constructor-flavored: ------------- - arity = argFieldCount data_con_1 + arity = dataConSourceArity data_con_1 min_bound_1con = mk_easy_FunMonoBind tycon_loc minBound_RDR [] [] $ mk_easy_App data_con_1_RDR (nOfThem arity minBound_RDR) @@ -634,7 +648,7 @@ gen_Ix_binds tycon enum_range = mk_easy_FunMonoBind tycon_loc range_RDR - [TuplePatIn [a_Pat, b_Pat] True{-boxed-}] [] $ + [TuplePatIn [a_Pat, b_Pat] Boxed] [] $ untag_Expr tycon [(a_RDR, ah_RDR)] $ untag_Expr tycon [(b_RDR, bh_RDR)] $ HsApp (mk_easy_App map_RDR [tag2con_RDR tycon]) $ @@ -644,7 +658,7 @@ gen_Ix_binds tycon enum_index = mk_easy_FunMonoBind tycon_loc index_RDR - [AsPatIn c_RDR (TuplePatIn [a_Pat, b_Pat] True{-boxed-}), + [AsPatIn c_RDR (TuplePatIn [a_Pat, wildPat] Boxed), d_Pat] [] ( HsIf (HsPar (mk_easy_App inRange_RDR [c_RDR, d_RDR])) ( untag_Expr tycon [(a_RDR, ah_RDR)] ( @@ -664,7 +678,7 @@ gen_Ix_binds tycon enum_inRange = mk_easy_FunMonoBind tycon_loc inRange_RDR - [TuplePatIn [a_Pat, b_Pat] True{-boxed-}, c_Pat] [] ( + [TuplePatIn [a_Pat, b_Pat] Boxed, c_Pat] [] ( untag_Expr tycon [(a_RDR, ah_RDR)] ( untag_Expr tycon [(b_RDR, bh_RDR)] ( untag_Expr tycon [(c_RDR, ch_RDR)] ( @@ -683,12 +697,12 @@ gen_Ix_binds tycon data_con = case maybeTyConSingleCon tycon of -- just checking... Nothing -> panic "get_Ix_binds" - Just dc -> if (any isUnLiftedType (dataConRawArgTys dc)) then + Just dc -> if (any isUnLiftedType (dataConOrigArgTys dc)) then error ("ERROR: Can't derive Ix for a single-constructor type with primitive argument types: "++tycon_str) else dc - con_arity = argFieldCount data_con + con_arity = dataConSourceArity data_con data_con_RDR = qual_orig_name data_con as_needed = take con_arity as_RDRs @@ -701,7 +715,7 @@ gen_Ix_binds tycon -------------------------------------------------------------- single_con_range = mk_easy_FunMonoBind tycon_loc range_RDR - [TuplePatIn [con_pat as_needed, con_pat bs_needed] True{-boxed-}] [] $ + [TuplePatIn [con_pat as_needed, con_pat bs_needed] Boxed] [] $ HsDo ListComp stmts tycon_loc where stmts = zipWith3Equal "single_con_range" mk_qual as_needed bs_needed cs_needed @@ -710,45 +724,45 @@ gen_Ix_binds tycon mk_qual a b c = BindStmt (VarPatIn c) (HsApp (HsVar range_RDR) - (ExplicitTuple [HsVar a, HsVar b] True)) + (ExplicitTuple [HsVar a, HsVar b] Boxed)) tycon_loc ---------------- single_con_index = mk_easy_FunMonoBind tycon_loc index_RDR - [TuplePatIn [con_pat as_needed, con_pat bs_needed] True, + [TuplePatIn [con_pat as_needed, con_pat bs_needed] Boxed, con_pat cs_needed] [range_size] ( foldl mk_index (HsLit (HsInt 0)) (zip3 as_needed bs_needed cs_needed)) where mk_index multiply_by (l, u, i) = genOpApp ( (HsApp (HsApp (HsVar index_RDR) - (ExplicitTuple [HsVar l, HsVar u] True)) (HsVar i)) + (ExplicitTuple [HsVar l, HsVar u] Boxed)) (HsVar i)) ) plus_RDR ( genOpApp ( (HsApp (HsVar rangeSize_RDR) - (ExplicitTuple [HsVar l, HsVar u] True)) + (ExplicitTuple [HsVar l, HsVar u] Boxed)) ) times_RDR multiply_by ) range_size = mk_easy_FunMonoBind tycon_loc rangeSize_RDR - [TuplePatIn [a_Pat, b_Pat] True] [] ( + [TuplePatIn [a_Pat, b_Pat] Boxed] [] ( genOpApp ( (HsApp (HsApp (HsVar index_RDR) - (ExplicitTuple [a_Expr, b_Expr] True)) b_Expr) + (ExplicitTuple [a_Expr, b_Expr] Boxed)) b_Expr) ) plus_RDR (HsLit (HsInt 1))) ------------------ single_con_inRange = mk_easy_FunMonoBind tycon_loc inRange_RDR - [TuplePatIn [con_pat as_needed, con_pat bs_needed] True, + [TuplePatIn [con_pat as_needed, con_pat bs_needed] Boxed, con_pat cs_needed] [] ( foldl1 and_Expr (zipWith3Equal "single_con_inRange" in_range as_needed bs_needed cs_needed)) where in_range a b c = HsApp (HsApp (HsVar inRange_RDR) - (ExplicitTuple [HsVar a, HsVar b] True)) + (ExplicitTuple [HsVar a, HsVar b] Boxed)) (HsVar c) \end{code} @@ -758,12 +772,10 @@ gen_Ix_binds tycon %* * %************************************************************************ -Ignoring all the infix-ery mumbo jumbo (ToDo) - \begin{code} -gen_Read_binds :: TyCon -> RdrNameMonoBinds +gen_Read_binds :: GlobalSymbolTable -> TyCon -> RdrNameMonoBinds -gen_Read_binds tycon +gen_Read_binds gst tycon = reads_prec `AndMonoBinds` read_list where tycon_loc = getSrcLoc tycon @@ -776,55 +788,90 @@ gen_Read_binds tycon read_con_comprehensions = map read_con (tyConDataCons tycon) in - mk_easy_FunMonoBind tycon_loc readsPrec_RDR [a_Pat, b_Pat] [] ( + mk_easy_FunMonoBind tycon_loc readsPrec_RDR [zz_a_Pat, b_Pat] [] ( foldr1 append_Expr read_con_comprehensions ) where read_con data_con -- note: "b" is the string being "read" - = let - data_con_RDR = qual_orig_name data_con - data_con_str= occNameUserString (getOccName data_con) - con_arity = argFieldCount data_con - con_expr = mk_easy_App data_con_RDR as_needed - nullary_con = con_arity == 0 - labels = dataConFieldLabels data_con - lab_fields = length labels - - as_needed = take con_arity as_RDRs - bs_needed - | lab_fields == 0 = take con_arity bs_RDRs - | otherwise = take (4*lab_fields + 1) bs_RDRs - -- (label, '=' and field)*n, (n-1)*',' + '{' + '}' - con_qual - = BindStmt - (TuplePatIn [LitPatIn (mkHsString data_con_str), - d_Pat] True) - (HsApp (HsVar lex_RDR) c_Expr) - tycon_loc - - str_qual str res draw_from - = BindStmt - (TuplePatIn [LitPatIn (mkHsString str), VarPatIn res] True) - (HsApp (HsVar lex_RDR) draw_from) - tycon_loc + = HsApp ( + readParen_Expr read_paren_arg $ HsPar $ + HsLam (mk_easy_Match tycon_loc [c_Pat] [] $ + HsDo ListComp stmts tycon_loc) + ) (HsVar b_RDR) + where + data_con_RDR = qual_orig_name data_con + data_con_str = occNameUserString (getOccName data_con) + con_arity = dataConSourceArity data_con + con_expr = mk_easy_App data_con_RDR as_needed + nullary_con = con_arity == 0 + labels = dataConFieldLabels data_con + lab_fields = length labels + dc_nm = getName data_con + is_infix = isDataSymOcc (getOccName dc_nm) + + as_needed = take con_arity as_RDRs + bs_needed + | is_infix = take (1 + con_arity) bs_RDRs + | lab_fields == 0 = take con_arity bs_RDRs + | otherwise = take (4*lab_fields + 1) bs_RDRs + -- (label, '=' and field)*n, (n-1)*',' + '{' + '}' + + (as1:as2:_) = as_needed + (bs1:bs2:bs3:_) = bs_needed + + con_qual + | not is_infix = + BindStmt + (TuplePatIn [LitPatIn (mkHsString data_con_str), d_Pat] Boxed) + (HsApp (HsVar lex_RDR) c_Expr) + tycon_loc + | otherwise = + BindStmt + (TuplePatIn [LitPatIn (mkHsString data_con_str), VarPatIn bs2] Boxed) + (HsApp (HsVar lex_RDR) (HsVar bs1)) + tycon_loc + + + str_qual str res draw_from = + BindStmt + (TuplePatIn [LitPatIn (mkHsString str), VarPatIn res] Boxed) + (HsApp (HsVar lex_RDR) draw_from) + tycon_loc + + str_qual_paren str res draw_from = + BindStmt + (TuplePatIn [LitPatIn (mkHsString str), VarPatIn res] Boxed) + (HsApp (readParen_Expr true_Expr (HsVar lex_RDR)) draw_from) + tycon_loc - read_label f - = let nm = occNameUserString (getOccName (fieldLabelName f)) - in - [str_qual nm, str_qual "="] + read_label f = [rd_lab, str_qual "="] -- There might be spaces between the label and '=' - - field_quals - | lab_fields == 0 = - snd (mapAccumL mk_qual - d_Expr - (zipWithEqual "as_needed" - (\ con_field draw_from -> (mk_read_qual con_field, - draw_from)) - as_needed bs_needed)) - | otherwise = - snd $ - mapAccumL mk_qual d_Expr + where + rd_lab + | is_op = str_qual_paren nm + | otherwise = str_qual nm + + occ_nm = getOccName (fieldLabelName f) + is_op = isSymOcc occ_nm + nm = occNameUserString occ_nm + + field_quals + | is_infix = + snd (mapAccumL mk_qual_infix + c_Expr + [ (mk_read_qual lp as1, bs1, bs2) + , (mk_read_qual rp as2, bs3, bs3) + ]) + | lab_fields == 0 = -- common case. + snd (mapAccumL mk_qual + d_Expr + (zipWithEqual "as_needed" + (\ con_field draw_from -> (mk_read_qual 10 con_field, + draw_from)) + as_needed bs_needed)) + | otherwise = + snd $ + mapAccumL mk_qual d_Expr (zipEqual "bs_needed" ((str_qual "{": concat ( @@ -835,37 +882,45 @@ gen_Read_binds tycon -- The labels (map read_label labels) -- The fields - (map mk_read_qual as_needed))) ++ [str_qual "}"]) + (map (mk_read_qual 10) as_needed))) ++ [str_qual "}"]) bs_needed) - mk_qual draw_from (f, str_left) - = (HsVar str_left, -- what to draw from down the line... - f str_left draw_from) + mk_qual_infix draw_from (f, str_left, str_left2) = + (HsVar str_left2, -- what to draw from down the line... + f str_left draw_from) - mk_read_qual con_field res draw_from = - BindStmt - (TuplePatIn [VarPatIn con_field, VarPatIn res] True) - (HsApp (HsApp (HsVar readsPrec_RDR) (HsLit (HsInt 10))) draw_from) - tycon_loc + mk_qual draw_from (f, str_left) = + (HsVar str_left, -- what to draw from down the line... + f str_left draw_from) - result_expr = ExplicitTuple [con_expr, if null bs_needed - then d_Expr - else HsVar (last bs_needed)] True + mk_read_qual p con_field res draw_from = + BindStmt + (TuplePatIn [VarPatIn con_field, VarPatIn res] Boxed) + (HsApp (HsApp (HsVar readsPrec_RDR) (HsLit (HsInt p))) draw_from) + tycon_loc - stmts = con_qual:field_quals ++ [ReturnStmt result_expr] - - read_paren_arg - = if nullary_con then -- must be False (parens are surely optional) - false_Expr - else -- parens depend on precedence... - HsPar (genOpApp a_Expr gt_RDR (HsLit (HsInt 9))) - in - HsApp ( - readParen_Expr read_paren_arg $ HsPar $ - HsLam (mk_easy_Match tycon_loc [c_Pat] [] $ - HsDo ListComp stmts tycon_loc) - ) (HsVar b_RDR) + result_expr = ExplicitTuple [con_expr, if null bs_needed + then d_Expr + else HsVar (last bs_needed)] Boxed + + [lp,rp] = getLRPrecs is_infix gst dc_nm + quals + | is_infix = let (h:t) = field_quals in (h:con_qual:t) + | otherwise = con_qual:field_quals + + stmts = quals ++ [ReturnStmt result_expr] + + {- + c.f. Figure 18 in Haskell 1.1 report. + -} + paren_prec_limit + | not is_infix = fromInt maxPrecedence + | otherwise = getFixity gst dc_nm + + read_paren_arg -- parens depend on precedence... + | nullary_con = false_Expr -- it's optional. + | otherwise = HsPar (genOpApp zz_a_Expr gt_RDR (HsLit (HsInt paren_prec_limit))) \end{code} %************************************************************************ @@ -874,12 +929,10 @@ gen_Read_binds tycon %* * %************************************************************************ -Ignoring all the infix-ery mumbo jumbo (ToDo) - \begin{code} -gen_Show_binds :: TyCon -> RdrNameMonoBinds +gen_Show_binds :: GlobalSymbolTable -> TyCon -> RdrNameMonoBinds -gen_Show_binds tycon +gen_Show_binds gst tycon = shows_prec `AndMonoBinds` show_list where tycon_loc = getSrcLoc tycon @@ -887,54 +940,82 @@ gen_Show_binds tycon show_list = mk_easy_FunMonoBind tycon_loc showList_RDR [] [] (HsApp (HsVar showList___RDR) (HsPar (HsApp (HsVar showsPrec_RDR) (HsLit (HsInt 0))))) ----------------------------------------------------------------------- - shows_prec - = mk_FunMonoBind tycon_loc showsPrec_RDR (map pats_etc (tyConDataCons tycon)) + shows_prec = mk_FunMonoBind tycon_loc showsPrec_RDR (map pats_etc (tyConDataCons tycon)) where pats_etc data_con - = let - data_con_RDR = qual_orig_name data_con - con_arity = argFieldCount data_con - bs_needed = take con_arity bs_RDRs - con_pat = ConPatIn data_con_RDR (map VarPatIn bs_needed) - nullary_con = con_arity == 0 - labels = dataConFieldLabels data_con - lab_fields = length labels - - show_con - = let nm = occNameUserString (getOccName data_con) - space_ocurly_maybe - | nullary_con = "" - | lab_fields == 0 = " " - | otherwise = "{" - - in - mk_showString_app (nm ++ space_ocurly_maybe) - - show_all con fs - = let - ccurly_maybe - | lab_fields > 0 = [mk_showString_app "}"] - | otherwise = [] - in - con:fs ++ ccurly_maybe - - show_thingies = show_all show_con real_show_thingies_with_labs + | nullary_con = -- skip the showParen junk... + ASSERT(null bs_needed) + ([wildPat, con_pat], show_con) + | otherwise = + ([a_Pat, con_pat], + showParen_Expr (HsPar (genOpApp a_Expr ge_RDR (HsLit (HsInt paren_prec_limit)))) + (HsPar (nested_compose_Expr show_thingies))) + where + data_con_RDR = qual_orig_name data_con + con_arity = dataConSourceArity data_con + bs_needed = take con_arity bs_RDRs + con_pat = ConPatIn data_con_RDR (map VarPatIn bs_needed) + nullary_con = con_arity == 0 + labels = dataConFieldLabels data_con + lab_fields = length labels + + dc_nm = getName data_con + dc_occ_nm = getOccName data_con + dc_occ_nm_str = occNameUserString dc_occ_nm + + is_infix = isDataSymOcc dc_occ_nm + + + show_con + | is_infix = mk_showString_app (' ':dc_occ_nm_str) + | otherwise = mk_showString_app (dc_occ_nm_str ++ space_ocurly_maybe) + where + space_ocurly_maybe + | nullary_con = "" + | lab_fields == 0 = " " + | otherwise = "{" + + + show_all con fs@(x:xs) + | is_infix = x:con:xs + | otherwise = + let + ccurly_maybe + | lab_fields > 0 = [mk_showString_app "}"] + | otherwise = [] + in + con:fs ++ ccurly_maybe + + show_thingies = show_all show_con real_show_thingies_with_labs - show_label l - = let nm = occNameUserString (getOccName (fieldLabelName l)) - in - mk_showString_app (nm ++ "=") + show_label l = mk_showString_app (the_name ++ "=") + where + occ_nm = getOccName (fieldLabelName l) + -- legal, but rare. + is_op = isSymOcc occ_nm + the_name + | is_op = '(':nm ++ ")" + | otherwise = nm + + nm = occNameUserString occ_nm + + + mk_showString_app str = HsApp (HsVar showString_RDR) + (HsLit (mkHsString str)) - mk_showString_app str = HsApp (HsVar showString_RDR) - (HsLit (mkHsString str)) + prec_cons = getLRPrecs is_infix gst dc_nm - real_show_thingies = + real_show_thingies + | is_infix = + [ HsApp (HsApp (HsVar showsPrec_RDR) (HsLit (HsInt p))) (HsVar b) + | (p,b) <- zip prec_cons bs_needed ] + | otherwise = [ HsApp (HsApp (HsVar showsPrec_RDR) (HsLit (HsInt 10))) (HsVar b) | b <- bs_needed ] - real_show_thingies_with_labs - | lab_fields == 0 = intersperse (HsVar showSpace_RDR) real_show_thingies - | otherwise = --Assumption: no of fields == no of labelled fields + real_show_thingies_with_labs + | lab_fields == 0 = intersperse (HsVar showSpace_RDR) real_show_thingies + | otherwise = --Assumption: no of fields == no of labelled fields -- (and in same order) concat $ intersperse ([mk_showString_app ","]) $ -- Using SLIT()s containing ,s spells trouble. @@ -943,17 +1024,59 @@ gen_Show_binds tycon (map show_label labels) real_show_thingies + {- + c.f. Figure 16 and 17 in Haskell 1.1 report + -} + paren_prec_limit + | not is_infix = fromInt maxPrecedence + 1 + | otherwise = getFixity gst dc_nm + 1 - in - if nullary_con then -- skip the showParen junk... - ASSERT(null bs_needed) - ([a_Pat, con_pat], show_con) - else - ([a_Pat, con_pat], - showParen_Expr (HsPar (genOpApp a_Expr ge_RDR (HsLit (HsInt 10)))) - (HsPar (nested_compose_Expr show_thingies))) \end{code} +\begin{code} +getLRPrecs :: Bool -> GlobalSymbolTable -> Name -> [Integer] +getLRPrecs is_infix gst nm = [lp, rp] + where + {- + Figuring out the fixities of the arguments to a constructor, + cf. Figures 16-18 in Haskell 1.1 report. + -} + (con_left_assoc, con_right_assoc) = isLRAssoc gst nm + paren_con_prec = getFixity gst nm + maxPrec = fromInt maxPrecedence + + lp + | not is_infix = maxPrec + 1 + | con_left_assoc = paren_con_prec + | otherwise = paren_con_prec + 1 + + rp + | not is_infix = maxPrec + 1 + | con_right_assoc = paren_con_prec + | otherwise = paren_con_prec + 1 + +getFixity :: GlobalSymbolTable -> Name -> Integer +getFixity gst nm + = case lookupFixityEnv gst nm of + Just (Fixity x _) -> fromInt x + other -> pprPanic "TcGenDeriv.getFixity" (ppr nm) + +isLRAssoc :: GlobalSymbolTable -> Name -> (Bool, Bool) +isLRAssoc fixs_assoc nm = + case lookupFixityEnv fixs_assoc nm of + Just (Fixity _ InfixN) -> (False, False) + Just (Fixity _ InfixR) -> (False, True) + Just (Fixity _ InfixL) -> (True, False) + other -> pprPanic "TcGenDeriv.isLRAssoc" (ppr nm) + +isInfixOccName :: String -> Bool +isInfixOccName str = + case str of + (':':_) -> True + _ -> False +\end{code} + + %************************************************************************ %* * \subsection{Generating extra binds (@con2tag@ and @tag2con@)} @@ -982,25 +1105,28 @@ gen_tag_n_con_monobind -> RdrNameMonoBinds gen_tag_n_con_monobind (rdr_name, tycon, GenCon2Tag) + | lots_of_constructors + = mk_FunMonoBind (getSrcLoc tycon) rdr_name + [([VarPatIn a_RDR], HsApp getTag_Expr a_Expr)] + + | otherwise = mk_FunMonoBind (getSrcLoc tycon) rdr_name (map mk_stuff (tyConDataCons tycon)) + where - mk_stuff :: DataCon -> ([RdrNamePat], RdrNameHsExpr) + lots_of_constructors = tyConFamilySize tycon > mAX_FAMILY_SIZE_FOR_VEC_RETURNS + mk_stuff :: DataCon -> ([RdrNamePat], RdrNameHsExpr) mk_stuff var = ([pat], HsLit (HsIntPrim (toInteger ((dataConTag var) - fIRST_TAG)))) where - pat = ConPatIn var_RDR (nOfThem (argFieldCount var) WildPatIn) + pat = ConPatIn var_RDR (nOfThem (dataConSourceArity var) WildPatIn) var_RDR = qual_orig_name var gen_tag_n_con_monobind (rdr_name, tycon, GenTag2Con) - = mk_FunMonoBind (getSrcLoc tycon) rdr_name (map mk_stuff (tyConDataCons tycon) ++ - [([WildPatIn], impossible_Expr)]) - where - mk_stuff :: DataCon -> ([RdrNamePat], RdrNameHsExpr) - mk_stuff var = ([lit_pat], HsVar var_RDR) - where - lit_pat = ConPatIn mkInt_RDR [LitPatIn (HsIntPrim (toInteger ((dataConTag var) - fIRST_TAG)))] - var_RDR = qual_orig_name var + = mk_FunMonoBind (getSrcLoc tycon) rdr_name + [([ConPatIn mkInt_RDR [VarPatIn a_RDR]], + ExprWithTySig (HsApp tagToEnum_Expr a_Expr) + (HsTyVar (qual_orig_name tycon)))] gen_tag_n_con_monobind (rdr_name, tycon, GenMaxTag) = mk_easy_FunMonoBind (getSrcLoc tycon) @@ -1040,10 +1166,7 @@ mk_easy_FunMonoBind loc fun pats binds expr = FunMonoBind fun False{-not infix-} [mk_easy_Match loc pats binds expr] loc mk_easy_Match loc pats binds expr - = mk_match loc pats expr (mkbind binds) - where - mkbind [] = EmptyBinds - mkbind bs = MonoBind (foldr1 AndMonoBinds bs) [] Recursive + = mk_match loc pats expr (mkMonoBind (andMonoBindList binds) [] Recursive) -- The renamer expects everything in its input to be a -- "recursive" MonoBinds, and it is its job to sort things out -- from there. @@ -1094,10 +1217,10 @@ cmp_eq_Expr a b = HsApp (HsApp (HsVar cmp_eq_RDR) a) b compare_gen_Case fun lt eq gt a b = HsCase (HsPar (HsApp (HsApp (HsVar fun) a) b)) {-of-} - [mkSimpleMatch [ConPatIn ltTag_RDR []] lt Nothing mkGeneratedSrcLoc, - mkSimpleMatch [ConPatIn eqTag_RDR []] eq Nothing mkGeneratedSrcLoc, - mkSimpleMatch [ConPatIn gtTag_RDR []] gt Nothing mkGeneratedSrcLoc] - mkGeneratedSrcLoc + [mkSimpleMatch [ConPatIn ltTag_RDR []] lt Nothing generatedSrcLoc, + mkSimpleMatch [ConPatIn eqTag_RDR []] eq Nothing generatedSrcLoc, + mkSimpleMatch [ConPatIn gtTag_RDR []] gt Nothing generatedSrcLoc] + generatedSrcLoc careful_compare_Case ty lt eq gt a b = if not (isUnboxedType ty) then @@ -1106,8 +1229,8 @@ careful_compare_Case ty lt eq gt a b else -- we have to do something special for primitive things... HsIf (genOpApp a relevant_eq_op b) eq - (HsIf (genOpApp a relevant_lt_op b) lt gt mkGeneratedSrcLoc) - mkGeneratedSrcLoc + (HsIf (genOpApp a relevant_lt_op b) lt gt generatedSrcLoc) + generatedSrcLoc where relevant_eq_op = assoc_ty_id eq_op_tbl ty relevant_lt_op = assoc_ty_id lt_op_tbl ty @@ -1156,17 +1279,12 @@ eq_Expr ty a b \end{code} \begin{code} -argFieldCount :: DataCon -> Int -- Works on data and newtype constructors -argFieldCount con = length (dataConRawArgTys con) -\end{code} - -\begin{code} untag_Expr :: TyCon -> [(RdrName, RdrName)] -> RdrNameHsExpr -> RdrNameHsExpr untag_Expr tycon [] expr = expr untag_Expr tycon ((untag_this, put_tag_here) : more) expr = HsCase (HsPar (HsApp (con2tag_Expr tycon) (HsVar untag_this))) {-of-} - [mkSimpleMatch [VarPatIn put_tag_here] (untag_Expr tycon more expr) Nothing mkGeneratedSrcLoc] - mkGeneratedSrcLoc + [mkSimpleMatch [VarPatIn put_tag_here] (untag_Expr tycon more expr) Nothing generatedSrcLoc] + generatedSrcLoc cmp_tags_Expr :: RdrName -- Comparison op -> RdrName -> RdrName -- Things to compare @@ -1175,7 +1293,7 @@ cmp_tags_Expr :: RdrName -- Comparison op -> RdrNameHsExpr cmp_tags_Expr op a b true_case false_case - = HsIf (genOpApp (HsVar a) op (HsVar b)) true_case false_case mkGeneratedSrcLoc + = HsIf (genOpApp (HsVar a) op (HsVar b)) true_case false_case generatedSrcLoc enum_from_to_Expr :: RdrNameHsExpr -> RdrNameHsExpr @@ -1236,13 +1354,14 @@ parenify e = HsPar e -- For some reason the renamer doesn't reassociate it right, and I can't -- be bothered to find out why just now. -genOpApp e1 op e2 = mkOpApp e1 op e2 +genOpApp e1 op e2 = mkHsOpApp e1 op e2 \end{code} \begin{code} qual_orig_name n = nameRdrName (getName n) -varUnqual n = mkSrcUnqual varName n +varUnqual n = mkUnqual varName n +zz_a_RDR = varUnqual SLIT("_a") a_RDR = varUnqual SLIT("a") b_RDR = varUnqual SLIT("b") c_RDR = varUnqual SLIT("c") @@ -1260,6 +1379,7 @@ cs_RDRs = [ varUnqual (_PK_ ("c"++show i)) | i <- [(1::Int) .. ] ] mkHsString s = HsString (_PK_ s) +zz_a_Expr = HsVar zz_a_RDR a_Expr = HsVar a_RDR b_Expr = HsVar b_RDR c_Expr = HsVar c_RDR @@ -1270,8 +1390,12 @@ gtTag_Expr = HsVar gtTag_RDR false_Expr = HsVar false_RDR true_Expr = HsVar true_RDR +getTag_Expr = HsVar getTag_RDR +tagToEnum_Expr = HsVar tagToEnumH_RDR con2tag_Expr tycon = HsVar (con2tag_RDR tycon) +wildPat = WildPatIn +zz_a_Pat = VarPatIn zz_a_RDR a_Pat = VarPatIn a_RDR b_Pat = VarPatIn b_RDR c_Pat = VarPatIn c_RDR