diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-06-29 20:00:59 +0200 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-07-11 13:35:02 +0200 |
| commit | 60d81f81ddfc85719fd303e8d15d3891adbf4dfd (patch) | |
| tree | 17e830e9e73157451c1a46ba2d716ca0d1037f97 /src/dotty/tools/dotc/core/TypeOps.scala | |
| parent | d1f809f14cad2c14c312767d71361c7f2e7d8244 (diff) | |
| download | dotty-60d81f81ddfc85719fd303e8d15d3891adbf4dfd.tar.gz dotty-60d81f81ddfc85719fd303e8d15d3891adbf4dfd.tar.bz2 dotty-60d81f81ddfc85719fd303e8d15d3891adbf4dfd.zip | |
Start new, direct HK scheme
- Re-introduce newHK option. Label some things that will be
removed with OLD.
Diffstat (limited to 'src/dotty/tools/dotc/core/TypeOps.scala')
| -rw-r--r-- | src/dotty/tools/dotc/core/TypeOps.scala | 4 |
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 6b75b574e..9019df6b7 100644 --- a/src/dotty/tools/dotc/core/TypeOps.scala +++ b/src/dotty/tools/dotc/core/TypeOps.scala @@ -158,7 +158,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object. tp case tp: RefinedType => tp.derivedRefinedType(simplify(tp.parent, theMap), tp.refinedName, simplify(tp.refinedInfo, theMap)) - .normalizeHkApply + .normalizeHkApplyOLD case tp: TypeAlias => tp.derivedTypeAlias(simplify(tp.alias, theMap)) case AndType(l, r) => @@ -384,7 +384,7 @@ trait TypeOps { this: Context => // TODO: Make standalone object. var formals: SimpleMap[TypeName, Symbol] = SimpleMap.Empty // A map of all formal parent parameter // Strip all refinements from parent type, populating `refinements` and `formals` maps. - def normalizeToRef(tp: Type): TypeRef = tp.dealias.normalizeHkApply match { + def normalizeToRef(tp: Type): TypeRef = tp.dealias.normalizeHkApplyOLD match { case tp: TypeRef => tp case tp @ RefinedType(tp1, name: TypeName, rinfo) => |