diff options
author | Martin Odersky <odersky@gmail.com> | 2005-12-01 10:59:44 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2005-12-01 10:59:44 +0000 |
commit | 0aba785404b3dc02ae49ac270bfd2bbd63826a50 (patch) | |
tree | d884195178e2b77849295d2713a8e19ece6ffe2a | |
parent | 0a69feac8cf47ea8adec77fe69c16146d27d5ab2 (diff) | |
download | scala-0aba785404b3dc02ae49ac270bfd2bbd63826a50.tar.gz scala-0aba785404b3dc02ae49ac270bfd2bbd63826a50.tar.bz2 scala-0aba785404b3dc02ae49ac270bfd2bbd63826a50.zip |
*** empty log message ***
-rwxr-xr-x | sources/scala/tools/nsc/symtab/Definitions.scala | 7 | ||||
-rwxr-xr-x | sources/scala/tools/nsc/transform/Mixin.scala | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sources/scala/tools/nsc/symtab/Definitions.scala b/sources/scala/tools/nsc/symtab/Definitions.scala index b2485a9d53..0469abe219 100755 --- a/sources/scala/tools/nsc/symtab/Definitions.scala +++ b/sources/scala/tools/nsc/symtab/Definitions.scala @@ -264,13 +264,16 @@ import Flags._; def isUnboxedClass(sym: Symbol): boolean = isValueClass(sym) || sym == ArrayClass; def signature(tp: Type): String = { + def flatNameString(sym: Symbol): String = + if (sym.owner.isPackageClass) sym.fullNameString('.') + else flatNameString(sym.owner) + "$" + sym.simpleName; def signature1(tp: Type): String = { if (tp.symbol == ArrayClass) "[" + signature1(tp.typeArgs.head); else if (isValueClass(tp.symbol)) String.valueOf(abbrvTag(tp.symbol)) - else "L" + tp.symbol.fullNameString + ";" + else "L" + flatNameString(tp.symbol) + ";" } if (tp.symbol == ArrayClass) signature1(tp); - else tp.symbol.fullNameString + else flatNameString(tp.symbol) } private var isInitialized = false; diff --git a/sources/scala/tools/nsc/transform/Mixin.scala b/sources/scala/tools/nsc/transform/Mixin.scala index 219fd624c7..30c376cf70 100755 --- a/sources/scala/tools/nsc/transform/Mixin.scala +++ b/sources/scala/tools/nsc/transform/Mixin.scala @@ -82,7 +82,6 @@ abstract class Mixin extends InfoTransform { } } else if ((member hasFlag (LIFTED | BRIDGE)) && !(member hasFlag PRIVATE)) { member.expandName(clazz); - System.out.println("LIFTING " + member + " to " + clazz);//debug addMember(clazz, member.cloneSymbol(clazz) resetFlag FINAL); } } @@ -246,7 +245,6 @@ abstract class Mixin extends InfoTransform { } private def addNewDefs(clazz: Symbol, stats: List[Tree]): List[Tree] = { - if (settings.debug.value) System.out.println("add new defs for " + clazz); val newDefs = new ListBuffer[Tree]; def addDef(pos: int, tree: Tree): unit = { if (settings.debug.value) log("add new def to " + clazz + ": " + tree); |