Commit 87a5ef5f authored by Simon Peyton Jones's avatar Simon Peyton Jones
Browse files

Error message changes due to pretty-printing of provenances

parent b65f16d0
......@@ -2,4 +2,6 @@
mod110.hs:11:10:
Ambiguous occurrence `Eq'
It could refer to either `M.Eq', defined at mod110.hs:7:7
or `Prelude.Eq', imported from Prelude at mod110.hs:4:1-14
or `Prelude.Eq',
imported from `Prelude' at mod110.hs:4:1-14
(and originally defined in `GHC.Classes')
mod131.hs:2:27:
Conflicting exports for `f':
`module Mod131_B' exports `f' imported from Mod131_B at mod131.hs:3:17
(defined at Mod131_B.hs:3:1)
`Mod131_A.f' exports `Mod131_A.f' imported from Mod131_A at mod131.hs:4:27
(defined at Mod131_A.hs:3:1)
`module Mod131_B' exports `f'
imported from `Mod131_B' at mod131.hs:3:17
(and originally defined at Mod131_B.hs:3:1)
`Mod131_A.f' exports `Mod131_A.f'
imported qualified from `Mod131_A' at mod131.hs:4:27
(and originally defined at Mod131_A.hs:3:1)
mod142.hs:2:21:
Conflicting exports for `x':
`module Mod142_A' exports `Mod142_A.x' imported from Mod142_A at mod142.hs:4:1-15
(defined at Mod142_A.hs:3:1)
`module M' exports `M.x' defined at mod142.hs:6:1
`module Mod142_A' exports `Mod142_A.x'
imported from `Mod142_A' at mod142.hs:4:1-15
(and originally defined at Mod142_A.hs:3:1)
`module M' exports `M.x' defined at mod142.hs:6:1
mod143.hs:2:21:
Conflicting exports for `Foo':
`module Mod143_A' exports `Mod143_A.Foo' imported from Mod143_A at mod143.hs:4:1-15
(defined at Mod143_A.hs:3:6)
`module M' exports `M.Foo' defined at mod143.hs:6:6
`module Mod143_A' exports `Mod143_A.Foo'
imported from `Mod143_A' at mod143.hs:4:1-15
(and originally defined at Mod143_A.hs:3:6-8)
`module M' exports `M.Foo' defined at mod143.hs:6:6
mod144.hs:2:27:
Conflicting exports for `Bar':
`module Mod144_A' exports `Mod144_A.Bar' imported from Mod144_A at mod144.hs:4:1-15
`module M' exports `M.Bar' defined at mod144.hs:6:13
`module Mod144_A' exports `Mod144_A.Bar'
imported from `Mod144_A' at mod144.hs:4:1-15
`module M' exports `M.Bar' defined at mod144.hs:6:13
exit(1)
mod145.hs:2:30:
Conflicting exports for `m1':
`module Mod145_A' exports `Mod145_A.m1' imported from Mod145_A at mod145.hs:4:1-15
(defined at Mod145_A.hs:4:3)
`module Mod145' exports `Mod145.m1' defined at mod145.hs:7:3
`module Mod145_A' exports `Mod145_A.m1'
imported from `Mod145_A' at mod145.hs:4:1-15
(and originally defined at Mod145_A.hs:4:3-4)
`module Mod145' exports `Mod145.m1' defined at mod145.hs:7:3
mod146.hs:2:30:
Conflicting exports for `m1':
`module Mod145_A' exports `Mod145_A.m1' imported from Mod145_A at mod146.hs:4:1-15
`module Mod146' exports `Mod146.m1' defined at mod146.hs:7:3
`module Mod145_A' exports `Mod145_A.m1'
imported from `Mod145_A' at mod146.hs:4:1-15
`module Mod146' exports `Mod146.m1' defined at mod146.hs:7:3
exit(1)
mod150.hs:2:20:
Conflicting exports for `id':
`module Prelude' exports `Prelude.id' imported from Prelude at mod150.hs:2:8
`module M' exports `M.id' defined at mod150.hs:2:42
`module Prelude' exports `Prelude.id'
imported from `Prelude' at mod150.hs:2:8
(and originally defined in `GHC.Base')
`module M' exports `M.id' defined at mod150.hs:2:42
......@@ -2,4 +2,6 @@
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
or `Prelude.id',
imported from `Prelude' at mod151.hs:2:8
(and originally defined in `GHC.Base')
......@@ -2,9 +2,13 @@
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
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
`id' exports `M.id' defined at mod152.hs:2:36
`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
......@@ -2,4 +2,6 @@
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
or `Prelude.id',
imported from `Prelude' at mod153.hs:2:8
(and originally defined in `GHC.Base')
mod155.hs:2:10:
Conflicting exports for `id':
`module M' exports `M.id' imported from Prelude at mod155.hs:4:1-19
`module M' exports `M.id' defined at mod155.hs:5:1
`module M' exports `M.id'
imported from `Prelude' at mod155.hs:4:1-19
(and originally defined in `GHC.Base')
`module M' exports `M.id' defined at mod155.hs:5:1
mod164.hs:9:5:
Ambiguous occurrence `D1'
It could refer to either `Mod164_A.D1', imported from Mod164_A at mod164.hs:4:1-15
(defined at Mod164_A.hs:3:10)
or `Mod164_B.D1', imported from Mod164_B at mod164.hs:5:1-15
(defined at Mod164_B.hs:3:10)
It could refer to either `Mod164_A.D1',
imported from `Mod164_A' at mod164.hs:4:1-15
(and originally defined at Mod164_A.hs:3:10-11)
or `Mod164_B.D1',
imported from `Mod164_B' at mod164.hs:5:1-15
(and originally defined at Mod164_B.hs:3:10-11)
......@@ -2,6 +2,6 @@
mod165.hs:9:5:
Ambiguous occurrence `A.D1'
It could refer to either `A.D1',
imported from Mod164_A at mod165.hs:4:1-20
or `A.D1', imported from Mod164_B at mod165.hs:5:1-20
imported from `Mod164_A' at mod165.hs:4:1-20
or `A.D1', imported from `Mod164_B' at mod165.hs:5:1-20
exit(1)
......@@ -6,6 +6,6 @@ T1972.hs:12:3:
T1972.hs:14:3:
Warning: This binding for `mapAccumL' shadows the existing bindings
defined at T1972.hs:16:1
imported from Data.List at T1972.hs:7:1-16
imported from `Data.List' at T1972.hs:7:1-16
T1972.hs:20:10: Warning: Defined but not used: `c'
rn039.hs:6:16:
Warning: This binding for `-' shadows the existing binding
imported from Prelude at rn039.hs:2:8-20
imported from `Prelude' at rn039.hs:2:8-20
(and originally defined in `GHC.Num')
rnfail029.hs:2:36:
Conflicting exports for `map':
`Data.List.map' exports `Data.List.map' imported from Data.List at rnfail029.hs:3:1-26
`module ShouldFail' exports `ShouldFail.map' defined at rnfail029.hs:4:1
`Data.List.map' exports `Data.List.map'
imported qualified from `Data.List' at rnfail029.hs:3:1-26
(and originally defined in `GHC.Base')
`module ShouldFail' exports `ShouldFail.map'
defined at rnfail029.hs:4:1
rnfail040.hs:7:12:
Conflicting exports for `nub':
`module M' exports `M.nub' imported from Data.List at rnfail040.hs:10:2-22
`module M' exports `T.nub' imported from Rnfail040_A at rnfail040.hs:11:2-24
(defined at Rnfail040_A.hs:2:3)
`module M' exports `M.nub'
imported from `Data.List' at rnfail040.hs:10:2-22
`module M' exports `T.nub'
imported from `Rnfail040_A' at rnfail040.hs:11:2-24
(and originally defined at Rnfail040_A.hs:2:3-5)
......@@ -3,4 +3,5 @@ rnfail044.hs:5:12:
Ambiguous occurrence `splitAt'
It could refer to either `A.splitAt', defined at rnfail044.hs:8:3
or `Data.List.splitAt',
imported from Prelude at rnfail044.hs:5:8
imported from `Prelude' at rnfail044.hs:5:8
(and originally defined in `GHC.List')
......@@ -11,10 +11,10 @@ T4908.f_$s$wf =
\ (sc :: GHC.Prim.Int#)
(sc1 :: GHC.Types.Int)
(sc2 :: GHC.Prim.Int#) ->
case sc of ds {
case sc2 of ds {
__DEFAULT ->
case sc2 of ds1 {
__DEFAULT -> T4908.f_$s$wf (GHC.Prim.-# ds 1) sc1 ds1;
case sc of ds1 {
__DEFAULT -> T4908.f_$s$wf ds1 sc1 (GHC.Prim.-# ds 1);
0 -> GHC.Types.True
};
0 -> GHC.Types.True
......@@ -38,7 +38,7 @@ T4908.$wf =
case w of _ { (a, b) ->
case b of _ { GHC.Types.I# ds1 ->
case ds1 of ds2 {
__DEFAULT -> T4908.f_$s$wf (GHC.Prim.-# ds 1) a ds2;
__DEFAULT -> T4908.f_$s$wf ds2 a (GHC.Prim.-# ds 1);
0 -> GHC.Types.True
}
}
......@@ -69,7 +69,7 @@ T4908.f =
forall (sc :: GHC.Prim.Int#)
(sc1 :: GHC.Types.Int)
(sc2 :: GHC.Prim.Int#).
T4908.$wf sc (sc1, GHC.Types.I# sc2)
T4908.$wf sc2 (sc1, GHC.Types.I# sc)
= T4908.f_$s$wf sc sc1 sc2
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment