diff options
author | schinz <schinz@epfl.ch> | 2005-03-24 08:11:18 +0000 |
---|---|---|
committer | schinz <schinz@epfl.ch> | 2005-03-24 08:11:18 +0000 |
commit | 528c8d14505d340a79344807be0fb21eea4760d4 (patch) | |
tree | 6926a3824628d4d2c8d3973cb58a8af61a74dc77 /sources/scalac/transformer | |
parent | 75398c1c571be27bbd59bbda33380c7427016109 (diff) | |
download | scala-528c8d14505d340a79344807be0fb21eea4760d4.tar.gz scala-528c8d14505d340a79344807be0fb21eea4760d4.tar.bz2 scala-528c8d14505d340a79344807be0fb21eea4760d4.zip |
- use TypeConstructor.FUNCTION_OUTER as a fake ...
- use TypeConstructor.FUNCTION_OUTER as a fake outer instance for
classes nested inside functions
Diffstat (limited to 'sources/scalac/transformer')
-rw-r--r-- | sources/scalac/transformer/TypesAsValuesPhase.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sources/scalac/transformer/TypesAsValuesPhase.java b/sources/scalac/transformer/TypesAsValuesPhase.java index 9324daace8..6eea866c11 100644 --- a/sources/scalac/transformer/TypesAsValuesPhase.java +++ b/sources/scalac/transformer/TypesAsValuesPhase.java @@ -592,8 +592,7 @@ public class TypesAsValuesPhase extends Phase { Tree outer = isNestedClass(clsSym) ? (clsSym.owner().isClass() ? gen.This(pos, clsSym.owner()) - : gen.New(gen.mkApply__(gen.mkPrimaryConstructorGlobalRef(pos, - defs.OBJECT_CLASS)))) + : gen.mkGlobalRef(pos, defs.TYPECONSTRUCTOR_FUNCTIONOUTER())) : gen.mkNullLit(pos); Tree[] tcArgs = new Tree[] { @@ -794,8 +793,6 @@ public class TypesAsValuesPhase extends Phase { return javaType(pos, sym); } else if (!sym.isParameter()) { // Reference to a "global" type. - if (owner == null) - throw new Error("null owner for " + Debug.show(tp)); return scalaClassType(pos, tp, owner, env); } else { assert !isValuePrefix(pre) : tp; |