aboutsummaryrefslogtreecommitdiff
path: root/src/dotty/tools/dotc/core/TypeOps.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2016-06-29 19:09:43 +0200
committerMartin Odersky <odersky@gmail.com>2016-07-11 13:34:59 +0200
commit4bf43f82c88dbeb0578e289b37ce1a7580aa22f2 (patch)
tree41c4483ffcf4e93e8d19f4ec89206a848738eb08 /src/dotty/tools/dotc/core/TypeOps.scala
parent178e90e441481364f19163a9dad624a4d859fb1b (diff)
downloaddotty-4bf43f82c88dbeb0578e289b37ce1a7580aa22f2.tar.gz
dotty-4bf43f82c88dbeb0578e289b37ce1a7580aa22f2.tar.bz2
dotty-4bf43f82c88dbeb0578e289b37ce1a7580aa22f2.zip
Turn on new hk scheme
For the moment under newHK flag. - avoid crasher in derivedTypeParams (NamedTypes don't always have symbols) - Revise logic in type comparer for new HK scheme
Diffstat (limited to 'src/dotty/tools/dotc/core/TypeOps.scala')
-rw-r--r--src/dotty/tools/dotc/core/TypeOps.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dotty/tools/dotc/core/TypeOps.scala b/src/dotty/tools/dotc/core/TypeOps.scala
index 54846087f..bb9566b6f 100644
--- a/src/dotty/tools/dotc/core/TypeOps.scala
+++ b/src/dotty/tools/dotc/core/TypeOps.scala
@@ -6,6 +6,7 @@ import Contexts._, Types._, Symbols._, Names._, Flags._, Scopes._
import SymDenotations._, Denotations.SingleDenotation
import config.Printers._
import util.Positions._
+import NameOps._
import Decorators._
import StdNames._
import Annotations._
@@ -382,7 +383,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 match {
+ def normalizeToRef(tp: Type): TypeRef = tp.dealias.BetaReduce match {
case tp: TypeRef =>
tp
case tp @ RefinedType(tp1, name: TypeName, rinfo) =>