diff options
| author | Martin Odersky <odersky@gmail.com> | 2003-03-07 15:18:48 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2003-03-07 15:18:48 +0000 |
| commit | 4d43c508f360efa148448b474cd995e5efa0344b (patch) | |
| tree | 183a76a17e87db0c4216de22a1d7f1649e64b87e | |
| parent | a6e24444781bd5d1d492b2f914177126df2884b1 (diff) | |
| download | scala-4d43c508f360efa148448b474cd995e5efa0344b.tar.gz scala-4d43c508f360efa148448b474cd995e5efa0344b.tar.bz2 scala-4d43c508f360efa148448b474cd995e5efa0344b.zip | |
*** empty log message ***
| -rw-r--r-- | sources/scalac/symtab/Symbol.java | 4 | ||||
| -rw-r--r-- | sources/scalac/symtab/Type.java | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java index dcc3dda65b..3290821b79 100644 --- a/sources/scalac/symtab/Symbol.java +++ b/sources/scalac/symtab/Symbol.java @@ -848,9 +848,9 @@ public abstract class Symbol implements Modifiers, Kinds { } return Symbol.NONE; default: - if (symtype.isSameAs(sym1type)) return sym1; + if (symtype.isSubType(sym1type)) return sym1; else { - System.out.println(this + locationString() + " does not override " + sym1 + sym1.locationString() + ", since " + symtype + " # " + sym1type);//DEBUG + System.out.println(this + locationString() + " does not override " + sym1 + sym1.locationString() + ", since " + symtype + " !<= " + sym1type);//DEBUG return Symbol.NONE; } } diff --git a/sources/scalac/symtab/Type.java b/sources/scalac/symtab/Type.java index fdba7b8f40..abaa4f23ad 100644 --- a/sources/scalac/symtab/Type.java +++ b/sources/scalac/symtab/Type.java @@ -1453,6 +1453,8 @@ public class Type implements Modifiers, Kinds, TypeTags { switch (that) { case SingleType(Type pre1, Symbol sym1): return sym == sym1 && pre.isSameAs(pre1); + //|| sym.type.isStable() && sym.type.isSameAs(that) + //|| sym1.type.isStable() && this.isSameAs(sym1.type); case ThisType(Symbol sym1): return sym.isModule() && sym.moduleClass() == sym1 |