Merge pull request #1469 from dotty-staging/fix-scala.Dynamic

Fixes for scala.Dynamic

20 files changed, 0 insertions, 297 deletions

diff --git a/tests/pending/run/applydynamic_sip.check b/tests/pending/run/applydynamic_sip.check
deleted file mode 100644
index 6d04dc452..000000000
--- a/tests/pending/run/applydynamic_sip.check
+++ /dev/null
@@ -1,29 +0,0 @@
-qual.applyDynamic(sel)()
-qual.applyDynamic(sel)(a)
-qual.applyDynamic(sel)(a)
-.apply(a2)
-qual.applyDynamic(sel)(a)
-qual.applyDynamic(sel)(a)
-.apply(a2)
-qual.applyDynamicNamed(sel)((arg,a))
-qual.applyDynamicNamed(sel)((arg,a))
-qual.applyDynamicNamed(sel)((,a), (arg2,a2))
-qual.updateDynamic(sel)(expr)
-qual.selectDynamic(sel)
-qual.selectDynamic(sel)
-qual.selectDynamic(sel)
-.update(1, expr)
-qual.selectDynamic(sel)
-.update(expr)
-qual.selectDynamic(sel)
-.apply(1)
-qual.selectDynamic(sel)
-.apply
-.update(1, 1)
-qual.applyDynamic(apply)(a)
-qual.applyDynamic(apply)(a)
-qual.applyDynamic(apply)(a)
-qual.applyDynamic(apply)(a)
-qual.applyDynamicNamed(apply)((arg,a))
-qual.applyDynamicNamed(apply)((,a), (arg2,a2))
-qual.applyDynamic(update)(a, a2)
diff --git a/tests/pending/run/applydynamic_sip.flags b/tests/pending/run/applydynamic_sip.flags
deleted file mode 100644
index ba6d37305..000000000
--- a/tests/pending/run/applydynamic_sip.flags
+++ /dev/null
@@ -1,2 +0,0 @@
--Yrangepos:false
--language:dynamics
diff --git a/tests/pending/run/applydynamic_sip.scala b/tests/pending/run/applydynamic_sip.scala
deleted file mode 100644
index a163ab960..000000000
--- a/tests/pending/run/applydynamic_sip.scala
+++ /dev/null
@@ -1,66 +0,0 @@
-object Test extends dotty.runtime.LegacyApp {
-  object stubUpdate {
-    def update(as: Any*) = println(".update"+as.toList.mkString("(",", ", ")"))
-  }
-
-  object stub {
-    def apply = {println(".apply"); stubUpdate}
-    def apply(as: Any*) = println(".apply"+as.toList.mkString("(",", ", ")"))
-    def update(as: Any*) = println(".update"+as.toList.mkString("(",", ", ")"))
-  }
-  class MyDynamic extends Dynamic {
-    def applyDynamic[T](n: String)(as: Any*) = {println("qual.applyDynamic("+ n +")"+ as.toList.mkString("(",", ", ")")); stub}
-    def applyDynamicNamed[T](n: String)(as: (String, Any)*) = {println("qual.applyDynamicNamed("+ n +")"+ as.toList.mkString("(",", ", ")")); stub}
-    def selectDynamic[T](n: String) = {println("qual.selectDynamic("+ n +")"); stub}
-    def updateDynamic(n: String)(x: Any): Unit = {println("qual.updateDynamic("+ n +")("+ x +")")}
-  }
-  val qual = new MyDynamic
-  val expr = "expr"
-  val a = "a"
-  val a2 = "a2"
-  type T = String
-
-  // If qual.sel is followed by a potential type argument list [Ts] and an argument list (arg1, …, argn) where none of the arguments argi are named:
-  //  qual.applyDynamic(“sel”)(arg1, …, argn)
-  qual.sel()
-  qual.sel(a)
-  // qual.sel(a, a2: _*) -- should not accept varargs?
-  qual.sel(a)(a2)
-  qual.sel[T](a)
-  qual.sel[T](a)(a2)
-
-  // If qual.sel is followed by a potential type argument list [Ts]
-  // and a non-empty named argument list (x1 = arg1, …, xn = argn) where some name prefixes xi = might be missing:
-  //  qual.applyDynamicNamed(“sel”)(xs1 -> arg1, …, xsn -> argn)
-  qual.sel(arg = a)
-  qual.sel[T](arg = a)
-  qual.sel(a, arg2 = "a2")
-  // qual.sel(a)(a2, arg2 = "a2")
-  // qual.sel[T](a)(a2, arg2 = "a2")
-  // qual.sel(arg = a, a2: _*)
-  // qual.sel(arg, arg2 = "a2", a2: _*)
-
-  // If qual.sel appears immediately on the left-hand side of an assigment
-  // qual.updateDynamic(“sel”)(expr)
-  qual.sel = expr
-
-  // If qual.sel, possibly applied to type arguments, but is
-  // not applied to explicit value arguments,
-  // nor immediately followed by an assignment operator:
-  // qual.selectDynamic[Ts](“sel”)
-  qual.sel
-  qual.sel[T]
-
-  qual.sel(1) = expr // parser turns this into qual.sel.update(1, expr)
-  qual.sel() = expr  // parser turns this into qual.sel.update(expr)
-  qual.sel.apply(1)
-  qual.sel.apply(1) = 1
-
-  qual.apply(a)
-  qual.apply[String](a)
-  qual(a)
-  qual[String](a)
-  qual[T](arg = a)
-  qual(a, arg2 = "a2")
-  qual(a) = a2
-}
diff --git a/tests/pending/run/dynamic-anyval.check b/tests/pending/run/dynamic-anyval.check
deleted file mode 100644
index dee7bef8e..000000000
--- a/tests/pending/run/dynamic-anyval.check
+++ /dev/null
@@ -1,4 +0,0 @@
-().dingo(bippy, 5)
-List(1, 2, 3).dingo(bippy, 5)
-().dingo(bippy, 5)
-List(1, 2, 3).dingo(bippy, 5)
diff --git a/tests/pending/run/dynamic-anyval.scala b/tests/pending/run/dynamic-anyval.scala
deleted file mode 100644
index 605503d37..000000000
--- a/tests/pending/run/dynamic-anyval.scala
+++ /dev/null
@@ -1,22 +0,0 @@
-import scala.language.dynamics
-
-object Test {
-  implicit class DynamicValue[T](val value: T) extends AnyVal with Dynamic {
-    def applyDynamic(name: String)(args: Any*) = println(s"""$this.$name(${args mkString ", "})""")
-    override def toString = "" + value
-  }
-  implicit class DynamicValue2[T](val value: T) extends Dynamic {
-    def applyDynamic(name: String)(args: Any*) = println(s"""$this.$name(${args mkString ", "})""")
-    override def toString = "" + value
-  }
-
-  def f[T](x: DynamicValue[T]) = x.dingo("bippy", 5)
-  def g[T](x: DynamicValue2[T]) = x.dingo("bippy", 5)
-
-  def main(args: Array[String]): Unit = {
-    f(())
-    f(List(1, 2, 3))
-    g(())
-    g(List(1, 2, 3))
-  }
-}
diff --git a/tests/pending/run/t4536.check b/tests/pending/run/t4536.check
deleted file mode 100644
index 0c5a72ada..000000000
--- a/tests/pending/run/t4536.check
+++ /dev/null
@@ -1,8 +0,0 @@
-cls: bar
-obj: foo
-obj: bar
-cls: bar
-obj: bar
-trait: pili
-trait: mili
-trait: foo
\ No newline at end of file
diff --git a/tests/pending/run/t4536.flags b/tests/pending/run/t4536.flags
deleted file mode 100644
index 1141f9750..000000000
--- a/tests/pending/run/t4536.flags
+++ /dev/null
@@ -1 +0,0 @@
--language:dynamics
diff --git a/tests/pending/run/t4536.scala b/tests/pending/run/t4536.scala
deleted file mode 100644
index 6661eae6a..000000000
--- a/tests/pending/run/t4536.scala
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-object dynamicObject extends Dynamic {
-  def applyDynamic(m: String)() = println("obj: " + m);
-  this.foo()
-}
-
-
-class dynamicClass extends Dynamic {
-  def applyDynamic(m: String)() = println("cls: " + m);
-  this.bar()
-  dynamicObject.bar()
-}
-
-
-abstract class dynamicAbstractClass extends Dynamic {
-  def applyDynamic(m: String)(args: Any*): Unit
-  this.pili(1, new dynamicClass, "hello");
-}
-
-
-trait dynamicTrait extends Dynamic {
-  def applyDynamic(m: String)(args: Any*) = println("trait: " + m);
-  def two = 2
-  this.mili(1,2,3)
-  two
-}
-
-
-object dynamicMixin extends dynamicAbstractClass with dynamicTrait {
-  this.foo(None)
-}
-
-
-object Test {
-
-  def main(args: Array[String]) {
-    val cls = new dynamicClass
-    dynamicMixin
-  }
-
-}
diff --git a/tests/pending/run/t5040.check b/tests/pending/run/t5040.check
deleted file mode 100644
index 3f7b5908a..000000000
--- a/tests/pending/run/t5040.check
+++ /dev/null
@@ -1 +0,0 @@
-applyDynamic
diff --git a/tests/pending/run/t5040.flags b/tests/pending/run/t5040.flags
deleted file mode 100644
index 1141f9750..000000000
--- a/tests/pending/run/t5040.flags
+++ /dev/null
@@ -1 +0,0 @@
--language:dynamics
diff --git a/tests/pending/run/t5040.scala b/tests/pending/run/t5040.scala
deleted file mode 100644
index 6813c1b27..000000000
--- a/tests/pending/run/t5040.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-abstract class Prova2 extends Dynamic {
-  def applyDynamic(m: String)(): Unit
-  private def privateMethod() = println("private method")
-}
-
-object Test extends dotty.runtime.LegacyApp {
-  val prova= new Prova2 {
-    def applyDynamic(m: String)() = println("applyDynamic")
-  }
-  prova.privateMethod()
-}
diff --git a/tests/pending/run/t5733.check b/tests/pending/run/t5733.check
deleted file mode 100644
index e697046a9..000000000
--- a/tests/pending/run/t5733.check
+++ /dev/null
@@ -1,2 +0,0 @@
-Running ABTest asserts
-Done
diff --git a/tests/pending/run/t5733.scala b/tests/pending/run/t5733.scala
deleted file mode 100644
index a9e58d77e..000000000
--- a/tests/pending/run/t5733.scala
+++ /dev/null
@@ -1,53 +0,0 @@
-import scala.language.dynamics
-
-object A extends Dynamic {
-  var a = "a"
-
-  def selectDynamic(method:String): String = a
-
-  def updateDynamic(method:String)(v:String): Unit = { a = v }
-}
-
-class B extends Dynamic {
-  var b = "b"
-
-  def selectDynamic(method:String): String = b
-
-  def updateDynamic(method:String)(v:String): Unit = { b = v }
-}
-
-object Test extends dotty.runtime.LegacyApp {
-  assert( A.foo == "a" )
-  assert( A.bar == "a" )
-  A.aaa = "aaa"
-  assert( A.bar == "aaa" )
-
-  val b = new B
-  assert( b.foo == "b" )
-  assert( b.bar == "b" )
-  b.bbb = "bbb"
-  assert( b.bar == "bbb" )
-
-  {
-    println("Running ABTest asserts")
-    A.a = "a"
-    (new ABTest).test()
-  }
-
-  println("Done")
-}
-
-class ABTest {
-  def test(): Unit = {
-    assert( A.foo == "a" )
-    assert( A.bar == "a" )
-    A.aaa = "aaa"
-    assert( A.bar == "aaa" )
-
-    val b = new B
-    assert( b.foo == "b" )
-    assert( b.bar == "b" )
-    b.bbb = "bbb"
-    assert( b.bar == "bbb" )
-  }
-}
diff --git a/tests/pending/run/t6353.check b/tests/pending/run/t6353.check
deleted file mode 100644
index 5676bed24..000000000
--- a/tests/pending/run/t6353.check
+++ /dev/null
@@ -1 +0,0 @@
-applyDynamic(apply)(9)
diff --git a/tests/pending/run/t6353.scala b/tests/pending/run/t6353.scala
deleted file mode 100644
index 7077eaeda..000000000
--- a/tests/pending/run/t6353.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-import language.dynamics
-
-object Test extends dotty.runtime.LegacyApp {
-  val x = new X(3)
-  val y = x(9)
-  class X(i: Int) extends Dynamic {
-    def applyDynamic(name: String)(in: Int): Int = {
-      println(s"applyDynamic($name)($in)")
-      i + in
-    }
-  }
-}
diff --git a/tests/pending/run/t6355.check b/tests/pending/run/t6355.check
deleted file mode 100644
index ce74ab38a..000000000
--- a/tests/pending/run/t6355.check
+++ /dev/null
@@ -1,2 +0,0 @@
-bippy(x: Int) called with x = 42
-bippy(x: String) called with x = "42"
diff --git a/tests/pending/run/t6355.scala b/tests/pending/run/t6355.scala
deleted file mode 100644
index f1921391a..000000000
--- a/tests/pending/run/t6355.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-import scala.language.dynamics
-
-class A extends Dynamic {
-  def applyDynamic(method: String): B = new B(method)
-}
-class B(method: String) {
-  def apply(x: Int) = s"$method(x: Int) called with x = $x"
-  def apply(x: String) = s"""$method(x: String) called with x = "$x""""
-}
-
-object Test {
-  def main(args: Array[String]): Unit = {
-    val x = new A
-    println(x.bippy(42))
-    println(x.bippy("42"))
-  }
-}
diff --git a/tests/pending/run/t6663.check b/tests/pending/run/t6663.check
deleted file mode 100644
index d81cc0710..000000000
--- a/tests/pending/run/t6663.check
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/tests/pending/run/t6663.flags b/tests/pending/run/t6663.flags
deleted file mode 100644
index ea7fc37e1..000000000
--- a/tests/pending/run/t6663.flags
+++ /dev/null
@@ -1 +0,0 @@
--Yrangepos:false
diff --git a/tests/pending/run/t6663.scala b/tests/pending/run/t6663.scala
deleted file mode 100644
index bfe464ad6..000000000
--- a/tests/pending/run/t6663.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-import language.dynamics
-
-class C(v: Any) extends Dynamic {
-  def selectDynamic[T](n: String): Option[T] = Option(v.asInstanceOf[T])
-  def applyDynamic[T](n: String)(): Option[T] = Option(v.asInstanceOf[T])
-}
-
-object Test extends dotty.runtime.LegacyApp {
-  // this should be converted to
-  // C(42).selectDynamic[Int]("foo").get
-  // but, before fixing SI-6663, became
-  // C(42).selectDynamic[Nothing]("foo").get
-  // leading to a ClassCastException
-  var v = new C(42).foo[Int].get
-  println(v)
-}
-