diff options
| author | Martin Odersky <odersky@gmail.com> | 2007-05-29 14:17:05 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2007-05-29 14:17:05 +0000 |
| commit | 8397c7b73c2930229eae509e089550b0c3020ce2 (patch) | |
| tree | 2d5101381353b7b2448708459339230a2a28c445 /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 6018a932ce3ffc259914ee442f5ea3983439e0f1 (diff) | |
| download | scala-8397c7b73c2930229eae509e089550b0c3020ce2.tar.gz scala-8397c7b73c2930229eae509e089550b0c3020ce2.tar.bz2 scala-8397c7b73c2930229eae509e089550b0c3020ce2.zip | |
fixed bugs 1143, 1136, 1102
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 30f693155d..7b6d84acb8 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -939,7 +939,7 @@ trait Typers requires Analyzer { val tparams1 = List.mapConserve(cdef.tparams)(typedAbsTypeDef) val impl1 = newTyper(context.make(cdef.impl, clazz, newTemplateScope(cdef.impl, clazz))) .typedTemplate(cdef.impl, parentTypes(cdef.impl)) - val impl2 = addSyntheticMethods(impl1, clazz, context.unit) + val impl2 = addSyntheticMethods(impl1, clazz, context) copy.ClassDef(cdef, cdef.mods, cdef.name, tparams1, impl2) .setType(NoType) } @@ -954,7 +954,7 @@ trait Typers requires Analyzer { val clazz = mdef.symbol.moduleClass val impl1 = newTyper(context.make(mdef.impl, clazz, newTemplateScope(mdef.impl, clazz))) .typedTemplate(mdef.impl, parentTypes(mdef.impl)) - val impl2 = addSyntheticMethods(impl1, clazz, context.unit) + val impl2 = addSyntheticMethods(impl1, clazz, context) copy.ModuleDef(mdef, mdef.mods, mdef.name, impl2) setType NoType } @@ -2854,7 +2854,7 @@ trait Typers requires Analyzer { def improves(info1: ImplicitInfo, info2: ImplicitInfo) = (info2 == NoImplicitInfo) || (info1 != NoImplicitInfo) && - isStrictlyBetter(info1.tpe, info2.tpe) + isStrictlyBetterExpr(info1.tpe, info2.tpe) val shadowed = new HashSet[Name](8) def isApplicable(info: ImplicitInfo): boolean = !containsError(info.tpe) && |