From 91cb19d56861c80c2968e3ede2fef7ccab5f38ec Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 23 Jan 2006 18:57:47 +0000 Subject: --- src/compiler/scala/tools/nsc/typechecker/Namers.scala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/compiler/scala/tools/nsc/typechecker/Namers.scala') diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala index 1850d2dc29..5ab522b101 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala @@ -82,17 +82,21 @@ trait Namers requires Analyzer { (if (sym.hasFlag(CASE)) "case class " + sym.name else sym.toString())); def enterInScope(sym: Symbol): Symbol = { + // allow for overloaded methods if (!(sym.isSourceMethod && sym.owner.isClass)) { val prev = context.scope.lookupEntry(sym.name); if (prev != null && prev.owner == context.scope && !prev.sym.isSourceMethod) { +/* if (sym.sourceFile == null && prev.sym.sourceFile == null) {} + else if (sym.sourceFile != null && prev.sym.sourceFile != null && sym.sourceFile.equals(prev.sym.sourceFile)) {} else { System.err.println("SYM: " + sym.sourceFile); System.err.println("PRV: " + prev.sym.sourceFile); - doubleDefError(sym.pos, prev.sym); - } +*/ + doubleDefError(sym.pos, prev.sym); +// } } } context.scope enter sym; @@ -151,7 +155,8 @@ trait Namers requires Analyzer { m = context.owner.newModule(pos, name); m.setFlag(flags); m.moduleClass.setFlag(flags | inConstructorFlag); - m.moduleClass.sourceFile = context.unit.source.getFile(); + if (m.owner.isPackageClass) + m.moduleClass.sourceFile = context.unit.source.getFile(); enterInScope(m) } if (m.owner.isPackageClass) currentRun.symSource(m) = context.unit.source.getFile(); -- cgit v1.2.3