diff options
author | paltherr <paltherr@epfl.ch> | 2004-03-04 01:29:53 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2004-03-04 01:29:53 +0000 |
commit | 95146d1ee59c97899f6c807019bb3359d8c7884b (patch) | |
tree | 2e3f9686cddba4988884faac684f282e0f62114f /sources/scalac/transformer | |
parent | 3d5478d4e16815bbb353eb718d5a1c5e712706d4 (diff) | |
download | scala-95146d1ee59c97899f6c807019bb3359d8c7884b.tar.gz scala-95146d1ee59c97899f6c807019bb3359d8c7884b.tar.bz2 scala-95146d1ee59c97899f6c807019bb3359d8c7884b.zip |
- Removed Type.localThisType
Diffstat (limited to 'sources/scalac/transformer')
-rw-r--r-- | sources/scalac/transformer/ExplicitOuterClassesPhase.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sources/scalac/transformer/ExplicitOuterClassesPhase.java b/sources/scalac/transformer/ExplicitOuterClassesPhase.java index e23807983c..e1e4293919 100644 --- a/sources/scalac/transformer/ExplicitOuterClassesPhase.java +++ b/sources/scalac/transformer/ExplicitOuterClassesPhase.java @@ -260,7 +260,7 @@ public class ExplicitOuterClassesPhase extends Phase { public Type getTypeLink(int level) { if (level == outers.length - 1) { assert outers[level].clasz.isRoot(): level + " - " + this; // !!! remove - return Type.localThisType; + return Type.NoPrefix; } if (tlinks[level] != null) return tlinks[level].type(); return Type.singleType(getTypeLink(level + 1), outers[level].clasz.module()); @@ -299,19 +299,19 @@ public class ExplicitOuterClassesPhase extends Phase { switch (type) { case TypeRef(Type prefix, Symbol symbol, Type[] args): if (symbol.isParameter() && symbol.owner().isConstructor()) { - assert prefix.equals(Type.localThisType): type; + assert prefix == Type.NoPrefix: type; assert args.length == 0: type; Object value = tparams.get(symbol); return value != null ? (Type)value : type; } if (symbol.isClass()) { args = map(getNewArgsOf(context, prefix, symbol, args)); - prefix = Type.localThisType; + prefix = Type.NoPrefix; return Type.typeRef(prefix, symbol, args); } if (symbol.isPackage()) { args = Type.EMPTY_ARRAY; - prefix = Type.localThisType; + prefix = Type.NoPrefix; return Type.typeRef(prefix, symbol, args); } return Type.typeRef(apply(prefix), symbol, map(args)); |