diff options
| author | Martin Odersky <odersky@gmail.com> | 2014-03-02 12:03:32 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2014-03-02 12:03:56 +0100 |
| commit | 0ebdbde3d51f92647f3b1cd452d60648ed8e7a39 (patch) | |
| tree | fa8016066b11b10db7f47d9a0a875a8114d28681 /src/dotty/tools/dotc/core/pickling/UnPickler.scala | |
| parent | cba210d0c362759a710f4d9b5dbf1ecfe0d1f278 (diff) | |
| download | dotty-0ebdbde3d51f92647f3b1cd452d60648ed8e7a39.tar.gz dotty-0ebdbde3d51f92647f3b1cd452d60648ed8e7a39.tar.bz2 dotty-0ebdbde3d51f92647f3b1cd452d60648ed8e7a39.zip | |
Rename baseType -> baseTypeRef
What was `baseType` and is now `baseTypeRef` only computes the prefix of of basetype, not the type arguments.
If type arguments need to be included there is `baseTypeWithArgs`. The reason is that type arguments are usually already encoded as member types. But this was a source of errors because in Scala 2, baseType includes the type arguements.
(also added test file structural.scala forgotten from last commit)
Diffstat (limited to 'src/dotty/tools/dotc/core/pickling/UnPickler.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/pickling/UnPickler.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/pickling/UnPickler.scala b/src/dotty/tools/dotc/core/pickling/UnPickler.scala index 84b300a2a..c48e71052 100644 --- a/src/dotty/tools/dotc/core/pickling/UnPickler.scala +++ b/src/dotty/tools/dotc/core/pickling/UnPickler.scala @@ -631,7 +631,7 @@ class UnPickler(bytes: Array[Byte], classRoot: ClassDenotation, moduleClassRoot: if (sym.owner != cls) { val overriding = cls.decls.lookup(sym.name) if (overriding.exists && overriding != sym) { - val base = pre.baseType(sym.owner) + val base = pre.baseTypeWithArgs(sym.owner) assert(base.exists) pre = SuperType(pre, base) } |