diff options
| author | GHC GitLab CI <ghc-ci@gitlab-haskell.org> | 2020-09-26 12:56:01 +0000 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-10-13 10:27:04 -0400 |
| commit | 6e5a83bb6052f9e251a54026294c87a5bd650c93 (patch) | |
| tree | fa6e74cdeaf8afd104b36be6a48fcb036cfdf0ad /compiler/GHC | |
| parent | 6a243e9daaa6c17c0859f47ae3a098e680aa28cf (diff) | |
| download | haskell-wip/tuple-width.tar.gz | |
Extend mAX_TUPLE_SIZE to 64wip/tuple-width
As well a ctuples and sums.
Diffstat (limited to 'compiler/GHC')
| -rw-r--r-- | compiler/GHC/Builtin/Types.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Settings/Constants.hs | 8 | ||||
| -rw-r--r-- | compiler/GHC/Tc/Gen/HsType.hs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/GHC/Builtin/Types.hs b/compiler/GHC/Builtin/Types.hs index b254bc233d..282ffefb2a 100644 --- a/compiler/GHC/Builtin/Types.hs +++ b/compiler/GHC/Builtin/Types.hs @@ -731,7 +731,7 @@ Note [How tuples work] See also Note [Known-key names] in GHC.Builtin.Names - Wanted constraints: there is a built-in instance instance (c1,c2) => (c1,c2) See GHC.Tc.Instance.Class.matchCTuple - - Currently just go up to 62; beyond that + - Currently just go up to 64; beyond that you have to use manual nesting - Their OccNames look like (%,,,%), so they can easily be distinguished from term tuples. But (following Haskell) we diff --git a/compiler/GHC/Settings/Constants.hs b/compiler/GHC/Settings/Constants.hs index 6eeaab84df..95dfe6a177 100644 --- a/compiler/GHC/Settings/Constants.hs +++ b/compiler/GHC/Settings/Constants.hs @@ -11,14 +11,14 @@ hiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Integer -- All pretty arbitrary: mAX_TUPLE_SIZE :: Int -mAX_TUPLE_SIZE = 62 -- Should really match the number - -- of decls in Data.Tuple +mAX_TUPLE_SIZE = 64 -- Should really match the number + -- of decls in GHC.Tuple mAX_CTUPLE_SIZE :: Int -- Constraint tuples -mAX_CTUPLE_SIZE = 62 -- Should match the number of decls in GHC.Classes +mAX_CTUPLE_SIZE = 64 -- Should match the number of decls in GHC.Classes mAX_SUM_SIZE :: Int -mAX_SUM_SIZE = 62 +mAX_SUM_SIZE = 64 -- | Default maximum depth for both class instance search and type family -- reduction. See also #5395. diff --git a/compiler/GHC/Tc/Gen/HsType.hs b/compiler/GHC/Tc/Gen/HsType.hs index d23c09fd09..f53eccc222 100644 --- a/compiler/GHC/Tc/Gen/HsType.hs +++ b/compiler/GHC/Tc/Gen/HsType.hs @@ -3742,7 +3742,7 @@ Consider * GHC.Tc.Errors.mkHoleError finally reports the error. -An annoying difficulty happens if there are more than 62 inferred +An annoying difficulty happens if there are more than 64 inferred constraints. Then we need to fill in the TcTyVar with (say) a 70-tuple. Where do we find the TyCon? For good reasons we only have constraint tuples up to 62 (see Note [How tuples work] in GHC.Builtin.Types). So how |