diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-17 17:52:13 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-17 17:52:13 -0700 |
| commit | df44b2718dcc489a057d2a60cdaadffed2ce0df5 (patch) | |
| tree | d8076805cd76cf2e8010519589664ef63dfeb160 /src | |
| parent | 79f7e05c082a1810f9315e19658e20af15b08235 (diff) | |
| parent | d9687d585525476ecd9544b0e367e456af1b0642 (diff) | |
| download | scala-df44b2718dcc489a057d2a60cdaadffed2ce0df5.tar.gz scala-df44b2718dcc489a057d2a60cdaadffed2ce0df5.tar.bz2 scala-df44b2718dcc489a057d2a60cdaadffed2ce0df5.zip | |
Merge pull request #3638 from xeno-by/topic/freshname-hotfixv2.11.0-RC2
SI-8425 don't create double-dollar names in c.freshName
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/reflect/macros/contexts/Names.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/reflect/macros/contexts/Names.scala b/src/compiler/scala/reflect/macros/contexts/Names.scala index 299af40b94..5a5bb428b5 100644 --- a/src/compiler/scala/reflect/macros/contexts/Names.scala +++ b/src/compiler/scala/reflect/macros/contexts/Names.scala @@ -33,8 +33,9 @@ trait Names { // // TODO: hopefully SI-7823 will provide an ultimate answer to this problem. // In the meanwhile I will also keep open the original issue: SI-6879 "c.freshName is broken". + val prefix = if (name.endsWith("$")) name else name + "$" // SI-8425 val sortOfUniqueSuffix = freshNameCreator.newName(nme.FRESH_SUFFIX) - name + "$" + sortOfUniqueSuffix + prefix + sortOfUniqueSuffix } def freshName[NameType <: Name](name: NameType): NameType = |