From e1181d9f5b3fc56baafbe859d3d3441dfdb113a1 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 22 Mar 2017 11:30:26 +0100 Subject: Fix typos and redundant statements in previous commits --- compiler/src/dotty/tools/dotc/config/Config.scala | 2 +- compiler/src/dotty/tools/dotc/core/SymDenotations.scala | 3 +-- compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) (limited to 'compiler/src') diff --git a/compiler/src/dotty/tools/dotc/config/Config.scala b/compiler/src/dotty/tools/dotc/config/Config.scala index a225b3019..65e9d3856 100644 --- a/compiler/src/dotty/tools/dotc/config/Config.scala +++ b/compiler/src/dotty/tools/dotc/config/Config.scala @@ -10,7 +10,7 @@ object Config { final val checkCacheMembersNamed = false - final val semanticNames = true + final val semanticNames = false /** When updating a constraint bound, check that the constrained parameter * does not appear at the top-level of either of its bounds. diff --git a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala index 150bb1584..0483e0ca1 100644 --- a/compiler/src/dotty/tools/dotc/core/SymDenotations.scala +++ b/compiler/src/dotty/tools/dotc/core/SymDenotations.scala @@ -433,9 +433,8 @@ object SymDenotations { val fn2 = fullNameSeparated(separator, true) assert(fn1.toString == fn2.toString, s"mismatch, was: $fn1, sem: $fn2") fn2 - } + } else fullNameSeparated(separator, false) - } /** The encoded flat name of this denotation, where joined names are separated by `separator` characters. */ def flatName(implicit ctx: Context): Name = fullNameSeparated("") diff --git a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala index 40e561d3f..0ea643e0d 100644 --- a/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala +++ b/compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala @@ -248,11 +248,8 @@ class ClassfileLoader(val classfile: AbstractFile) extends SymbolLoader { (module, _) => new NoCompleter() withDecls newScope withSourceModule (_ => module)) .moduleClass.denot.asClass } - val res = if (rootDenot is ModuleClass) (linkedDenot, rootDenot) else (rootDenot, linkedDenot) - println(s"root denots of ${rootDenot.name.debugString} = ${res._1.name.debugString}, ${res._2.name.debugString} / ${rootDenot is ModuleClass}") - res } override def doComplete(root: SymDenotation)(implicit ctx: Context): Unit = -- cgit v1.2.3