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 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,
+ dataConOrigArgTys, dataConSourceArity, fIRST_TAG,
DataCon, ConTag,
dataConFieldLabels )
import Name ( getOccString, getOccName, getSrcLoc, occNameString,
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 )
+
+#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)
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
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
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...
| 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}
%************************************************************************
([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
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)
- Just (Fixity _ _) -> (False, False)
- _ -> (True, 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 =
+ 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)
= 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
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