From a6941944bf80f660722e9151801776715c3e4ab5 Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Wed, 28 Nov 2012 18:36:47 +0100
Subject: Test cases for SI-5726, SI-5733, SI-6320, SI-6551, SI-6722.

All tickets involving selectDynamic fixed by the prior commit.
It also fixes SI-6663, but that already has a test case.
---
 test/files/pos/t5726.scala | 17 +++++++++++++++++
 test/files/pos/t6551.scala |  2 +-
 test/files/pos/t6722.scala | 11 +++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 test/files/pos/t5726.scala
 create mode 100644 test/files/pos/t6722.scala

(limited to 'test/files/pos')

diff --git a/test/files/pos/t5726.scala b/test/files/pos/t5726.scala
new file mode 100644
index 0000000000..b28ebd8674
--- /dev/null
+++ b/test/files/pos/t5726.scala
@@ -0,0 +1,17 @@
+import scala.language.dynamics
+
+class DynamicTest extends Dynamic {
+  def selectDynamic(name: String) = s"value of $name"
+  def updateDynamic(name: String)(value: Any) {
+    println(s"You have just updated property '$name' with value: $value")
+  }
+}
+
+object MyApp extends App {
+  def testing() {
+    val test = new DynamicTest
+    test.firstName = "John"
+  }
+
+  testing()
+}
diff --git a/test/files/pos/t6551.scala b/test/files/pos/t6551.scala
index fb68663809..8bb396a19f 100644
--- a/test/files/pos/t6551.scala
+++ b/test/files/pos/t6551.scala
@@ -1,4 +1,4 @@
-import language.dynamics
+import scala.language.dynamics
 
 object Test {
   def main(args: Array[String]) {
diff --git a/test/files/pos/t6722.scala b/test/files/pos/t6722.scala
new file mode 100644
index 0000000000..576746c915
--- /dev/null
+++ b/test/files/pos/t6722.scala
@@ -0,0 +1,11 @@
+import scala.language.dynamics
+
+class Dyn extends Dynamic {
+  def selectDynamic(s: String): Dyn = new Dyn
+  def get[T]: T = null.asInstanceOf[T]
+}
+
+object Foo {
+  val dyn = new Dyn
+  dyn.foo.bar.baz.get[String]
+}
-- 
cgit v1.2.3


From eccdc2fefcf0839e09bb9c63c89baed8cf09e60f Mon Sep 17 00:00:00 2001
From: Paul Phillips <paulp@improving.org>
Date: Tue, 2 Oct 2012 11:21:16 -0700
Subject: Fix for rangepos crasher.

wrapClassTagUnapply was generating an unpositioned tree
which would crash under -Yrangepos.  See SI-6338.
---
 src/compiler/scala/tools/nsc/typechecker/Typers.scala | 5 +++--
 test/files/pos/classtag-pos.flags                     | 1 +
 test/files/pos/classtag-pos.scala                     | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 test/files/pos/classtag-pos.flags
 create mode 100644 test/files/pos/classtag-pos.scala

(limited to 'test/files/pos')

diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index 934ba91ac8..b823e1ad0f 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -3362,12 +3362,13 @@ trait Typers extends Modes with Adaptations with Tags {
       // println(util.Position.formatMessage(uncheckedPattern.pos, "made unchecked type test into a checked one", true))
 
       val args = List(uncheckedPattern)
+      val app  = atPos(uncheckedPattern.pos)(Apply(classTagExtractor, args))
       // must call doTypedUnapply directly, as otherwise we get undesirable rewrites
       // and re-typechecks of the target of the unapply call in PATTERNmode,
       // this breaks down when the classTagExtractor (which defineds the unapply member) is not a simple reference to an object,
       // but an arbitrary tree as is the case here
-      doTypedUnapply(Apply(classTagExtractor, args), classTagExtractor, classTagExtractor, args, PATTERNmode, pt)
-      }
+      doTypedUnapply(app, classTagExtractor, classTagExtractor, args, PATTERNmode, pt)
+    }
 
     // if there's a ClassTag that allows us to turn the unchecked type test for `pt` into a checked type test
     // return the corresponding extractor (an instance of ClassTag[`pt`])
diff --git a/test/files/pos/classtag-pos.flags b/test/files/pos/classtag-pos.flags
new file mode 100644
index 0000000000..281f0a10cd
--- /dev/null
+++ b/test/files/pos/classtag-pos.flags
@@ -0,0 +1 @@
+-Yrangepos
diff --git a/test/files/pos/classtag-pos.scala b/test/files/pos/classtag-pos.scala
new file mode 100644
index 0000000000..768d2e27f4
--- /dev/null
+++ b/test/files/pos/classtag-pos.scala
@@ -0,0 +1,5 @@
+import scala.reflect.runtime.universe._
+
+class A {
+  def f[T: TypeTag] = typeOf[T] match { case TypeRef(_, _, args) => args }
+}
-- 
cgit v1.2.3