Permalink
Browse files

No-op changes.

Fixed a comment and simplified a mysterious "if (x) y else y" method
thanks to the helpful jibe received in comments.
  • Loading branch information...
paulp committed May 14, 2012
1 parent 0b75e09 commit b3f7bc996b7a59b951cd0f199a056b6ad99d153b
@@ -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
@@ -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))
@@ -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))

0 comments on commit b3f7bc9

Please sign in to comment.