import HsSyn ( InPat(..), HsExpr(..), MonoBinds(..),
Match(..), GRHSs(..), Stmt(..), HsLit(..),
HsBinds(..), StmtCtxt(..), HsType(..),
- unguardedRHS, mkSimpleMatch
+ unguardedRHS, mkSimpleMatch, mkMonoBind, andMonoBindList
)
-import RdrHsSyn ( mkOpApp, RdrNameMonoBinds, RdrNameHsExpr, RdrNamePat )
+import RdrHsSyn ( mkHsOpApp, RdrNameMonoBinds, RdrNameHsExpr, RdrNamePat )
import RdrName ( RdrName, mkSrcUnqual )
-import RnMonad ( Fixities )
-import BasicTypes ( RecFlag(..), Fixity(..), FixityDirection(..) )
+import RnMonad ( FixityEnv, lookupFixity )
+import BasicTypes ( RecFlag(..), Fixity(..), FixityDirection(..)
+ , maxPrecedence
+ , Boxity(..)
+ )
import FieldLabel ( fieldLabelName )
import DataCon ( isNullaryDataCon, dataConTag,
- dataConRawArgTys, fIRST_TAG,
- DataCon, ConTag,
+ dataConOrigArgTys, dataConSourceArity, fIRST_TAG,
+ DataCon,
dataConFieldLabels )
import Name ( getOccString, getOccName, getSrcLoc, occNameString,
occNameUserString, nameRdrName, varName,
- OccName, Name, NamedThing(..), NameSpace
+ Name, NamedThing(..),
+ isDataSymOcc, isSymOcc
)
-import PrimOp ( PrimOp(..) )
import PrelInfo -- Lots of RdrNames
import SrcLoc ( mkGeneratedSrcLoc, SrcLoc )
import TyCon ( TyCon, isNewTyCon, tyConDataCons, isEnumerationTyCon,
import Util ( mapAccumL, zipEqual, zipWithEqual,
zipWith3Equal, nOfThem )
import Panic ( panic, assertPanic )
-import Maybes ( maybeToBool, assocMaybe )
+import Maybes ( maybeToBool )
import Constants
import List ( partition, intersperse )
+
+#if __GLASGOW_HASKELL__ >= 404
+import GlaExts ( fromInt )
+#endif
\end{code}
%************************************************************************
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
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)
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)
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]) $
enum_index
= mk_easy_FunMonoBind tycon_loc index_RDR
- [AsPatIn c_RDR (TuplePatIn [a_Pat, wildPat] 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)] (
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)] (
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
--------------------------------------------------------------
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
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}
%************************************************************************
\begin{code}
-gen_Read_binds :: Fixities -> TyCon -> RdrNameMonoBinds
+gen_Read_binds :: FixityEnv -> TyCon -> RdrNameMonoBinds
-gen_Read_binds fixities tycon
+gen_Read_binds fixity_env tycon
= reads_prec `AndMonoBinds` read_list
where
tycon_loc = getSrcLoc 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
where
data_con_RDR = qual_orig_name data_con
data_con_str = occNameUserString (getOccName data_con)
- con_arity = argFieldCount 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 = 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
con_qual
| not is_infix =
BindStmt
- (TuplePatIn [LitPatIn (mkHsString data_con_str), d_Pat] True)
+ (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] True)
+ (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] True)
+ (TuplePatIn [LitPatIn (mkHsString str), VarPatIn res] Boxed)
(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] Boxed)
+ (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 =
mk_read_qual p con_field res draw_from =
BindStmt
- (TuplePatIn [VarPatIn con_field, VarPatIn res] True)
+ (TuplePatIn [VarPatIn con_field, VarPatIn res] Boxed)
(HsApp (HsApp (HsVar readsPrec_RDR) (HsLit (HsInt p))) draw_from)
tycon_loc
result_expr = ExplicitTuple [con_expr, if null bs_needed
then d_Expr
- else HsVar (last bs_needed)] True
+ else HsVar (last bs_needed)] Boxed
- [lp,rp] = getLRPrecs fixities dc_nm
+ [lp,rp] = getLRPrecs is_infix fixity_env 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
- | otherwise = getFixity fixities dc_nm
+ | not is_infix = fromInt maxPrecedence
+ | otherwise = getFixity fixity_env dc_nm
read_paren_arg -- parens depend on precedence...
| nullary_con = false_Expr -- it's optional.
- | otherwise = HsPar (genOpApp _a_Expr gt_RDR (HsLit (HsInt paren_prec_limit)))
+ | otherwise = HsPar (genOpApp zz_a_Expr gt_RDR (HsLit (HsInt paren_prec_limit)))
\end{code}
%************************************************************************
%************************************************************************
\begin{code}
-gen_Show_binds :: Fixities -> TyCon -> RdrNameMonoBinds
+gen_Show_binds :: FixityEnv -> TyCon -> RdrNameMonoBinds
-gen_Show_binds fixs_assoc tycon
+gen_Show_binds fixity_env tycon
= shows_prec `AndMonoBinds` show_list
where
tycon_loc = getSrcLoc tycon
([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
- con_arity = argFieldCount 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_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 fixity_env dc_nm
real_show_thingies
| is_infix =
(map show_label labels)
real_show_thingies
- (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 fixity_env dc_nm + 1
\end{code}
\begin{code}
-getLRPrecs :: Fixities -> Name -> [Integer]
-getLRPrecs fixs_assoc nm = [lp, rp]
+getLRPrecs :: Bool -> FixityEnv -> Name -> [Integer]
+getLRPrecs is_infix fixity_env 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 fixity_env nm
+ paren_con_prec = getFixity fixity_env 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 :: FixityEnv -> Name -> Integer
+getFixity fixity_env nm = case lookupFixity fixity_env nm of
+ Fixity x _ -> fromInt x
-getFixity :: Fixities -> Name -> Integer
-getFixity fixs_assoc nm =
- case assocMaybe fixs_assoc nm of
- Nothing -> 9
- Just (Fixity x _) -> fromInt x + 1
-
-isLRAssoc :: Fixities -> Name -> (Bool, Bool)
+isLRAssoc :: FixityEnv -> 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)
isInfixOccName :: String -> Bool
isInfixOccName str =
case str of
(':':_) -> True
_ -> False
-
\end{code}
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
[([ConPatIn mkInt_RDR [VarPatIn a_RDR]],
ExprWithTySig (HsApp tagToEnum_Expr a_Expr)
- (MonoTyVar (qual_orig_name tycon)))]
+ (HsTyVar (qual_orig_name tycon)))]
gen_tag_n_con_monobind (rdr_name, tycon, GenMaxTag)
= mk_easy_FunMonoBind (getSrcLoc tycon)
= 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.
\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
-- 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
-_a_RDR = varUnqual SLIT("_a")
+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)
-_a_Expr = HsVar _a_RDR
+zz_a_Expr = HsVar zz_a_RDR
a_Expr = HsVar a_RDR
b_Expr = HsVar b_RDR
c_Expr = HsVar c_RDR
con2tag_Expr tycon = HsVar (con2tag_RDR tycon)
wildPat = WildPatIn
-_a_Pat = VarPatIn _a_RDR
+zz_a_Pat = VarPatIn zz_a_RDR
a_Pat = VarPatIn a_RDR
b_Pat = VarPatIn b_RDR
c_Pat = VarPatIn c_RDR