diff options
author | Paul Phillips <paulp@improving.org> | 2010-02-20 04:47:43 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-02-20 04:47:43 +0000 |
commit | d6fb9d7809ea0c8cd9b8e3b0f46c78cfb96ad890 (patch) | |
tree | 7d3516801100aaa5afaf4f48648953180246c3ec /src | |
parent | cabe5170506e843e3400a7d761f5e7e0b19ae3a1 (diff) | |
download | scala-d6fb9d7809ea0c8cd9b8e3b0f46c78cfb96ad890.tar.gz scala-d6fb9d7809ea0c8cd9b8e3b0f46c78cfb96ad890.tar.bz2 scala-d6fb9d7809ea0c8cd9b8e3b0f46c78cfb96ad890.zip |
Temporarily reverting r20928 as it is leading t...
Temporarily reverting r20928 as it is leading to ant dist crashing.
Review by milessabin.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/interactive/Global.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/Typers.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/Global.scala b/src/compiler/scala/tools/nsc/interactive/Global.scala index d8ea6df97d..99117e014b 100644 --- a/src/compiler/scala/tools/nsc/interactive/Global.scala +++ b/src/compiler/scala/tools/nsc/interactive/Global.scala @@ -494,7 +494,7 @@ self => println("starting typedTreeAt") val tree = locateTree(pos) println("at pos "+pos+" was found: "+tree+tree.pos.show) - if (stabilizedType(tree) ne null) { + if (tree.tpe ne null) { println("already attributed") tree } else { diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala index cd2cc3a3a6..e39f552458 100644 --- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala +++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala @@ -3519,7 +3519,7 @@ trait Typers { self: Analyzer => if (!reallyExists(sym)) { if (settings.debug.value) Console.err.println("qual = "+qual+":"+qual.tpe+"\nSymbol="+qual.tpe.termSymbol+"\nsymbol-info = "+qual.tpe.termSymbol.info+"\nscope-id = "+qual.tpe.termSymbol.info.decls.hashCode()+"\nmembers = "+qual.tpe.members+"\nname = "+name+"\nfound = "+sym+"\nowner = "+context.enclClass.owner) - if (!qual.tpe.widen.isErroneous && !onlyPresentation) { + if (!qual.tpe.widen.isErroneous) { error(tree.pos, if (name == nme.CONSTRUCTOR) qual.tpe.widen+" does not have a constructor" |