summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-11-03 02:45:18 +0000
committerPaul Phillips <paulp@improving.org>2010-11-03 02:45:18 +0000
commitdb163e25eb606c4f1d23a5aa7b9c117a611daa0a (patch)
treeb9404b7d1ada6157108f100d0c10a8143d38b67b
parentc891ba15f2ba270f40413b64770cf6dd0a62994d (diff)
downloadscala-db163e25eb606c4f1d23a5aa7b9c117a611daa0a.tar.gz
scala-db163e25eb606c4f1d23a5aa7b9c117a611daa0a.tar.bz2
scala-db163e25eb606c4f1d23a5aa7b9c117a611daa0a.zip
The probable cause of the failing build.
a nice picture of a trap doesn't mean I can't also put my foot through the frame. Aaaagh, my leg, my leg. No review.
-rw-r--r--src/compiler/scala/tools/nsc/symtab/StdNames.scala5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
index ac76dc8401..82bd274e66 100644
--- a/src/compiler/scala/tools/nsc/symtab/StdNames.scala
+++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
@@ -91,8 +91,6 @@ trait StdNames extends reflect.generic.StdNames with NameManglers {
val EQEQ_LOCAL_VAR = "eqEqTemp$"
val EVIDENCE_PARAM_PREFIX = "evidence$"
val EXCEPTION_RESULT_PREFIX = "exceptionResult"
- val MODULE_INSTANCE_FIELD = "MODULE$"
- val SPECIALIZED_INSTANCE = "specInstance$"
val WHILE_PREFIX = "while$"
/** Internal names */
@@ -116,6 +114,9 @@ trait StdNames extends reflect.generic.StdNames with NameManglers {
val THIS = newTermName("_$this")
val FAKE_LOCAL_THIS = newTermName("this$")
+ val MODULE_INSTANCE_FIELD = newTermName("MODULE$")
+ val SPECIALIZED_INSTANCE = newTermName("specInstance$")
+
val TYPE_ = newTermName("TYPE")
val WILDCARD = newTermName("_")
val WILDCARD_STAR = newTermName("_*")