diff options
author | Kato Kazuyoshi <kato.kazuyoshi@gmail.com> | 2011-06-18 14:21:47 +0000 |
---|---|---|
committer | Kato Kazuyoshi <kato.kazuyoshi@gmail.com> | 2011-06-18 14:21:47 +0000 |
commit | 60c8697f0c39f71c7e735ad02f483cd8779c3567 (patch) | |
tree | 02dc4f35d0ab8b443e2d094e6f3de5799a5c1a92 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala | |
parent | 8e10b0579b15ef85ca577ae941adc941dfb62079 (diff) | |
download | scala-60c8697f0c39f71c7e735ad02f483cd8779c3567.tar.gz scala-60c8697f0c39f71c7e735ad02f483cd8779c3567.tar.bz2 scala-60c8697f0c39f71c7e735ad02f483cd8779c3567.zip |
Fixes #4490 and #4467.
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Implicits.scala | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala index 7d4d42c224..87bde02b94 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala @@ -428,12 +428,12 @@ trait Implicits { case _ => tp.isStable } - /** Does type `tp' match expected type `pt' - * This is the case if either `pt' is a unary function type with a - * HasMethodMatching type as result, and `tp' is a unary function + /** Does type `tp` match expected type `pt` + * This is the case if either `pt` is a unary function type with a + * HasMethodMatching type as result, and `tp` is a unary function * or method type whose result type has a method whose name and type * correspond to the HasMethodMatching type, - * or otherwise if `tp' is compatible with `pt'. + * or otherwise if `tp` is compatible with `pt`. * This method is performance critical: 5-8% of typechecking time. */ private def matchesPt(tp: Type, pt: Type, undet: List[Symbol]) = { @@ -620,15 +620,15 @@ trait Implicits { } } - /** Is `sym' the standard conforms method in Predef? - * Note: DON't replace this by sym == Predef_conforms, as Predef_conforms is a `def' + /** Is `sym` the standard conforms method in Predef? + * Note: DON't replace this by sym == Predef_conforms, as Predef_conforms is a `def` * which does a member lookup (it can't be a lazy val because we might reload Predef * during resident compilations). */ private def isConformsMethod(sym: Symbol) = sym.name == nme.conforms && sym.owner == PredefModule.moduleClass - /** Should implicit definition symbol `sym' be considered for applicability testing? + /** Should implicit definition symbol `sym` be considered for applicability testing? * This is the case if one of the following holds: * - the symbol's type is initialized * - the symbol comes from a classfile |