summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-03-27 07:17:51 -0700
committerPaul Phillips <paulp@improving.org>2013-03-27 07:17:51 -0700
commit8f23848ec74d1a760aba0822b4ddd82b81f28978 (patch)
treeb40c51a1bf63c444c930342a7672d65e5e403d05 /src/library
parent2efc6d56e6ee14dc7d86bc0667c921b082e8b9b4 (diff)
parent98daf03a902e9af902870448f9de17ff140d9bca (diff)
downloadscala-8f23848ec74d1a760aba0822b4ddd82b81f28978.tar.gz
scala-8f23848ec74d1a760aba0822b4ddd82b81f28978.tar.bz2
scala-8f23848ec74d1a760aba0822b4ddd82b81f28978.zip
Merge pull request #2289 from paulp/pr/name-logic
Name logic consistency
Diffstat (limited to 'src/library')
-rwxr-xr-xsrc/library/scala/reflect/NameTransformer.scala9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/library/scala/reflect/NameTransformer.scala b/src/library/scala/reflect/NameTransformer.scala
index 8a1cce6b02..6192971c74 100755
--- a/src/library/scala/reflect/NameTransformer.scala
+++ b/src/library/scala/reflect/NameTransformer.scala
@@ -15,9 +15,12 @@ package reflect
object NameTransformer {
// XXX Short term: providing a way to alter these without having to recompile
// the compiler before recompiling the compiler.
- val MODULE_SUFFIX_STRING = sys.props.getOrElse("SCALA_MODULE_SUFFIX_STRING", "$")
- val NAME_JOIN_STRING = sys.props.getOrElse("SCALA_NAME_JOIN_STRING", "$")
- val MODULE_INSTANCE_NAME = "MODULE$"
+ val MODULE_SUFFIX_STRING = sys.props.getOrElse("SCALA_MODULE_SUFFIX_STRING", "$")
+ val NAME_JOIN_STRING = sys.props.getOrElse("SCALA_NAME_JOIN_STRING", "$")
+ val MODULE_INSTANCE_NAME = "MODULE$"
+ val LOCAL_SUFFIX_STRING = " "
+ val SETTER_SUFFIX_STRING = "_$eq"
+ val TRAIT_SETTER_SEPARATOR_STRING = "$_setter_$"
private val nops = 128
private val ncodes = 26 * 26