diff options
| author | Martin Odersky <odersky@gmail.com> | 2007-02-21 21:34:13 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2007-02-21 21:34:13 +0000 |
| commit | 316228912b8f94e98acf26e4563ab3880c7e3aba (patch) | |
| tree | 7d6793ed78fa4b7b476658586407060875f7ae59 /src/compiler/scala/tools/nsc/typechecker/Typers.scala | |
| parent | 914932babf9343fdfcec20f25bfb1576dc8c433b (diff) | |
| download | scala-316228912b8f94e98acf26e4563ab3880c7e3aba.tar.gz scala-316228912b8f94e98acf26e4563ab3880c7e3aba.tar.bz2 scala-316228912b8f94e98acf26e4563ab3880c7e3aba.zip | |
fixed problem with gadts in the test suite
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Typers.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index d6e833b916..85f63af910 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -477,9 +477,11 @@ trait Typers requires Analyzer { if (context.reportGeneralErrors) { val context1 = context.makeSilent(context.reportAmbiguousErrors) context1.undetparams = context.undetparams + context1.savedTypeBounds = context.savedTypeBounds val typer1 = newTyper(context1) val result = op(typer1) context.undetparams = context1.undetparams + context.savedTypeBounds = context1.savedTypeBounds result } else { op(this) @@ -2218,8 +2220,9 @@ trait Typers requires Analyzer { fun2.isInstanceOf[Select] && !fun2.tpe.isInstanceOf[ImplicitMethodType] && ((fun2.symbol eq null) || !fun2.symbol.isConstructor) && - (mode & (EXPRmode | SNDTRYmode)) == EXPRmode) tryTypedApply(fun2, args) - else { + (mode & (EXPRmode | SNDTRYmode)) == EXPRmode) { + tryTypedApply(fun2, args) + } else { typedApply(tree, fun2, args, mode, pt) } case ex: TypeError => |