diff options
| author | Martin Odersky <odersky@gmail.com> | 2014-12-18 15:39:55 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2014-12-18 15:43:22 +0100 |
| commit | 223fa2bea328fc53f87d6f9d0c28c67545e831af (patch) | |
| tree | 0bfffb4a2168df6527779d4d97a87f7309ee333c /src/dotty/tools/dotc/core/pickling/UnPickler.scala | |
| parent | e0bf1758ac32d69cf97d28f449cc0400755e3914 (diff) | |
| download | dotty-223fa2bea328fc53f87d6f9d0c28c67545e831af.tar.gz dotty-223fa2bea328fc53f87d6f9d0c28c67545e831af.tar.bz2 dotty-223fa2bea328fc53f87d6f9d0c28c67545e831af.zip | |
More careful usage of unforced decls in classes.
1) Rename `decls` to `unforcedDecls` to make it clear that
it is danegrous to use.
2) Prefer `info.decls` over `unforcedDecls`.
This fixes the problem reported in #305 where the primary
constructor was not found.
Diffstat (limited to 'src/dotty/tools/dotc/core/pickling/UnPickler.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/pickling/UnPickler.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dotty/tools/dotc/core/pickling/UnPickler.scala b/src/dotty/tools/dotc/core/pickling/UnPickler.scala index 728048700..56df65f96 100644 --- a/src/dotty/tools/dotc/core/pickling/UnPickler.scala +++ b/src/dotty/tools/dotc/core/pickling/UnPickler.scala @@ -343,7 +343,7 @@ class UnPickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot: if (denot.exists && !denot1.exists) { // !!!DEBUG val alts = denot.alternatives map (d => d+":"+d.info+"/"+d.signature) System.err.println(s"!!! disambiguation failure: $alts") - val members = denot.alternatives.head.symbol.owner.decls.toList map (d => d+":"+d.info+"/"+d.signature) + val members = denot.alternatives.head.symbol.owner.info.decls.toList map (d => d+":"+d.info+"/"+d.signature) System.err.println(s"!!! all members: $members") } if (tag == EXTref) sym else sym.moduleClass @@ -475,7 +475,7 @@ class UnPickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot: val unpickler = new LocalUnpickler() withDecls symScope(cls) if (flags is ModuleClass) unpickler withSourceModule (implicit ctx => - cls.owner.decls.lookup(cls.name.sourceModuleName) + cls.owner.info.decls.lookup(cls.name.sourceModuleName) .suchThat(_ is Module).symbol) else unpickler } @@ -637,7 +637,7 @@ class UnPickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot: // and also for the inner Transform class in all views. We fix it by // replacing the this with the appropriate super. if (sym.owner != thispre.cls) { - val overriding = thispre.cls.decls.lookup(sym.name) + val overriding = thispre.cls.info.decls.lookup(sym.name) if (overriding.exists && overriding != sym) { val base = pre.baseTypeWithArgs(sym.owner) assert(base.exists) |