import HsSyn ( InPat(..), HsExpr(..), MonoBinds(..),
Match(..), GRHSs(..), Stmt(..), HsLit(..),
- HsBinds(..), StmtCtxt(..),
+ HsBinds(..), StmtCtxt(..), HsType(..),
unguardedRHS, mkSimpleMatch
)
import RdrHsSyn ( mkOpApp, RdrNameMonoBinds, RdrNameHsExpr, RdrNamePat )
import RdrName ( RdrName, mkSrcUnqual )
import RnMonad ( Fixities )
-import BasicTypes ( RecFlag(..), Fixity(..), FixityDirection(..) )
+import BasicTypes ( RecFlag(..), Fixity(..), FixityDirection(..)
+ , maxPrecedence, defaultFixity
+ )
import FieldLabel ( fieldLabelName )
import DataCon ( isNullaryDataCon, dataConTag,
dataConRawArgTys, fIRST_TAG,
dataConFieldLabels )
import Name ( getOccString, getOccName, getSrcLoc, occNameString,
occNameUserString, nameRdrName, varName,
- OccName, Name, NamedThing(..), NameSpace
+ OccName, Name, NamedThing(..), NameSpace,
+ isDataSymOcc, isSymOcc
)
import PrimOp ( PrimOp(..) )
floatPrimTy, doublePrimTy
)
import Util ( mapAccumL, zipEqual, zipWithEqual,
- zipWith3Equal, nOfThem )
+ zipWith3Equal, nOfThem, assocDefault )
import Panic ( panic, assertPanic )
-import Maybes ( maybeToBool, assocMaybe )
+import Maybes ( maybeToBool )
import Constants
import List ( partition, intersperse )
+import Char ( isAlpha )
\end{code}
%************************************************************************
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)]
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
--------------------------------------------------------------------
-- 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] [] (
compare_Case b_Expr a_Expr a_Expr a_Expr b_Expr)
min_ = mk_easy_FunMonoBind mkGeneratedSrcLoc min_RDR [a_Pat, b_Pat] [] (
compare_Case a_Expr b_Expr b_Expr a_Expr b_Expr)
+-}
\end{code}
%************************************************************************
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] True{-boxed-}),
d_Pat] [] (
HsIf (HsPar (mk_easy_App inRange_RDR [c_RDR, d_RDR])) (
untag_Expr tycon [(a_RDR, ah_RDR)] (
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
labels = dataConFieldLabels data_con
lab_fields = length labels
dc_nm = getName data_con
- is_infix = isInfixOccName data_con_str
+ is_infix = isDataSymOcc (getOccName dc_nm)
- as_needed = take con_arity as_RDRs
+ 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
(HsApp (HsVar lex_RDR) draw_from)
tycon_loc
- read_label f = [str_qual nm, str_qual "="]
+ str_qual_paren str res draw_from =
+ BindStmt
+ (TuplePatIn [LitPatIn (mkHsString str), VarPatIn res] True)
+ (HsApp (readParen_Expr true_Expr (HsVar lex_RDR)) draw_from)
+ tycon_loc
+
+ read_label f = [rd_lab, str_qual "="]
-- There might be spaces between the label and '='
where
- nm = occNameUserString (getOccName (fieldLabelName f))
+ 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 =
])
| lab_fields == 0 = -- common case.
snd (mapAccumL mk_qual
- c_Expr
+ 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 c_Expr
+ mapAccumL mk_qual d_Expr
(zipEqual "bs_needed"
((str_qual "{":
concat (
then d_Expr
else HsVar (last bs_needed)] True
- [lp,rp] = getLRPrecs fixities dc_nm
+ [lp,rp] = getLRPrecs is_infix fixities dc_nm
quals
| is_infix = let (h:t) = field_quals in (h:con_qual:t)
stmts = quals ++ [ReturnStmt result_expr]
+ {-
+ c.f. Figure 18 in Haskell 1.1 report.
+ -}
paren_prec_limit
- | not is_infix = 9
+ | not is_infix = fromInt maxPrecedence
| otherwise = getFixity fixities dc_nm
- read_paren_arg = -- parens depend on precedence...
- HsPar (genOpApp a_Expr gt_RDR (HsLit (HsInt paren_prec_limit)))
-
+ 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}
%************************************************************************
pats_etc data_con
| nullary_con = -- skip the showParen junk...
ASSERT(null bs_needed)
- ([a_Pat, con_pat], show_con)
+ ([wildPat, con_pat], show_con)
| otherwise =
([a_Pat, con_pat],
- showParen_Expr (HsPar (genOpApp a_Expr gt_RDR (HsLit (HsInt paren_prec_limit))))
+ 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
labels = dataConFieldLabels data_con
lab_fields = length labels
- dc_occ_nm = occNameUserString (getOccName data_con)
- dc_nm = getName data_con
+ dc_nm = getName data_con
+ dc_occ_nm = getOccName data_con
+ dc_occ_nm_str = occNameUserString dc_occ_nm
- is_infix = isInfixOccName dc_occ_nm
+ is_infix = isDataSymOcc dc_occ_nm
show_con
- | is_infix = mk_showString_app (' ':dc_occ_nm)
- | otherwise =
- let
+ | 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 = "{"
- in
- mk_showString_app (dc_occ_nm ++ space_ocurly_maybe)
+
show_all con fs@(x:xs)
| is_infix = x:con:xs
show_thingies = show_all show_con real_show_thingies_with_labs
- show_label l = mk_showString_app (nm ++ "=")
+ show_label l = mk_showString_app (the_name ++ "=")
where
- nm = occNameUserString (getOccName (fieldLabelName l))
+ 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))
- prec_cons = getLRPrecs fixs_assoc dc_nm
+ prec_cons = getLRPrecs is_infix fixs_assoc dc_nm
real_show_thingies
| is_infix =
(con_left_assoc, con_right_assoc) = isLRAssoc fixs_assoc dc_nm
+ {-
+ c.f. Figure 16 and 17 in Haskell 1.1 report
+ -}
paren_prec_limit
- | not is_infix = 9
- | otherwise = getFixity fixs_assoc dc_nm
+ | not is_infix = fromInt maxPrecedence + 1
+ | otherwise = getFixity fixs_assoc dc_nm + 1
\end{code}
\begin{code}
-getLRPrecs :: Fixities -> Name -> [Integer]
-getLRPrecs fixs_assoc nm = [lp, rp]
+getLRPrecs :: Bool -> Fixities -> Name -> [Integer]
+getLRPrecs is_infix fixs_assoc nm = [lp, rp]
where
- ( con_left_assoc, con_right_assoc) = isLRAssoc fixs_assoc nm
- paren_prec_limit = 9
+ {-
+ 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 fixs_assoc nm
+ paren_con_prec = getFixity fixs_assoc nm
+ maxPrec = fromInt maxPrecedence
lp
- | con_left_assoc = paren_prec_limit
- | otherwise = paren_prec_limit + 1
+ | not is_infix = maxPrec + 1
+ | con_left_assoc = paren_con_prec
+ | otherwise = paren_con_prec + 1
rp
- | con_right_assoc = paren_prec_limit
- | otherwise = paren_prec_limit + 1
+ | not is_infix = maxPrec + 1
+ | con_right_assoc = paren_con_prec
+ | otherwise = paren_con_prec + 1
-
getFixity :: Fixities -> Name -> Integer
getFixity fixs_assoc nm =
- case assocMaybe fixs_assoc nm of
- Nothing -> 9
- Just (Fixity x _) -> fromInt x + 1
+ case lookupFixity fixs_assoc nm of
+ Fixity x _ -> fromInt x
isLRAssoc :: Fixities -> Name -> (Bool, Bool)
isLRAssoc fixs_assoc nm =
- case assocMaybe fixs_assoc nm of
- Just (Fixity _ InfixL) -> (True, False)
- Just (Fixity _ InfixR) -> (False, True)
- _ -> (False, False)
+ case lookupFixity fixs_assoc nm of
+ Fixity _ InfixN -> (False, False)
+ Fixity _ InfixR -> (False, True)
+ Fixity _ InfixL -> (True, False)
+
+lookupFixity :: Fixities -> Name -> Fixity
+lookupFixity fixs_assoc nm = assocDefault defaultFixity fixs_assoc nm
isInfixOccName :: String -> Bool
isInfixOccName str =
gen_tag_n_con_monobind (rdr_name, tycon, GenCon2Tag)
| lots_of_constructors
= mk_FunMonoBind (getSrcLoc tycon) rdr_name
- [([VarPatIn a_RDR], HsApp dataToTag_Expr a_Expr)]
+ [([VarPatIn a_RDR], HsApp getTag_Expr a_Expr)]
| otherwise
= mk_FunMonoBind (getSrcLoc tycon) rdr_name (map mk_stuff (tyConDataCons tycon))
pat = ConPatIn var_RDR (nOfThem (argFieldCount 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)
+ (MonoTyVar (qual_orig_name tycon)))]
gen_tag_n_con_monobind (rdr_name, tycon, GenMaxTag)
= mk_easy_FunMonoBind (getSrcLoc tycon)
qual_orig_name n = nameRdrName (getName n)
varUnqual n = mkSrcUnqual varName n
+zz_a_RDR = varUnqual SLIT("_a")
a_RDR = varUnqual SLIT("a")
b_RDR = varUnqual SLIT("b")
c_RDR = varUnqual SLIT("c")
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
false_Expr = HsVar false_RDR
true_Expr = HsVar true_RDR
-dataToTag_Expr = HsVar dataToTagH_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
d_Pat = VarPatIn d_RDR
-tag2con_RDR, maxtag_RDR :: TyCon -> RdrName
+con2tag_RDR, tag2con_RDR, maxtag_RDR :: TyCon -> RdrName
con2tag_RDR tycon = varUnqual (_PK_ ("con2tag_" ++ occNameString (getOccName tycon) ++ "#"))
tag2con_RDR tycon = varUnqual (_PK_ ("tag2con_" ++ occNameString (getOccName tycon) ++ "#"))
projects / ghc-hetmet.git / blobdiff