From 364a11eaeec22c8385391114de81271613d58c82 Mon Sep 17 00:00:00 2001 From: paltherr Date: Mon, 26 Jan 2004 14:50:37 +0000 Subject: - Added automatic rebinding and unaliasing in T... - Added automatic rebinding and unaliasing in TypeRef creation --- sources/scalac/typechecker/Analyzer.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'sources/scalac/typechecker') diff --git a/sources/scalac/typechecker/Analyzer.java b/sources/scalac/typechecker/Analyzer.java index 174dd6269f..9c7b5fbaf0 100644 --- a/sources/scalac/typechecker/Analyzer.java +++ b/sources/scalac/typechecker/Analyzer.java @@ -1004,7 +1004,7 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { Type constrtype = makeMethodType( tparamSyms, vparamSyms, - Type.TypeRef(sym.owner().thisType(), sym, Symbol.type(tparamSyms))); + Type.typeRef(sym.owner().thisType(), sym, Symbol.type(tparamSyms))); //System.out.println("set info " + sym.constructor() + " to " + constrtype + " was " + sym.constructor().rawInfo());//DEBUG sym.primaryConstructor().setInfo(constrtype); // necessary so that we can access tparams @@ -1089,13 +1089,10 @@ public class Analyzer extends Transformer implements Modifiers, Kinds { case AliasTypeDef(int mods, Name name, AbsTypeDef[] tparams, Tree rhs): pushContext(tree, sym.primaryConstructor(), new Scope(context.scope)); Symbol[] tparamSyms = enterParams(tparams); - sym.primaryConstructor().setInfo( - Type.PolyType(tparamSyms, sym.typeConstructor())); - // necessary so that we can access tparams - sym.primaryConstructor().flags |= INITIALIZED; ((AliasTypeDef) tree).rhs = rhs = transform(rhs, TYPEmode); owntype = rhs.type; - + sym.primaryConstructor().setInfo( + Type.PolyType(tparamSyms, owntype)); popContext(); break; -- cgit v1.2.3