diff options
| author | Adam Gundry <adam@well-typed.com> | 2014-10-18 17:29:12 +0100 |
|---|---|---|
| committer | Adam Gundry <adam@well-typed.com> | 2014-10-21 09:58:59 +0100 |
| commit | c975175efcf733062c2e3fb1821dbf72f466b031 (patch) | |
| tree | c5b1a1e777c856d04d7a706f82cda53fd351ef4e /compiler/parser/RdrHsSyn.lhs | |
| parent | 1942fd6a8414d5664f3c9f6d1e6e39ca5265ef21 (diff) | |
| download | haskell-c975175efcf733062c2e3fb1821dbf72f466b031.tar.gz | |
ghc: implement OverloadedRecordFieldswip/orf-new
This fully implements the new ORF extension, developed during the Google
Summer of Code 2013, and as described on the wiki:
https://ghc.haskell.org/trac/ghc/wiki/Records/OverloadedRecordFields
This also updates the Haddock submodule.
Diffstat (limited to 'compiler/parser/RdrHsSyn.lhs')
| -rw-r--r-- | compiler/parser/RdrHsSyn.lhs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/compiler/parser/RdrHsSyn.lhs b/compiler/parser/RdrHsSyn.lhs index e6969e7422..57830c21c9 100644 --- a/compiler/parser/RdrHsSyn.lhs +++ b/compiler/parser/RdrHsSyn.lhs @@ -215,7 +215,9 @@ mkDataFamInst loc new_or_data cType (L _ (mcxt, tycl_hdr)) ksig data_cons maybe_ = do { (tc, tparams) <- checkTyClHdr tycl_hdr ; defn <- mkDataDefn new_or_data cType mcxt ksig data_cons maybe_deriv ; return (L loc (DataFamInstD ( - DataFamInstDecl { dfid_tycon = tc, dfid_pats = mkHsWithBndrs tparams + DataFamInstDecl { dfid_tycon = tc + , dfid_rep_tycon = placeHolderRepTyCon + , dfid_pats = mkHsWithBndrs tparams , dfid_defn = defn, dfid_fvs = placeHolderNames }))) } mkTyFamInst :: SrcSpan @@ -1196,7 +1198,7 @@ mkModuleImpExp name subs = | isVarNameSpace (rdrNameSpace name) -> IEVar name | otherwise -> IEThingAbs nameT ImpExpAll -> IEThingAll nameT - ImpExpList xs -> IEThingWith nameT xs + ImpExpList xs -> IEThingWith nameT xs [] where nameT = setRdrNameSpace name tcClsName |