summaryrefslogtreecommitdiff
path: root/testsuite/tests/module
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2015-06-02 00:02:03 +0100
committerSimon Peyton Jones <simonpj@microsoft.com>2015-06-02 00:50:45 +0100
commit9b73cb16485f331d9dc1f37826c6d503e24a5b0b (patch)
treef5f5772dc844ed925af757c1b5cd08b8fa6bd88d /testsuite/tests/module
parent11d8f84fd3237c3821c8f826716fc4c9adfccb8c (diff)
downloadhaskell-9b73cb16485f331d9dc1f37826c6d503e24a5b0b.tar.gz
Refactor the GlobalRdrEnv, fixing #7672
This patch started innocently enough, by deleting a single call from rnImportDecl, namely let gbl_env = mkGlobalRdrEnv (filterOut from_this_mod gres) The 'filterOut' makes no sense, and was the cause of #7672. But that little loose end led to into a twisty maze of little passages, all alike, which has taken me an unreasonably long time to straighten out. Happily, I think the result is really much better. In particular: * INVARIANT 1 of the GlobalRdrEnv type was simply not true: we had multiple GlobalRdrElts in a list with the same gre_name field. This kludgily implmented one form of shadowing. * Meanwhile, extendGlobalRdrEnvRn implemented a second form of shadowing, by deleting stuff from the GlobalRdrEnv. * In turn, much of this shadowing stuff depended on the Names of the Ids bound in the GHCi InteractiveContext being Internal names, even though the TyCons and suchlike all had External Names. Very confusing. So I have made the following changes * I re-established INVARIANT 1 of GlobalRdrEnv. As a result some strange code in RdrName.pickGREs goes away. * RnNames.extendGlobalRdrEnvRn now makes one call to deal with shadowing, where necessary, and another to extend the environment. It deals separately with duplicate bindings. The very complicated RdrName.extendGlobalRdrEnv becomes much simpler; we need to export the shadowing function, now called RdrName.shadowNames; and we can nuke RdrName.findLocalDupsRdrEnv altogether. RdrName Note [GlobalRdrEnv shadowing] summarises the shadowing story * The Names of the Ids bound in the GHCi interactive context are now all External. See Note [Interactively-bound Ids in GHCi] in HscTypes. * Names for Ids created by the debugger are now made by IfaceEnv.newInteractiveBinder. This fixes a lurking bug which was that the debugger was using mkNewUniqueSupply 'I' to make uniques, which does NOT guarantee a fresh supply of uniques on successive calls. * Note [Template Haskell ambiguity] in RnEnv shows that one TH-related error is reported lazily (on occurrences) when it might be better reported when extending the environment. In some (but not all) cases this was done before; but now it's uniformly at occurrences. In some ways it'd be better to report when extending the environment, but it's a tiresome test and the error is rare, so I'm leaving it at the lookup site for now, with the above Note. * A small thing: RnNames.greAvail becomes RdrName.availFromGRE, where it joins the dual RdrName.gresFromAvail.
Diffstat (limited to 'testsuite/tests/module')
-rw-r--r--testsuite/tests/module/mod110.stderr14
-rw-r--r--testsuite/tests/module/mod151.stderr14
-rw-r--r--testsuite/tests/module/mod152.stderr21
-rw-r--r--testsuite/tests/module/mod153.stderr14
4 files changed, 28 insertions, 35 deletions
diff --git a/testsuite/tests/module/mod110.stderr b/testsuite/tests/module/mod110.stderr
index 1018f69f0d..815da10602 100644
--- a/testsuite/tests/module/mod110.stderr
+++ b/testsuite/tests/module/mod110.stderr
@@ -1,7 +1,7 @@
-
-mod110.hs:11:10:
- Ambiguous occurrence ‘Eq’
- It could refer to either ‘M.Eq’, defined at mod110.hs:7:1
- or ‘Prelude.Eq’,
- imported from ‘Prelude’ at mod110.hs:4:1-14
- (and originally defined in ‘GHC.Classes’)
+
+mod110.hs:11:10: error:
+ Ambiguous occurrence ‘Eq’
+ It could refer to either ‘Prelude.Eq’,
+ imported from ‘Prelude’ at mod110.hs:4:1-14
+ (and originally defined in ‘GHC.Classes’)
+ or ‘M.Eq’, defined at mod110.hs:7:1
diff --git a/testsuite/tests/module/mod151.stderr b/testsuite/tests/module/mod151.stderr
index 9f750584f0..3feab8e7ba 100644
--- a/testsuite/tests/module/mod151.stderr
+++ b/testsuite/tests/module/mod151.stderr
@@ -1,7 +1,7 @@
-
-mod151.hs:2:20:
- Ambiguous occurrence ‘id’
- It could refer to either ‘M.id’, defined at mod151.hs:2:30
- or ‘Prelude.id’,
- imported from ‘Prelude’ at mod151.hs:2:8
- (and originally defined in ‘GHC.Base’)
+
+mod151.hs:2:20: error:
+ Ambiguous occurrence ‘id’
+ It could refer to either ‘Prelude.id’,
+ imported from ‘Prelude’ at mod151.hs:2:8
+ (and originally defined in ‘GHC.Base’)
+ or ‘M.id’, defined at mod151.hs:2:30
diff --git a/testsuite/tests/module/mod152.stderr b/testsuite/tests/module/mod152.stderr
index 3c96bc1270..d0106d44a6 100644
--- a/testsuite/tests/module/mod152.stderr
+++ b/testsuite/tests/module/mod152.stderr
@@ -1,14 +1,7 @@
-
-mod152.hs:2:26:
- Ambiguous occurrence ‘id’
- It could refer to either ‘M.id’, defined at mod152.hs:2:36
- or ‘Prelude.id’,
- imported from ‘Prelude’ at mod152.hs:2:8
- (and originally defined in ‘GHC.Base’)
-
-mod152.hs:2:26:
- Conflicting exports for ‘id’:
- ‘module Prelude’ exports ‘Prelude.id’
- imported from ‘Prelude’ at mod152.hs:2:8
- (and originally defined in ‘GHC.Base’)
- ‘id’ exports ‘M.id’ defined at mod152.hs:2:36
+
+mod152.hs:2:26: error:
+ Ambiguous occurrence ‘id’
+ It could refer to either ‘Prelude.id’,
+ imported from ‘Prelude’ at mod152.hs:2:8
+ (and originally defined in ‘GHC.Base’)
+ or ‘M.id’, defined at mod152.hs:2:36
diff --git a/testsuite/tests/module/mod153.stderr b/testsuite/tests/module/mod153.stderr
index fa5283b9ef..8f45a03063 100644
--- a/testsuite/tests/module/mod153.stderr
+++ b/testsuite/tests/module/mod153.stderr
@@ -1,7 +1,7 @@
-
-mod153.hs:2:11:
- Ambiguous occurrence ‘id’
- It could refer to either ‘M.id’, defined at mod153.hs:2:21
- or ‘Prelude.id’,
- imported from ‘Prelude’ at mod153.hs:2:8
- (and originally defined in ‘GHC.Base’)
+
+mod153.hs:2:11: error:
+ Ambiguous occurrence ‘id’
+ It could refer to either ‘Prelude.id’,
+ imported from ‘Prelude’ at mod153.hs:2:8
+ (and originally defined in ‘GHC.Base’)
+ or ‘M.id’, defined at mod153.hs:2:21