aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/SymbolLoaders.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2014-01-11 02:15:22 +0100
committerMartin Odersky <odersky@gmail.com>2014-01-11 02:15:22 +0100
commit561e2e864daa2cd017aa938a73739e5af6c4c306 (patch)
tree288e61b727e48f07790850c97baf87004746ba25 /src/dotty/tools/dotc/core/SymbolLoaders.scala
parent937dbdcf1d15548a6870c18514441d7b4e0bf234 (diff)
downloaddotty-561e2e864daa2cd017aa938a73739e5af6c4c306.tar.gz
dotty-561e2e864daa2cd017aa938a73739e5af6c4c306.tar.bz2
dotty-561e2e864daa2cd017aa938a73739e5af6c4c306.zip
Strip implicit parameters when deciding specifity of methods.
Diffstat (limited to 'src/dotty/tools/dotc/core/SymbolLoaders.scala')
-rw-r--r--src/dotty/tools/dotc/core/SymbolLoaders.scala16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/dotty/tools/dotc/core/SymbolLoaders.scala b/src/dotty/tools/dotc/core/SymbolLoaders.scala
index a02af441f..34376437b 100644
--- a/src/dotty/tools/dotc/core/SymbolLoaders.scala
+++ b/src/dotty/tools/dotc/core/SymbolLoaders.scala
@@ -90,7 +90,7 @@ class SymbolLoaders {
*/
def enterClassAndModule(
owner: Symbol, name: PreName, completer: SymbolLoader,
- flags: FlagSet = EmptyFlags, scope: Scope = EmptyScope)(implicit ctx: CondensedContext) {
+ flags: FlagSet = EmptyFlags, scope: Scope = EmptyScope)(implicit ctx: CondensedContext): Unit = {
val clazz = enterClass(owner, name, completer, flags, scope)
val module = enterModule(
owner, name, completer,
@@ -107,7 +107,7 @@ class SymbolLoaders {
*/
def enterToplevelsFromSource(
owner: Symbol, name: PreName, src: AbstractFile,
- scope: Scope = EmptyScope)(implicit ctx: CondensedContext) {
+ scope: Scope = EmptyScope)(implicit ctx: CondensedContext): Unit = {
enterClassAndModule(owner, name, new SourcefileLoader(src)(ctx.condensed), scope = scope)
}
@@ -124,7 +124,7 @@ class SymbolLoaders {
/** Initialize toplevel class and module symbols in `owner` from class path representation `classRep`
*/
- def initializeFromClassPath(owner: Symbol, classRep: ClassPath#ClassRep)(implicit ctx: CondensedContext) {
+ def initializeFromClassPath(owner: Symbol, classRep: ClassPath#ClassRep)(implicit ctx: CondensedContext): Unit = {
((classRep.binary, classRep.source): @unchecked) match {
case (Some(bin), Some(src)) if needCompile(bin, src) && !binaryOnly(owner, classRep.name) =>
if (ctx.settings.verbose.value) ctx.inform("[symloader] picked up newer source file for " + src.path)
@@ -148,7 +148,7 @@ class SymbolLoaders {
private[core] val preDecls: MutableScope = newScope
- def doComplete(root: SymDenotation) {
+ def doComplete(root: SymDenotation): Unit = {
assert(root is PackageClass, root)
def maybeModuleClass(classRep: ClassPath#ClassRep) = classRep.name.last == '$'
val pre = root.owner.thisType
@@ -173,7 +173,7 @@ class SymbolLoaders {
}
/** if there's a `package` member object in `pkgClass`, enter its members into it. */
- def openPackageModule(pkgClass: ClassSymbol)(implicit ctx: Context) {
+ def openPackageModule(pkgClass: ClassSymbol)(implicit ctx: Context): Unit = {
val pkgModule = pkgClass.info.decl(nme.PACKAGEkw).symbol
if ((pkgModule is Module) &&
(pkgModule.isCompleted ||
@@ -182,7 +182,7 @@ class SymbolLoaders {
openPackageModule(pkgModule, pkgClass)
}
- def openPackageModule(container: Symbol, dest: ClassSymbol)(implicit ctx: Context) {
+ def openPackageModule(container: Symbol, dest: ClassSymbol)(implicit ctx: Context): Unit = {
def isImportable(sym: Symbol) = !(sym is Private) && !sym.isConstructor
// unlink existing symbols in the package
for (member <- container.info.decls.iterator) {
@@ -226,7 +226,7 @@ abstract class SymbolLoader extends LazyType {
def description: String
override def complete(root: SymDenotation): Unit = {
- def signalError(ex: Exception) {
+ def signalError(ex: Exception): Unit = {
if (cctx.debug) ex.printStackTrace()
val msg = ex.getMessage()
cctx.error(
@@ -289,7 +289,7 @@ class ClassfileLoader(val classfile: AbstractFile)(implicit val cctx: CondensedC
else (rootDenot, linkedDenot)
}
- def doComplete(root: SymDenotation) {
+ def doComplete(root: SymDenotation): Unit = {
val (classRoot, moduleRoot) = rootDenots(root.asClass)
new ClassfileParser(classfile, classRoot, moduleRoot)(cctx).run()
}