diff options
| author | Paul Phillips <paulp@improving.org> | 2012-05-14 07:20:42 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-05-14 07:20:42 -0700 |
| commit | b3f7bc996b7a59b951cd0f199a056b6ad99d153b (patch) | |
| tree | ba2b39a5cd43dabd462c65dedb10c7f5cf1f6424 /src/compiler/scala | |
| parent | 0b75e0956ac01c35129981cc3bd7cefe5d12000b (diff) | |
| download | scala-b3f7bc996b7a59b951cd0f199a056b6ad99d153b.tar.gz scala-b3f7bc996b7a59b951cd0f199a056b6ad99d153b.tar.bz2 scala-b3f7bc996b7a59b951cd0f199a056b6ad99d153b.zip | |
No-op changes.
Fixed a comment and simplified a mysterious "if (x) y else y" method
thanks to the helpful jibe received in comments.
Diffstat (limited to 'src/compiler/scala')
| -rw-r--r-- | src/compiler/scala/reflect/internal/Types.scala | 5 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala index 808198598b..93f359ae12 100644 --- a/src/compiler/scala/reflect/internal/Types.scala +++ b/src/compiler/scala/reflect/internal/Types.scala @@ -3126,10 +3126,7 @@ trait Types extends api.Types { self: SymbolTable => tparams map (_.defString) mkString("[", ",", "]") case _ => "" } - def originName = { - val name = origin.typeSymbolDirect.decodedName - if (name contains "_$") origin.typeSymbolDirect.decodedName else name // wait, what? - what? - } + def originName = origin.typeSymbolDirect.decodedName def originLocation = { val sym = origin.typeSymbolDirect val encl = sym.owner.logicallyEnclosingMember diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala index 225afaf0fb..81fe907a0c 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala @@ -274,7 +274,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters { // we can exclude lateFINAL. Such symbols are eligible for inlining, but to
// avoid breaking proxy software which depends on subclassing, we do not
// emit ACC_FINAL.
- // Nested objects won't receive ACC_FINAL in order to allow for their overloading.
+ // Nested objects won't receive ACC_FINAL in order to allow for their overriding.
val finalFlag = (
(sym.hasFlag(Flags.FINAL) || isTopLevelModule(sym))
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala index b5ce7588f6..7f5b7aaf62 100644 --- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala +++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala @@ -1976,7 +1976,7 @@ abstract class GenJVM extends SubComponent with GenJVMUtil with GenAndroid with // we can exclude lateFINAL. Such symbols are eligible for inlining, but to // avoid breaking proxy software which depends on subclassing, we do not // emit ACC_FINAL. - // Nested objects won't receive ACC_FINAL in order to allow for their overloading. + // Nested objects won't receive ACC_FINAL in order to allow for their overriding. val finalFlag = ( (sym.hasFlag(Flags.FINAL) || isTopLevelModule(sym)) |