From 6bd7ba9ea4484ee2065dd16077cba6c26b2050d9 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 29 Jun 2016 09:50:27 +0200 Subject: Remove refinement encoding of hk types Remove the code that implemented the encoding of hk types using refinements. Drop the notion that RefinedTypes can be type parameters. This is no longer true under the new representation. Also, refactoring MemberBinding -> TypeParamInfo --- src/dotty/tools/dotc/core/TypeOps.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/dotty/tools/dotc/core/TypeOps.scala') diff --git a/src/dotty/tools/dotc/core/TypeOps.scala b/src/dotty/tools/dotc/core/TypeOps.scala index 0d02de1da..3a797cce3 100644 --- a/src/dotty/tools/dotc/core/TypeOps.scala +++ b/src/dotty/tools/dotc/core/TypeOps.scala @@ -158,7 +158,6 @@ trait TypeOps { this: Context => // TODO: Make standalone object. tp case tp: RefinedType => tp.derivedRefinedType(simplify(tp.parent, theMap), tp.refinedName, simplify(tp.refinedInfo, theMap)) - .normalizeHkApplyOLD case tp: TypeAlias => tp.derivedTypeAlias(simplify(tp.alias, theMap)) case AndType(l, r) => @@ -386,7 +385,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object. // Strip all refinements from parent type, populating `refinements` and `formals` maps. def normalizeToRef(tp: Type): TypeRef = { def fail = throw new TypeError(s"unexpected parent type: $tp") - tp.dealias.normalizeHkApplyOLD match { + tp.dealias match { case tp: TypeRef => tp case tp @ RefinedType(tp1, name: TypeName, rinfo) => -- cgit v1.2.3