diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2018-01-02 16:29:00 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-01-02 17:33:04 -0500 |
| commit | 3382ade3eb7ce09737d52e7c1f3ecc3431bf00fb (patch) | |
| tree | 193dfeff6e1ea466bbab45cbae884f4b4c0160a9 | |
| parent | ecff651fc2f6d9833131e3e7fbc9a37b5b2f84ee (diff) | |
| download | haskell-3382ade3eb7ce09737d52e7c1f3ecc3431bf00fb.tar.gz | |
Rename HEq_sc and Coercible_sc to heq_sel and coercible_sel
These functions are record selectors.
To the unfamiliar, when inspecting core, they looked like data
constructors as they started with an upper case letter. We rename them
so that it is more clear that firstly they are functions and secondly
that they are selectors.
Reviewers: bgamari, simonpj
Reviewed By: simonpj
Subscribers: simonpj, rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4280
| -rw-r--r-- | compiler/prelude/TysWiredIn.hs | 4 | ||||
| -rw-r--r-- | testsuite/tests/indexed-types/should_compile/T7837.stderr | 4 | ||||
| -rw-r--r-- | testsuite/tests/simplCore/should_compile/Makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/prelude/TysWiredIn.hs b/compiler/prelude/TysWiredIn.hs index 32c6117041..2ee7e147a6 100644 --- a/compiler/prelude/TysWiredIn.hs +++ b/compiler/prelude/TysWiredIn.hs @@ -255,13 +255,13 @@ mkWiredInIdName mod fs uniq id heqTyConName, heqDataConName, heqSCSelIdName :: Name heqTyConName = mkWiredInTyConName UserSyntax gHC_TYPES (fsLit "~~") heqTyConKey heqTyCon heqDataConName = mkWiredInDataConName UserSyntax gHC_TYPES (fsLit "Eq#") heqDataConKey heqDataCon -heqSCSelIdName = mkWiredInIdName gHC_TYPES (fsLit "HEq_sc") heqSCSelIdKey heqSCSelId +heqSCSelIdName = mkWiredInIdName gHC_TYPES (fsLit "heq_sel") heqSCSelIdKey heqSCSelId -- See Note [Kind-changing of (~) and Coercible] in libraries/ghc-prim/GHC/Types.hs coercibleTyConName, coercibleDataConName, coercibleSCSelIdName :: Name coercibleTyConName = mkWiredInTyConName UserSyntax gHC_TYPES (fsLit "Coercible") coercibleTyConKey coercibleTyCon coercibleDataConName = mkWiredInDataConName UserSyntax gHC_TYPES (fsLit "MkCoercible") coercibleDataConKey coercibleDataCon -coercibleSCSelIdName = mkWiredInIdName gHC_TYPES (fsLit "Coercible_sc") coercibleSCSelIdKey coercibleSCSelId +coercibleSCSelIdName = mkWiredInIdName gHC_TYPES (fsLit "coercible_sel") coercibleSCSelIdKey coercibleSCSelId charTyConName, charDataConName, intTyConName, intDataConName :: Name charTyConName = mkWiredInTyConName UserSyntax gHC_TYPES (fsLit "Char") charTyConKey charTyCon diff --git a/testsuite/tests/indexed-types/should_compile/T7837.stderr b/testsuite/tests/indexed-types/should_compile/T7837.stderr index eb682613b9..44b894e5fd 100644 --- a/testsuite/tests/indexed-types/should_compile/T7837.stderr +++ b/testsuite/tests/indexed-types/should_compile/T7837.stderr @@ -1,5 +1,5 @@ Rule fired: Class op signum (BUILTIN) Rule fired: Class op abs (BUILTIN) -Rule fired: Class op HEq_sc (BUILTIN) +Rule fired: Class op heq_sel (BUILTIN) Rule fired: normalize/Double (T7837) -Rule fired: Class op HEq_sc (BUILTIN) +Rule fired: Class op heq_sel (BUILTIN) diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile index 57904073b0..33322f38a1 100644 --- a/testsuite/tests/simplCore/should_compile/Makefile +++ b/testsuite/tests/simplCore/should_compile/Makefile @@ -205,8 +205,8 @@ T12877: T13025: $(RM) -f T13025.o T13025.hi T13025a.o T13025a.hi '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13025a.hs - -'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13025.hs -ddump-simpl | grep -c HEq_sc - # No lines should match 'HEq_sc' so wc should output zeros + -'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13025.hs -ddump-simpl | grep -c heq_sel + # No lines should match 'heq_sel' so wc should output zeros .PHONY: str-rules str-rules: |