diff options
| author | paltherr <paltherr@epfl.ch> | 2004-02-03 09:32:28 +0000 |
|---|---|---|
| committer | paltherr <paltherr@epfl.ch> | 2004-02-03 09:32:28 +0000 |
| commit | bc2b4c14e4aeb91469fa07c098dd100e9a3a0ed2 (patch) | |
| tree | 50ba125435ec58a76459671dc0ebdfe4edc161dc /sources/scalac/symtab/Type.java | |
| parent | 982254cf56a6a26d07016084a2e9e88594bc0177 (diff) | |
| download | scala-bc2b4c14e4aeb91469fa07c098dd100e9a3a0ed2.tar.gz scala-bc2b4c14e4aeb91469fa07c098dd100e9a3a0ed2.tar.bz2 scala-bc2b4c14e4aeb91469fa07c098dd100e9a3a0ed2.zip | |
- Removed flag STATIC
Diffstat (limited to 'sources/scalac/symtab/Type.java')
| -rw-r--r-- | sources/scalac/symtab/Type.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sources/scalac/symtab/Type.java b/sources/scalac/symtab/Type.java index d21cbba3ba..f0041be728 100644 --- a/sources/scalac/symtab/Type.java +++ b/sources/scalac/symtab/Type.java @@ -847,7 +847,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags { */ public Symbol lookup(Symbol sym, Type pre, Relation relation) { assert !sym.isOverloaded(): Debug.show(sym); - if (sym.isPrivate() || sym.isStatic() || sym.isInitializer()) + if (sym.isPrivate() || sym.isInitializer()) return symbol().isSubClass(sym.owner()) ? sym : Symbol.NONE; Type symtype = pre.memberType(sym).derefDef(); Symbol[] classes = classes(); @@ -882,8 +882,7 @@ public class Type implements Modifiers, Kinds, TypeTags, EntryTags { boolean warn) { if (sym == sym1) return true; - if (sym1.isPrivate() || sym1.isStatic() || sym1.isInitializer()) - return false; + if (sym1.isPrivate() || sym1.isInitializer()) return false; // System.out.println("Is 'sym1' " + relation + " 'sym' in 'pre' ?" // + "\n sym : " + Debug.show(sym) // + "\n sym1 : " + Debug.show(sym1) |