diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2013-02-14 14:39:14 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2013-02-14 14:39:14 +0000 |
| commit | 95724776ea3da00339e7171e85f8b42cd7228f43 (patch) | |
| tree | 2aacc362e79040df3902c67fb1e3e139ed6569fc /compiler/prelude | |
| parent | 30cf978ca33ddca8ae4db9045dd6b06f6246e5e0 (diff) | |
| parent | 3c1fd687625d4ce026a327c7d2388661628f7c63 (diff) | |
| download | haskell-95724776ea3da00339e7171e85f8b42cd7228f43.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org/ghc
Diffstat (limited to 'compiler/prelude')
| -rw-r--r-- | compiler/prelude/PrelNames.lhs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/prelude/PrelNames.lhs b/compiler/prelude/PrelNames.lhs index d296beeaaf..a67580a18c 100644 --- a/compiler/prelude/PrelNames.lhs +++ b/compiler/prelude/PrelNames.lhs @@ -642,8 +642,8 @@ u1DataCon_RDR, par1DataCon_RDR, rec1DataCon_RDR, prodDataCon_RDR, comp1DataCon_RDR, unPar1_RDR, unRec1_RDR, unK1_RDR, unComp1_RDR, from_RDR, from1_RDR, to_RDR, to1_RDR, - datatypeName_RDR, moduleName_RDR, conName_RDR, - conFixity_RDR, conIsRecord_RDR, + datatypeName_RDR, moduleName_RDR, isNewtypeName_RDR, + conName_RDR, conFixity_RDR, conIsRecord_RDR, noArityDataCon_RDR, arityDataCon_RDR, selName_RDR, prefixDataCon_RDR, infixDataCon_RDR, leftAssocDataCon_RDR, rightAssocDataCon_RDR, notAssocDataCon_RDR :: RdrName @@ -672,6 +672,7 @@ to1_RDR = varQual_RDR gHC_GENERICS (fsLit "to1") datatypeName_RDR = varQual_RDR gHC_GENERICS (fsLit "datatypeName") moduleName_RDR = varQual_RDR gHC_GENERICS (fsLit "moduleName") +isNewtypeName_RDR = varQual_RDR gHC_GENERICS (fsLit "isNewtype") selName_RDR = varQual_RDR gHC_GENERICS (fsLit "selName") conName_RDR = varQual_RDR gHC_GENERICS (fsLit "conName") conFixity_RDR = varQual_RDR gHC_GENERICS (fsLit "conFixity") |