summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/transform/Delambdafy.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-05-11 13:50:09 +0200
committerJason Zaugg <jzaugg@gmail.com>2014-05-11 13:52:42 +0200
commitf13c07fe29d27bdc75423be6d3bf5458175bec90 (patch)
treeb46d2a8c68735e0d80bf181c0423e9cc18cb73c7 /src/compiler/scala/tools/nsc/transform/Delambdafy.scala
parent3f28bbed6d1c2d49201da700907aae460f15cd4d (diff)
downloadscala-f13c07fe29d27bdc75423be6d3bf5458175bec90.tar.gz
scala-f13c07fe29d27bdc75423be6d3bf5458175bec90.tar.bz2
scala-f13c07fe29d27bdc75423be6d3bf5458175bec90.zip
SI-8578 Avoid fresh name clashes under -Ydelambdafy:method
It is important to append the fresh 'N' after '$'. Otherwise, we find out the hard way that ("foo$11" + "1") == ("foo$1" + "11").
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/Delambdafy.scala')
-rw-r--r--src/compiler/scala/tools/nsc/transform/Delambdafy.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/Delambdafy.scala b/src/compiler/scala/tools/nsc/transform/Delambdafy.scala
index 1468680fe0..d66e53edca 100644
--- a/src/compiler/scala/tools/nsc/transform/Delambdafy.scala
+++ b/src/compiler/scala/tools/nsc/transform/Delambdafy.scala
@@ -238,7 +238,7 @@ abstract class Delambdafy extends Transform with TypingTransformers with ast.Tre
// - reinstate the assertion in `Erasure.resolveAnonymousBridgeClash`
val suffix = "$lambda$" + (
if (funOwner.isPrimaryConstructor) ""
- else "$" + funOwner.name
+ else "$" + funOwner.name + "$"
)
val name = unit.freshTypeName(s"${oldClass.name.decode}$suffix")