From 860d5686c0af6d6afc5266aded4a269cc5e104b7 Mon Sep 17 00:00:00 2001 From: paltherr Date: Mon, 1 Sep 2003 17:27:13 +0000 Subject: - Replaced field Global.phases by fields Phase.... - Replaced field Global.phases by fields Phase.prev and Phase.next - Reorganized/Cleaned/Documented methods on infos, types and - closures in Symbol Removed method CompilerPhases.remove Add mehods - PhaseDescriptor.addXXXFlag --- sources/scalac/transformer/LambdaLift.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'sources/scalac/transformer/LambdaLift.java') diff --git a/sources/scalac/transformer/LambdaLift.java b/sources/scalac/transformer/LambdaLift.java index 6e14e6ff66..5640938030 100644 --- a/sources/scalac/transformer/LambdaLift.java +++ b/sources/scalac/transformer/LambdaLift.java @@ -397,7 +397,7 @@ public class LambdaLift extends OwnerTransformer Tree rhs1 = transform(rhs, sym); if ((sym.flags & CAPTURED) != 0) { assert sym.isLocal(); - Type boxedType = sym.typeAt(descr.nextPhase); + Type boxedType = sym.nextType(); Type unboxedType = boxedType.typeArgs()[0]; tpe1 = gen.mkType(tpe.pos, boxedType); rhs1 = gen.New( @@ -445,7 +445,7 @@ public class LambdaLift extends OwnerTransformer sym = descr.proxy(sym, currentOwner); } Tree tree1 = copy.Ident(tree, sym).setType( - sym.typeAt(descr.nextPhase)); + sym.nextType()); if (name != sym.name) ((Ident)tree1).name = sym.name; if ((sym.flags & CAPTURED) != 0) return gen.Select(tree1, Names.elem); else return tree1; @@ -482,7 +482,7 @@ public class LambdaLift extends OwnerTransformer } Symbol[] newtparams(Symbol owner) { - Symbol[] tparams = owner.typeAt(descr.nextPhase).typeParams(); + Symbol[] tparams = owner.nextType().typeParams(); int nfree = get(free.ftvs, owner).size(); assert nfree == tparams.length - owner.type().typeParams().length : owner + " " + nfree + " " + tparams.length + " " + owner.type().firstParams().length; @@ -492,7 +492,7 @@ public class LambdaLift extends OwnerTransformer } Symbol[] newparams(Symbol owner) { - Symbol[] params = owner.typeAt(descr.nextPhase).firstParams(); + Symbol[] params = owner.nextType().firstParams(); int nfree = get(free.fvs, owner).size(); assert nfree == params.length - owner.type().firstParams().length; Symbol[] newparams = new Symbol[nfree]; @@ -537,10 +537,10 @@ public class LambdaLift extends OwnerTransformer sym.updateInfo( addParams( addTypeParams( - sym.infoAt(descr.nextPhase), oldtparams, newtparams), + sym.nextInfo(), oldtparams, newtparams), newparams)); if (global.debug) - global.log(sym + " has now type " + sym.typeAt(descr.nextPhase)); + global.log(sym + " has now type " + sym.nextType()); } } else if (sym.kind == CLASS) { Symbol constr = sym.primaryConstructor(); @@ -641,7 +641,7 @@ public class LambdaLift extends OwnerTransformer for (int i = 0; i < fparams.length; i++) { Symbol farg = descr.proxy(fparams[i], currentOwner); args1[args.length + i] = - gen.Ident(pos, farg).setType(farg.typeAt(descr.nextPhase)); + gen.Ident(pos, farg).setType(farg.nextType()); } return args1; } else { -- cgit v1.2.3