diff options
| author | Martin Odersky <odersky@gmail.com> | 2006-09-04 14:40:34 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2006-09-04 14:40:34 +0000 |
| commit | 93cb4fff0fefa30779b4761b51618923515cc102 (patch) | |
| tree | 97547daf78d99585310a8ce194cce1038415142b /src | |
| parent | 7936eb95ccfaf88fda3a31505f1d5df42ab466af (diff) | |
| download | scala-93cb4fff0fefa30779b4761b51618923515cc102.tar.gz scala-93cb4fff0fefa30779b4761b51618923515cc102.tar.bz2 scala-93cb4fff0fefa30779b4761b51618923515cc102.zip | |
slight modification to implicits search
fixed bug 716
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 5b0cdab181..4367771c9a 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -1525,7 +1525,7 @@ trait Parsers requires SyntaxAnalyzer { val tp = typedOpt(); val rhs = if (tp.isEmpty || in.token == EQUALS) { accept(EQUALS); - if (tp != EmptyTree && in.token == USCORE) { + if (!tp.isEmpty && in.token == USCORE) { in.nextToken(); EmptyTree } else diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index 872d1cabdb..59917a4037 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -2015,8 +2015,7 @@ trait Typers requires Analyzer { for (val arg <- args) getParts(arg, s) case ThisType(_) => getParts(tp.widen, s) - case SingleType(pre, _) => - getParts(pre, s) + case _: SingletonType => getParts(tp.widen, s) case RefinedType(ps, _) => for (val p <- ps) getParts(p, s) |