diff options
| author | Matthew Pickering <matthew.pickering@tweag.io> | 2018-06-07 13:31:38 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-06-07 18:06:30 -0400 |
| commit | fa34ced5204b13ba809a3441a89b9cf98de2d54e (patch) | |
| tree | 5d4b130b05b74cc7d6e4ba52b945285b04a151f8 | |
| parent | 838cb53a80cf468df68975c613fa275338d8d355 (diff) | |
| download | haskell-fa34ced5204b13ba809a3441a89b9cf98de2d54e.tar.gz | |
Rename dataConRepNameUnique to dataConTyRepNameUnique
The `DataCon` rep also applies to the worker. For example, see
`MkId.mkDataConRep`. `dataConTyRepNameUnique` is for the type
representation, so we rename it to make this distinction clear.
Reviewers: bgamari
Reviewed By: bgamari
Subscribers: rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4797
| -rw-r--r-- | compiler/basicTypes/Unique.hs | 6 | ||||
| -rw-r--r-- | compiler/types/TyCon.hs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/basicTypes/Unique.hs b/compiler/basicTypes/Unique.hs index f0c98144dd..4a709d238e 100644 --- a/compiler/basicTypes/Unique.hs +++ b/compiler/basicTypes/Unique.hs @@ -64,7 +64,7 @@ module Unique ( -- *** From TyCon name uniques tyConRepNameUnique, -- *** From DataCon name uniques - dataConWorkerUnique, dataConRepNameUnique + dataConWorkerUnique, dataConTyRepNameUnique ) where #include "HsVersions.h" @@ -400,9 +400,9 @@ tyConRepNameUnique u = incrUnique u mkPreludeDataConUnique i = mkUnique '6' (3*i) -- Must be alphabetic -------------------------------------------------- -dataConRepNameUnique, dataConWorkerUnique :: Unique -> Unique +dataConTyRepNameUnique, dataConWorkerUnique :: Unique -> Unique dataConWorkerUnique u = incrUnique u -dataConRepNameUnique u = stepUnique u 2 +dataConTyRepNameUnique u = stepUnique u 2 -------------------------------------------------- mkPrimOpIdUnique op = mkUnique '9' op diff --git a/compiler/types/TyCon.hs b/compiler/types/TyCon.hs index 5717aef9b8..230cec7c6c 100644 --- a/compiler/types/TyCon.hs +++ b/compiler/types/TyCon.hs @@ -152,7 +152,7 @@ import FastStringEnv import FieldLabel import Constants import Util -import Unique( tyConRepNameUnique, dataConRepNameUnique ) +import Unique( tyConRepNameUnique, dataConTyRepNameUnique ) import UniqSet import Module import {-# SOURCE #-} DataCon @@ -1209,7 +1209,7 @@ mkPrelTyConRepName tc_name -- Prelude tc_name is always External, name_mod = nameModule tc_name name_uniq = nameUnique tc_name rep_uniq | isTcOcc name_occ = tyConRepNameUnique name_uniq - | otherwise = dataConRepNameUnique name_uniq + | otherwise = dataConTyRepNameUnique name_uniq (rep_mod, rep_occ) = tyConRepModOcc name_mod name_occ -- | The name (and defining module) for the Typeable representation (TyCon) of a |