From d2faeb9ae60389668f1b5f45eb91c73127401e40 Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Thu, 23 May 2013 09:25:11 +0200
Subject: SI-7507 Fix lookup of private[this] member in presence of self type.

In the following code:

	trait Cake extends Slice

	trait Slice { self: Cake =>    // must have self type that extends `Slice`
	  private[this] val bippy = () // must be private[this]
	  locally(bippy)
	}

`ThisType(<Slice>)`.findMember(bippy)` excluded the private local member on
the grounds that the first class in the base type sequence, `Cake`, was
not contained in `Slice`.

	scala> val thisType = typeOf[Slice].typeSymbol.thisType
	thisType: $r.intp.global.Type = Slice.this.type

	scala> thisType.baseClasses
	res6: List[$r.intp.global.Symbol] = List(trait Cake, trait Slice, class Object, class Any)

This commit changes `findMember` to use the symbol of the `ThisType`, rather
than the first base class, as the location of the selection.
---
 test/files/run/t7507.scala | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 test/files/run/t7507.scala

(limited to 'test/files/run')

diff --git a/test/files/run/t7507.scala b/test/files/run/t7507.scala
new file mode 100644
index 0000000000..6c1959ddac
--- /dev/null
+++ b/test/files/run/t7507.scala
@@ -0,0 +1,31 @@
+trait Cake extends Slice
+
+// Minimization
+trait Slice { self: Cake =>    // must have self type that extends `Slice`
+  private[this] val bippy = () // must be private[this]
+  locally(bippy)
+}
+
+// Originally reported bug:
+trait Cake1 extends Slice1
+trait Slice1 { self: Cake1 =>
+  import java.lang.String // any import will do!
+  val Tuple2(x, y) = ((1, 2))
+}
+
+
+// Nesting
+trait Cake3 extends Outer.Slice3
+
+// Minimization
+object Outer {
+  private[this] val bippy = ()
+  trait Slice3 { self: Cake3 =>
+    locally(bippy)
+  }
+}
+
+object Test extends App {
+  val s1 = new Cake1 {}
+  assert((s1.x, s1.y) == (1, 2), (s1.x, s1.y))
+}
-- 
cgit v1.2.3