diff options
| author | buraq <buraq@epfl.ch> | 2003-07-09 08:45:52 +0000 |
|---|---|---|
| committer | buraq <buraq@epfl.ch> | 2003-07-09 08:45:52 +0000 |
| commit | 76f378175a099bae14588f37bfb548993b51d900 (patch) | |
| tree | d60fb879199eb9e0d9c5342eb598f538c2198f43 /sources/scalac/typechecker/Analyzer.java | |
| parent | 57830a98fc7fd743445abc9faf056de03fa18e7c (diff) | |
| download | scala-76f378175a099bae14588f37bfb548993b51d900.tar.gz scala-76f378175a099bae14588f37bfb548993b51d900.tar.bz2 scala-76f378175a099bae14588f37bfb548993b51d900.zip | |
fixed bug in adapt(...) with Martin
Diffstat (limited to 'sources/scalac/typechecker/Analyzer.java')
| -rw-r--r-- | sources/scalac/typechecker/Analyzer.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sources/scalac/typechecker/Analyzer.java b/sources/scalac/typechecker/Analyzer.java index 2dd60522d1..9ecb18b581 100644 --- a/sources/scalac/typechecker/Analyzer.java +++ b/sources/scalac/typechecker/Analyzer.java @@ -257,7 +257,6 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { */ void validate(Symbol sym) { checkNoConflict(sym, DEFERRED, PRIVATE); - checkNoConflict(sym, FINAL, PRIVATE); checkNoConflict(sym, FINAL, SEALED); checkNoConflict(sym, PRIVATE, PROTECTED); checkNoConflict(sym, PRIVATE, OVERRIDE); @@ -2174,7 +2173,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { tree, adapt(qual1, qualmode, Type.AnyType), name); case Ident(Name name): - if (((mode & PATTERNmode) != 0) && name.isVariable()) { + if (((mode & (PATTERNmode | FUNmode)) == PATTERNmode) && name.isVariable()) { //System.out.println("pat var " + name + ":" + pt);//DEBUG Symbol vble, vble2 = null; |