diff options
| author | Simon Ochsenreither <simon@ochsenreither.de> | 2014-11-29 04:05:10 +0100 |
|---|---|---|
| committer | Simon Ochsenreither <simon@ochsenreither.de> | 2015-03-26 03:15:07 +0100 |
| commit | 86999ed76b5d9df51c337c5e33fe265e04d8f39c (patch) | |
| tree | f09526ab3075b9c5e9552eb1e564984a64b7df28 /src/compiler/scala/tools/nsc/symtab | |
| parent | e5bfc1c097e8dea9e0643e4a43743196209e9ba8 (diff) | |
| download | scala-86999ed76b5d9df51c337c5e33fe265e04d8f39c.tar.gz scala-86999ed76b5d9df51c337c5e33fe265e04d8f39c.tar.bz2 scala-86999ed76b5d9df51c337c5e33fe265e04d8f39c.zip | |
new{Term,Type}Name→{Term,Type}Name, tpename/nme→{type,term}Names
Diffstat (limited to 'src/compiler/scala/tools/nsc/symtab')
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 4d08be3c24..96800175ee 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -1103,7 +1103,7 @@ abstract class ClassfileParser { def enclosing = if (jflags.isStatic) enclModule else enclClass // The name of the outer class, without its trailing $ if it has one. - private def strippedOuter = nme stripModuleSuffix outerName + private def strippedOuter = outerName.dropModule private def isInner = innerClasses contains strippedOuter private def enclClass = if (isInner) innerClasses innerSymbol strippedOuter else classNameToSymbol(strippedOuter) private def enclModule = enclClass.companionModule diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala index bd1fa4e707..ea46116976 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala @@ -74,7 +74,7 @@ abstract class ICodeReader extends ClassfileParser { first != CONSTANT_METHODREF && first != CONSTANT_INTFMETHODREF) errorBadTag(start) val ownerTpe = getClassOrArrayType(in.getChar(start + 1).toInt) - debuglog("getMemberSymbol(static: " + static + "): owner type: " + ownerTpe + " " + ownerTpe.typeSymbol.originalName) + debuglog("getMemberSymbol(static: " + static + "): owner type: " + ownerTpe + " " + ownerTpe.typeSymbol.unexpandedName) val (name0, tpe0) = getNameAndType(in.getChar(start + 3).toInt, ownerTpe) debuglog("getMemberSymbol: name and tpe: " + name0 + ": " + tpe0) |