diff options
| author | Martin Odersky <odersky@gmail.com> | 2017-03-27 17:09:42 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2017-04-11 09:33:11 +0200 |
| commit | c599f7a693dbc363962d3f17f5eab5222136857f (patch) | |
| tree | b50d69670f6c61f505482d8b4662df62f3f096dd /compiler/src/dotty/tools/dotc/core/classfile | |
| parent | 0ccc76eeb5a0706478087364a380f67ae69759cc (diff) | |
| download | dotty-c599f7a693dbc363962d3f17f5eab5222136857f.tar.gz dotty-c599f7a693dbc363962d3f17f5eab5222136857f.tar.bz2 dotty-c599f7a693dbc363962d3f17f5eab5222136857f.zip | |
Drop Config.semanticNames option
We now handle only semantic names. Also, name extractor tags
and TASTY name tags are now aligned.
Diffstat (limited to 'compiler/src/dotty/tools/dotc/core/classfile')
| -rw-r--r-- | compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala index 131c9cf9b..c5194fb93 100644 --- a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala +++ b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala @@ -5,6 +5,7 @@ package classfile import Contexts._, Symbols._, Types._, Names._, StdNames._, NameOps._, Scopes._, Decorators._ import SymDenotations._, unpickleScala2.Scala2Unpickler._, Constants._, Annotations._, util.Positions._ +import NameExtractors.ModuleClassName import ast.tpd._ import java.io.{ File, IOException } import java.lang.Integer.toHexString @@ -950,7 +951,7 @@ class ClassfileParser( val start = starts(index) if (in.buf(start).toInt != CONSTANT_CLASS) errorBadTag(start) val name = getExternalName(in.getChar(start + 1)) - if (name.isModuleClassName && (name ne nme.nothingRuntimeClass) && (name ne nme.nullRuntimeClass)) + if (name.is(ModuleClassName) && (name ne nme.nothingRuntimeClass) && (name ne nme.nullRuntimeClass)) // Null$ and Nothing$ ARE classes c = ctx.requiredModule(name.sourceModuleName) else c = classNameToSymbol(name) |