aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/TypeOps.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2013-03-15 18:48:20 +0100
committerMartin Odersky <odersky@gmail.com>2013-03-15 18:48:20 +0100
commit1d029f5f8f90a909ed140f7ef5cf656fafd9fc27 (patch)
treed7ed9423ebbd7b700f49c41f59da80963d68a6cf /src/dotty/tools/dotc/core/TypeOps.scala
parent0d2fd0fd49fb1b6d4ab344ae32da493b36c99ba7 (diff)
downloaddotty-1d029f5f8f90a909ed140f7ef5cf656fafd9fc27.tar.gz
dotty-1d029f5f8f90a909ed140f7ef5cf656fafd9fc27.tar.bz2
dotty-1d029f5f8f90a909ed140f7ef5cf656fafd9fc27.zip
Various fixes to make classfile loading work.
Can now read and display info of verious classfiles as listed in the showClass test. Great end of the week!
Diffstat (limited to 'src/dotty/tools/dotc/core/TypeOps.scala')
-rw-r--r--src/dotty/tools/dotc/core/TypeOps.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/TypeOps.scala b/src/dotty/tools/dotc/core/TypeOps.scala
index 48cd03f60..48bb91a1e 100644
--- a/src/dotty/tools/dotc/core/TypeOps.scala
+++ b/src/dotty/tools/dotc/core/TypeOps.scala
@@ -24,7 +24,7 @@ trait TypeOps { this: Context =>
else {
val tp1 = tp.derivedNamedType(asSeenFrom(tp.prefix, pre, cls, theMap))
// short-circuit instantiated type parameters
- if ((tp1 ne tp) && (sym is (TypeParam, butNot = Deferred))) tp1.dealias
+ if ((tp1 ne tp) && (sym is (TypeParam, butNot = Deferred))) tp1.dealias
else tp1
}
case ThisType(thiscls) =>
@@ -173,7 +173,7 @@ trait TypeOps { this: Context =>
case Some(info) => info & tp.refinedInfo
case none => tp.refinedInfo
})
- formals = formals.updated(name, tp1.member(name).symbol)
+ formals = formals.updated(name, tp1.typeParamNamed(name))
normalizeToRef(tp1)
case tp: TypeRef =>
tp