summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2012-12-08 18:15:08 +0100
committerJason Zaugg <jzaugg@gmail.com>2012-12-08 20:50:27 +0100
commit818a2e6597f23a82f848cd1f7d3b2e29129390a6 (patch)
treeff9629e82e14dccd410fb8d21e5224b69508a29d /test/files/neg
parent0acb8a30c379f268e8a3e1340504530493a1a1dc (diff)
downloadscala-818a2e6597f23a82f848cd1f7d3b2e29129390a6.tar.gz
scala-818a2e6597f23a82f848cd1f7d3b2e29129390a6.tar.bz2
scala-818a2e6597f23a82f848cd1f7d3b2e29129390a6.zip
SI-6555 Better parameter name retention
We were losing track of parameter names in two places: 1. Uncurry was using fresh names for the apply method parameters during Function expansion. (The parameter names in the tree were actually correct, they just had synthetic symbols with "x$1" etc.) 2. When adding specialized overrides, the parameter names of the overriden method were used, rather than the parameter names from the overriding method in the class to which we are adding methods. The upshot of this is that when you're stopped in the debugger in the body of, say, `(i: Int) => i * i`, you see `v1` rather than `i`. This commit changes Uncurry and SpecializeTypes to remedy this.
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/t6260.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/t6260.check b/test/files/neg/t6260.check
index 2b7f1a8bfb..46e9bd1dfc 100644
--- a/test/files/neg/t6260.check
+++ b/test/files/neg/t6260.check
@@ -1,10 +1,10 @@
-t6260.scala:3: error: bridge generated for member method apply: (x$1: Box[X])Box[Y] in anonymous class $anonfun
+t6260.scala:3: error: bridge generated for member method apply: (bx: Box[X])Box[Y] in anonymous class $anonfun
which overrides method apply: (v1: T1)R in trait Function1
clashes with definition of the member itself;
both have erased type (v1: Object)Object
((bx: Box[X]) => new Box(f(bx.x)))(this)
^
-t6260.scala:8: error: bridge generated for member method apply: (x$1: Box[X])Box[Y] in anonymous class $anonfun
+t6260.scala:8: error: bridge generated for member method apply: (bx: Box[X])Box[Y] in anonymous class $anonfun
which overrides method apply: (v1: T1)R in trait Function1
clashes with definition of the member itself;
both have erased type (v1: Object)Object