diff options
author | Martin Odersky <odersky@gmail.com> | 2016-07-13 15:17:17 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2016-07-13 15:33:47 +0200 |
commit | 18b30803952cee83580eab28068bc773fdce780e (patch) | |
tree | 03c603f0920da2b987d9b93b5b820c099f9049e5 /src/dotty/tools/dotc/typer | |
parent | 0ff5354e2a5e3f29234d6d761177f9228d8da522 (diff) | |
download | dotty-18b30803952cee83580eab28068bc773fdce780e.tar.gz dotty-18b30803952cee83580eab28068bc773fdce780e.tar.bz2 dotty-18b30803952cee83580eab28068bc773fdce780e.zip |
Allow hk parameters in lower bounds
Diffstat (limited to 'src/dotty/tools/dotc/typer')
-rw-r--r-- | src/dotty/tools/dotc/typer/Checking.scala | 12 | ||||
-rw-r--r-- | src/dotty/tools/dotc/typer/Typer.scala | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/dotty/tools/dotc/typer/Checking.scala b/src/dotty/tools/dotc/typer/Checking.scala index b37216e6e..9e55216c1 100644 --- a/src/dotty/tools/dotc/typer/Checking.scala +++ b/src/dotty/tools/dotc/typer/Checking.scala @@ -534,17 +534,6 @@ trait Checking { errorTree(tpt, d"missing type parameter for ${tpt.tpe}") } else tpt - - def checkLowerNotHK(sym: Symbol, tparams: List[Symbol], pos: Position)(implicit ctx: Context) = - if (tparams.nonEmpty) - sym.info match { - case info: TypeAlias => // ok - case TypeBounds(lo, _) => - for (tparam <- tparams) - if (tparam.typeRef.occursIn(lo)) - ctx.error(i"type parameter ${tparam.name} may not occur in lower bound $lo", pos) - case _ => - } } trait NoChecking extends Checking { @@ -558,5 +547,4 @@ trait NoChecking extends Checking { override def checkNoDoubleDefs(cls: Symbol)(implicit ctx: Context): Unit = () override def checkParentCall(call: Tree, caller: ClassSymbol)(implicit ctx: Context) = () override def checkSimpleKinded(tpt: Tree)(implicit ctx: Context): Tree = tpt - override def checkLowerNotHK(sym: Symbol, tparams: List[Symbol], pos: Position)(implicit ctx: Context) = () } diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 62d356e3d..4e2842da7 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -1064,7 +1064,6 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit def typedTypeDef(tdef: untpd.TypeDef, sym: Symbol)(implicit ctx: Context): Tree = track("typedTypeDef") { val TypeDef(name, rhs) = tdef - checkLowerNotHK(sym, tdef.tparams.map(symbolOfTree), tdef.pos) completeAnnotations(tdef, sym) assignType(cpy.TypeDef(tdef)(name, typedType(rhs), Nil), sym) } |