diff options
author | paltherr <paltherr@epfl.ch> | 2004-04-04 17:31:06 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-04-04 17:31:06 +0000 |
commit | 8127c2eeeff7ee3a3f65a205020d50c4c5cdba16 (patch) | |
tree | 1277246b5f4a691022a054eae511f7baa9e84e75 /sources | |
parent | 1b604c5f4a0dd06733e931ef0d623ebddfb801d7 (diff) | |
download | scala-8127c2eeeff7ee3a3f65a205020d50c4c5cdba16.tar.gz scala-8127c2eeeff7ee3a3f65a205020d50c4c5cdba16.tar.bz2 scala-8127c2eeeff7ee3a3f65a205020d50c4c5cdba16.zip |
- Removed usage of ERROR in qualifyingClass
Diffstat (limited to 'sources')
-rw-r--r-- | sources/scala/tools/scalac/typechecker/Analyzer.scala | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sources/scala/tools/scalac/typechecker/Analyzer.scala b/sources/scala/tools/scalac/typechecker/Analyzer.scala index c40252e189..90767afe75 100644 --- a/sources/scala/tools/scalac/typechecker/Analyzer.scala +++ b/sources/scala/tools/scalac/typechecker/Analyzer.scala @@ -2139,7 +2139,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer( else { error(tree.pos, "" + tree + " can be used only in a class, object, or template"); - Symbol.ERROR + Symbol.NONE } } else { var i: Context = context; @@ -2150,7 +2150,7 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer( i.owner else { error(tree.pos, "" + name + " is not an enclosing class"); - Symbol.ERROR + Symbol.NONE } } } @@ -2681,10 +2681,10 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer( case Tree$Super(qualifier, mixin) => val clazz: Symbol = qualifyingClass(tree, qualifier); - tree.setSymbol(clazz); - if (clazz.isError()) { + if (clazz.isNone()) { tree.setType(Type.ErrorType); } else { + tree.setSymbol(clazz); val parents = clazz.parents(); if (mixin == TypeNames.EMPTY) { tree.setType(parents(0).instanceType()); @@ -2702,13 +2702,14 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer( case Tree$This(name) => val clazz: Symbol = qualifyingClass(tree, name); - tree.setSymbol(clazz); - if (clazz.isError()) + if (clazz.isNone()) tree.setType(Type.ErrorType); - else + else { + tree.setSymbol(clazz); tree.setType( if (pt != null && pt.isStable() || (mode & QUALmode) != 0) clazz.thisType() else clazz.typeOfThis()); + } case Tree$Select(qual, name) => val qualmode: int = EXPRmode | POLYmode | QUALmode; |