diff options
| author | cremet <cremet@epfl.ch> | 2004-03-08 18:44:45 +0000 |
|---|---|---|
| committer | cremet <cremet@epfl.ch> | 2004-03-08 18:44:45 +0000 |
| commit | fce53bc99b7d378beb7fa0ca91ef7ee9dd633e72 (patch) | |
| tree | f70bac934eafd04b2aecaf9fbb0a14566aacb9a8 /sources/scalac | |
| parent | a4737b5704f2f38a3a9971c0bfbec41d2e1b69d3 (diff) | |
| download | scala-fce53bc99b7d378beb7fa0ca91ef7ee9dd633e72.tar.gz scala-fce53bc99b7d378beb7fa0ca91ef7ee9dd633e72.tar.bz2 scala-fce53bc99b7d378beb7fa0ca91ef7ee9dd633e72.zip | |
- Added a node DocDef for documentation comments.
- Fixed a bug that made an error when stopping the compiler after phase
"analyze".
Diffstat (limited to 'sources/scalac')
| -rw-r--r-- | sources/scalac/Global.java | 4 | ||||
| -rw-r--r-- | sources/scalac/symtab/Symbol.java | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java index 5a02a5a435..bf95540e99 100644 --- a/sources/scalac/Global.java +++ b/sources/scalac/Global.java @@ -96,10 +96,6 @@ public abstract class Global { public final PrintWriter writer; public final TreePrinter treePrinter; - /** documentation comments of trees - */ - public final Map/*<Tree, String>*/ mapTreeComment = new HashMap(); - /** documentation comments of symbols */ public final Map/*<Symbol, String>*/ mapSymbolComment = new HashMap(); diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java index 6dbe109d21..03966f10b1 100644 --- a/sources/scalac/symtab/Symbol.java +++ b/sources/scalac/symtab/Symbol.java @@ -1859,7 +1859,9 @@ public class ClassSymbol extends TypeSymbol { public Type thisType() { Global global = Global.instance; - if (global.currentPhase.id > global.PHASE.ERASURE.id()) return type(); + if (global.currentPhase.id > global.PHASE.ERASURE.id()) + if (!global.PHASE.ERASURE.hasSkipFlag()) + return type(); return thistp; } |