From c599f7a693dbc363962d3f17f5eab5222136857f Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 27 Mar 2017 17:09:42 +0200 Subject: Drop Config.semanticNames option We now handle only semantic names. Also, name extractor tags and TASTY name tags are now aligned. --- compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'compiler/src/dotty/tools/dotc/core/classfile') 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) -- cgit v1.2.3