diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2016-07-20 19:04:10 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-07-20 19:35:33 +0200 |
| commit | 83e4f49577665278fe08fbaafe2239553f3c448e (patch) | |
| tree | 8cb7cbd315261e09d2a78b5f15a64232c628d199 /compiler/prelude/PrelInfo.hs | |
| parent | cf989ffe490c146be4ed0fd7e0c00d3ff8fe1453 (diff) | |
| download | haskell-83e4f49577665278fe08fbaafe2239553f3c448e.tar.gz | |
Revert "Clean up interaction between name cache and built-in syntax"
This reverts commit 9513fe6bdeafd35ca1a04e17b5f94732516766aa.
Sadly this broke with -DDEBUG.
Diffstat (limited to 'compiler/prelude/PrelInfo.hs')
| -rw-r--r-- | compiler/prelude/PrelInfo.hs | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/compiler/prelude/PrelInfo.hs b/compiler/prelude/PrelInfo.hs index 0bd09a2e31..52493b40f5 100644 --- a/compiler/prelude/PrelInfo.hs +++ b/compiler/prelude/PrelInfo.hs @@ -85,8 +85,7 @@ knownKeyNames , concatMap tycon_kk_names typeNatTyCons - -- Tuple type representations - , tuple_rep_names + , concatMap (tycon_kk_names . tupleTyCon Boxed) [2..mAX_TUPLE_SIZE] -- Yuk , cTupleTyConNames -- Constraint tuples are known-key but not wired-in @@ -98,17 +97,6 @@ knownKeyNames , basicKnownKeyNames ] where - -- We only include the type representation bindings (for both the type and - -- promoted data constructors) for tuples, not the TyCons themselves since - -- they are handled specially in interface files and by isBuiltInOcc_maybe. - -- See Note [Built-in syntax and the OrigNameCache] and Note [Grand plan for - -- Typeable]. - tuple_rep_names = - [ rep - | tc <- map (tupleTyCon Boxed) [2..mAX_TUPLE_SIZE] - , rep <- rep_names tc ++ concatMap (rep_names . promoteDataCon) (tyConDataCons tc) - ] - -- All of the names associated with a known-key thing. -- This includes TyCons, DataCons and promoted TyCons. tycon_kk_names :: TyCon -> [Name] |