From 190f44d0c9b91df24a227878b0c9a1f3d14c20a1 Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 9 Dec 2013 12:08:29 +0100 Subject: Fixes to desugaring and typing of parameterized Typedefs --- src/dotty/tools/dotc/ast/Desugar.scala | 2 +- src/dotty/tools/dotc/typer/Typer.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/dotty/tools/dotc/ast/Desugar.scala b/src/dotty/tools/dotc/ast/Desugar.scala index fa664ee08..da8c892c2 100644 --- a/src/dotty/tools/dotc/ast/Desugar.scala +++ b/src/dotty/tools/dotc/ast/Desugar.scala @@ -151,7 +151,7 @@ object desugar { Modifiers(PrivateLocalParamAccessor | Synthetic), name, refOfDef(tparam)) Thicket(tparam, alias) } - else cpy.TypeDef(tdef, mods, name, rhs1) + else cpy.TypeDef(tdef, mods, name, rhs1, tdef.tparams) } private val synthetic = Modifiers(Synthetic) diff --git a/src/dotty/tools/dotc/typer/Typer.scala b/src/dotty/tools/dotc/typer/Typer.scala index 968d385b0..24599f7c8 100644 --- a/src/dotty/tools/dotc/typer/Typer.scala +++ b/src/dotty/tools/dotc/typer/Typer.scala @@ -740,8 +740,8 @@ class Typer extends Namer with Applications with Implicits { def typedTypeDef(tdef: untpd.TypeDef, sym: Symbol)(implicit ctx: Context): TypeDef = track("typedTypeDef") { val TypeDef(mods, name, rhs) = tdef val mods1 = typedModifiers(mods) - val rhs1 = typedType(rhs) - cpy.TypeDef(tdef, mods1, name, rhs1).withType(sym.typeRef) + //val rhs1 = typedType(rhs) + cpy.TypeDef(tdef, mods1, name, TypeTree(sym.info)).withType(sym.typeRef) } def typedClassDef(cdef: untpd.TypeDef, cls: ClassSymbol)(implicit ctx: Context) = track("typedClassDef") { -- cgit v1.2.3