diff options
author | paltherr <paltherr@epfl.ch> | 2004-03-10 14:30:14 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-03-10 14:30:14 +0000 |
commit | f6f7e50bfd51ff4c126623c2aba1cfc48e7fab1b (patch) | |
tree | a42b1f11cb3afffb2ff07f7c96a26e29d2055369 /sources/scalac/checkers | |
parent | de42629d73467e92dbedee498ccd531e156bcd03 (diff) | |
download | scala-f6f7e50bfd51ff4c126623c2aba1cfc48e7fab1b.tar.gz scala-f6f7e50bfd51ff4c126623c2aba1cfc48e7fab1b.tar.bz2 scala-f6f7e50bfd51ff4c126623c2aba1cfc48e7fab1b.zip |
- Fixed ATree generator and Tree checker for ne...
- Fixed ATree generator and Tree checker for new use of Idents with
static syms
Diffstat (limited to 'sources/scalac/checkers')
-rw-r--r-- | sources/scalac/checkers/TreeChecker.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sources/scalac/checkers/TreeChecker.java b/sources/scalac/checkers/TreeChecker.java index b409775629..3c1368552c 100644 --- a/sources/scalac/checkers/TreeChecker.java +++ b/sources/scalac/checkers/TreeChecker.java @@ -268,7 +268,8 @@ public class TreeChecker { Tree fun = TreeInfo.methPart(bases[0]); assert fun instanceof Tree.Ident: show(tree); Symbol symbol = fun.symbol(); - assert symbol != null && symbol.isInitializer(): show(tree); + assert symbol != null && !symbol.isLabel(): show(tree); + assert symbol.isInitializer(): show(tree); return expression(bases[0], definitions.UNIT_TYPE()); case Apply(Tree vfun, Tree[] vargs): @@ -342,8 +343,8 @@ public class TreeChecker { return selection(tree); case Ident(_): - if (symbol.owner().isStaticOwner()) return true; - if (symbol.isInitializer()) return true; + if (!symbol.isLabel() && symbol.isInitializer()) return true; + if (!symbol.isLabel() && symbol.isStatic()) return true; assert labels.contains(symbol): show(tree); assert symbol.owner() == currentMember(): show(tree); return true; |