diff options
| author | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-26 07:52:19 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@epfl.ch> | 2012-05-26 07:52:19 -0700 |
| commit | 688c558b0257636f8f46240616b8b3d448847a47 (patch) | |
| tree | 04e1ed289039a0041192bc2030790ef8211d9e4a | |
| parent | 8b133028b9e8e7901c4f5be471b8f6239bc0fa4b (diff) | |
| parent | 67a7149766a81f2beb9e9ab37169b9c1957868af (diff) | |
| download | scala-688c558b0257636f8f46240616b8b3d448847a47.tar.gz scala-688c558b0257636f8f46240616b8b3d448847a47.tar.bz2 scala-688c558b0257636f8f46240616b8b3d448847a47.zip | |
Merge pull request #612 from adriaanm/ticket/5829
fix SI-5829: refinement typeref has a prefix
| -rw-r--r-- | src/compiler/scala/reflect/internal/Types.scala | 4 | ||||
| -rw-r--r-- | test/files/pos/t5829.scala | 18 |
2 files changed, 20 insertions, 2 deletions
diff --git a/src/compiler/scala/reflect/internal/Types.scala b/src/compiler/scala/reflect/internal/Types.scala index 93f359ae12..cfc45695a7 100644 --- a/src/compiler/scala/reflect/internal/Types.scala +++ b/src/compiler/scala/reflect/internal/Types.scala @@ -1973,7 +1973,7 @@ trait Types extends api.Types { self: SymbolTable => require(sym.isPackageClass, sym) override protected def finishPrefix(rest: String) = packagePrefix + rest } - class RefinementTypeRef(sym0: Symbol) extends NoArgsTypeRef(NoType, sym0) with ClassTypeRef { + class RefinementTypeRef(pre0: Type, sym0: Symbol) extends NoArgsTypeRef(pre0, sym0) with ClassTypeRef { require(sym.isRefinementClass, sym) // I think this is okay, but see #1241 (r12414), #2208, and typedTypeConstructor in Typers @@ -2359,7 +2359,7 @@ trait Types extends api.Types { self: SymbolTable => else { if (sym.isAliasType) new NoArgsTypeRef(pre, sym) with AliasTypeRef else if (sym.isAbstractType) new NoArgsTypeRef(pre, sym) with AbstractTypeRef - else if (sym.isRefinementClass) new RefinementTypeRef(sym) + else if (sym.isRefinementClass) new RefinementTypeRef(pre, sym) else if (sym.isPackageClass) new PackageTypeRef(pre, sym) else if (sym.isModuleClass) new ModuleTypeRef(pre, sym) else new NoArgsTypeRef(pre, sym) with ClassTypeRef diff --git a/test/files/pos/t5829.scala b/test/files/pos/t5829.scala new file mode 100644 index 0000000000..236045ed11 --- /dev/null +++ b/test/files/pos/t5829.scala @@ -0,0 +1,18 @@ +trait Universe { + type Tree + + type SymTree <: Tree + type NameTree <: Tree + type RefTree <: SymTree with NameTree + + type Ident <: RefTree + type Select <: RefTree +} + +object Test extends App { + val universe: Universe = null + import universe._ + def select: Select = ??? + def ident: Ident = ??? + List(select, ident) +}
\ No newline at end of file |