summaryrefslogtreecommitdiff
path: root/src/repl
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-09-12 13:28:06 -0700
committerPaul Phillips <paulp@improving.org>2013-09-13 02:42:37 -0700
commit671e6e03c7e096eda0c27262ae8605fa7af76f59 (patch)
treeb415fb7915ec80503605387b6ccd2ab29d9887a2 /src/repl
parent33a819f61b8b9c19708e8ae22bf25adf6cc7ac24 (diff)
downloadscala-671e6e03c7e096eda0c27262ae8605fa7af76f59.tar.gz
scala-671e6e03c7e096eda0c27262ae8605fa7af76f59.tar.bz2
scala-671e6e03c7e096eda0c27262ae8605fa7af76f59.zip
Corrects behavior of finalResultType.
The implementation had come to depend on finalResultType accidentally doing things beyond its charter - in particular, widening types. After hunting down and fixing the call sites depending on the bugs, I was able to rewrite the method to do only what it's supposed to do. I threw in a different way of writing it entirely to suggest how some correctness might be obtained in the future. It's a lot harder for a method written like this to break.
Diffstat (limited to 'src/repl')
-rw-r--r--src/repl/scala/tools/nsc/interpreter/ExprTyper.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/ExprTyper.scala b/src/repl/scala/tools/nsc/interpreter/ExprTyper.scala
index 6406dacc24..bb5fe07fc9 100644
--- a/src/repl/scala/tools/nsc/interpreter/ExprTyper.scala
+++ b/src/repl/scala/tools/nsc/interpreter/ExprTyper.scala
@@ -28,7 +28,7 @@ trait ExprTyper {
case IR.Success =>
val sym0 = symbolOfTerm(name)
// drop NullaryMethodType
- sym0.cloneSymbol setInfo exitingTyper(sym0.info.finalResultType)
+ sym0.cloneSymbol setInfo exitingTyper(sym0.tpe_*.finalResultType)
case _ => NoSymbol
}
}