Fix #657: Add scala.Dynamic support.

32 files changed, 442 insertions, 0 deletions

diff --git a/tests/neg/dynamicApplyDynamicTest1.scala b/tests/neg/dynamicApplyDynamicTest1.scala
new file mode 100644
index 000000000..90f4493eb
--- /dev/null
+++ b/tests/neg/dynamicApplyDynamicTest1.scala
@@ -0,0 +1,7 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  new Foo().bazApply() // error
+}
diff --git a/tests/neg/dynamicApplyDynamicTest2.scala b/tests/neg/dynamicApplyDynamicTest2.scala
new file mode 100644
index 000000000..aa0e44405
--- /dev/null
+++ b/tests/neg/dynamicApplyDynamicTest2.scala
@@ -0,0 +1,7 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  new Foo().bazApply("abc", 1)  // error
+}
diff --git a/tests/neg/dynamicApplyDynamicTest3.scala b/tests/neg/dynamicApplyDynamicTest3.scala
new file mode 100644
index 000000000..61d3c9677
--- /dev/null
+++ b/tests/neg/dynamicApplyDynamicTest3.scala
@@ -0,0 +1,7 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  new Foo().bazApply _  // error // error
+}
diff --git a/tests/neg/dynamicApplyDynamicTest4.scala b/tests/neg/dynamicApplyDynamicTest4.scala
new file mode 100644
index 000000000..4573bd08d
--- /dev/null
+++ b/tests/neg/dynamicApplyDynamicTest4.scala
@@ -0,0 +1,10 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def selectDynamic(name: String): String = ???
+  def applyDynamicNamed(name: String)(args: Any*): String = ???
+}
+
+object DynamicTest {
+  new Foo().bazApply() // error
+}
diff --git a/tests/neg/dynamicApplyDynamicTest5.scala b/tests/neg/dynamicApplyDynamicTest5.scala
new file mode 100644
index 000000000..d1d9cdd69
--- /dev/null
+++ b/tests/neg/dynamicApplyDynamicTest5.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamic(name: String)(args: String*): String = ???
+}
+
+object DynamicTest {
+  new Foo().bazApply(1, 2, 3) // error // error // error
+}
diff --git a/tests/neg/dynamicApplyDynamicTest6.scala b/tests/neg/dynamicApplyDynamicTest6.scala
new file mode 100644
index 000000000..865858ff3
--- /dev/null
+++ b/tests/neg/dynamicApplyDynamicTest6.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamic(name: String)(args: String*): String = ???
+}
+
+object DynamicTest {
+  def test: Int = new Foo().bazApply() // error
+}
diff --git a/tests/neg/dynamicApplyDynamicTest7.scala b/tests/neg/dynamicApplyDynamicTest7.scala
new file mode 100644
index 000000000..7985dd09e
--- /dev/null
+++ b/tests/neg/dynamicApplyDynamicTest7.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamic(name: Int)(args: String*): String = ???
+}
+
+object DynamicTest {
+  def test: String = new Foo().bazApply() // error
+}
diff --git a/tests/neg/dynamicApplyDynamicTest8.scala b/tests/neg/dynamicApplyDynamicTest8.scala
new file mode 100644
index 000000000..ee8192d76
--- /dev/null
+++ b/tests/neg/dynamicApplyDynamicTest8.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamicNamed(name: String)(args: (String, Int)*): String = ???
+}
+
+object DynamicTest {
+  def test: String = new Foo().bazApply("1" -> 2)  // error
+}
diff --git a/tests/neg/dynamicApplyDynamicTest9.scala b/tests/neg/dynamicApplyDynamicTest9.scala
new file mode 100644
index 000000000..bc4f94d5e
--- /dev/null
+++ b/tests/neg/dynamicApplyDynamicTest9.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamicNamed(name: String)(args: (String, Int)*): String = ???
+}
+
+object DynamicTest {
+  new Foo().applyDynamic("bar")("1" -> 2) // error
+}
diff --git a/tests/neg/dynamicApplyNamedDynamicTest1.scala b/tests/neg/dynamicApplyNamedDynamicTest1.scala
new file mode 100644
index 000000000..a51cd2c7b
--- /dev/null
+++ b/tests/neg/dynamicApplyNamedDynamicTest1.scala
@@ -0,0 +1,7 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  new Foo().bazApply(a = "abc", b = 1)  // error
+}
diff --git a/tests/neg/dynamicApplyNamedDynamicTest2.scala b/tests/neg/dynamicApplyNamedDynamicTest2.scala
new file mode 100644
index 000000000..ca801e77c
--- /dev/null
+++ b/tests/neg/dynamicApplyNamedDynamicTest2.scala
@@ -0,0 +1,10 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def selectDynamic(name: String): Array[String] = ???
+  def applyDynamic(name: String)(args: Any*): String = ???
+}
+
+object DynamicTest {
+  new Foo().bazApply(a = "abc", b = 1)  // error
+}
diff --git a/tests/neg/dynamicApplyNamedDynamicTest3.scala b/tests/neg/dynamicApplyNamedDynamicTest3.scala
new file mode 100644
index 000000000..b8ec41c6d
--- /dev/null
+++ b/tests/neg/dynamicApplyNamedDynamicTest3.scala
@@ -0,0 +1,7 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  new Foo().bazApply("abc", b = 1) // error
+}
diff --git a/tests/neg/dynamicApplyNamedDynamicTest4.scala b/tests/neg/dynamicApplyNamedDynamicTest4.scala
new file mode 100644
index 000000000..983cbc599
--- /dev/null
+++ b/tests/neg/dynamicApplyNamedDynamicTest4.scala
@@ -0,0 +1,7 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  new Foo().bazApply("abc", 4, b = 1, b = "bcd") // error
+}
diff --git a/tests/neg/dynamicApplyNamedDynamicTest5.scala b/tests/neg/dynamicApplyNamedDynamicTest5.scala
new file mode 100644
index 000000000..3a48d38d8
--- /dev/null
+++ b/tests/neg/dynamicApplyNamedDynamicTest5.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamicNamed(name: String)(args: String*): String = ???
+}
+
+object DynamicTest {
+  new Foo().bazApply("abc", 4, b = 1, b = "bcd") // error // error // error // error
+}
diff --git a/tests/neg/dynamicApplyNamedDynamicTest6.scala b/tests/neg/dynamicApplyNamedDynamicTest6.scala
new file mode 100644
index 000000000..4c39842af
--- /dev/null
+++ b/tests/neg/dynamicApplyNamedDynamicTest6.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamicNamed(name: Int)(args: Any*): String = ???
+}
+
+object DynamicTest {
+  new Foo().bazApply("abc", 4, b = 1, b = "bcd") // error
+}
diff --git a/tests/neg/dynamicApplyNamedDynamicTest7.scala b/tests/neg/dynamicApplyNamedDynamicTest7.scala
new file mode 100644
index 000000000..c29339f6d
--- /dev/null
+++ b/tests/neg/dynamicApplyNamedDynamicTest7.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamicNamed(name: String)(args: Any*): String = ???
+}
+
+object DynamicTest {
+  def test: Int = new Foo().bazApply("abc", 4, b = 1, b = "bcd") // error
+}
diff --git a/tests/neg/dynamicApplyNamedDynamicTest8.scala b/tests/neg/dynamicApplyNamedDynamicTest8.scala
new file mode 100644
index 000000000..e07b04ca1
--- /dev/null
+++ b/tests/neg/dynamicApplyNamedDynamicTest8.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamic(name: String)(args: Any*): String = ???
+}
+
+object DynamicTest {
+  new Foo().applyDynamicNamed("abc")() // error
+}
diff --git a/tests/neg/dynamicDynamicImplicitsTest1.scala b/tests/neg/dynamicDynamicImplicitsTest1.scala
new file mode 100644
index 000000000..b044336aa
--- /dev/null
+++ b/tests/neg/dynamicDynamicImplicitsTest1.scala
@@ -0,0 +1,13 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def selectDynamic(name: String): String = ???
+}
+
+object DynamicTest {
+  implicit class Bar(foo: Foo) {
+    def bazSelect: Int = ???
+  }
+
+  def baz: String = new Foo().bazSelect // error
+}
diff --git a/tests/neg/dynamicDynamicImplicitsTest2.scala b/tests/neg/dynamicDynamicImplicitsTest2.scala
new file mode 100644
index 000000000..3229d80e6
--- /dev/null
+++ b/tests/neg/dynamicDynamicImplicitsTest2.scala
@@ -0,0 +1,13 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamic(name: String)(args: Any*): String = ???
+}
+
+object DynamicTest {
+  implicit class Bar(foo: Foo) {
+    def bazApply: Int = ???
+  }
+
+  def baz: String = new Foo().bazApply("") // error
+}
diff --git a/tests/neg/dynamicDynamicImplicitsTest3.scala b/tests/neg/dynamicDynamicImplicitsTest3.scala
new file mode 100644
index 000000000..6c26b9500
--- /dev/null
+++ b/tests/neg/dynamicDynamicImplicitsTest3.scala
@@ -0,0 +1,13 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applytDynamicNamed(name: String)(args: Any*): String = ???
+}
+
+object DynamicTest {
+  implicit class Bar(foo: Foo) {
+    def bazApply: Int = ???
+  }
+
+  def baz: String = new Foo().bazApply(a = "") // error
+}
diff --git a/tests/neg/dynamicSelectDynamicTest1.scala b/tests/neg/dynamicSelectDynamicTest1.scala
new file mode 100644
index 000000000..a45671ad1
--- /dev/null
+++ b/tests/neg/dynamicSelectDynamicTest1.scala
@@ -0,0 +1,10 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  def testSelect = {
+    new Foo().bazSelect // error
+    ()
+  }
+}
diff --git a/tests/neg/dynamicSelectDynamicTest2.scala b/tests/neg/dynamicSelectDynamicTest2.scala
new file mode 100644
index 000000000..9ba19a14d
--- /dev/null
+++ b/tests/neg/dynamicSelectDynamicTest2.scala
@@ -0,0 +1,7 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  def testSelect = new Foo().bazSelect // error
+}
diff --git a/tests/neg/dynamicSelectDynamicTest3.scala b/tests/neg/dynamicSelectDynamicTest3.scala
new file mode 100644
index 000000000..acdad7033
--- /dev/null
+++ b/tests/neg/dynamicSelectDynamicTest3.scala
@@ -0,0 +1,7 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  new Foo().bazSelect // error
+}
diff --git a/tests/neg/dynamicSelectDynamicTest4.scala b/tests/neg/dynamicSelectDynamicTest4.scala
new file mode 100644
index 000000000..7295a43fd
--- /dev/null
+++ b/tests/neg/dynamicSelectDynamicTest4.scala
@@ -0,0 +1,11 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def selectDynamic(name: String): String = ???
+}
+
+object DynamicTest {
+  def testSelect: Int = {
+    new Foo().bazSelect // error
+  }
+}
diff --git a/tests/neg/dynamicSelectDynamicTest5.scala b/tests/neg/dynamicSelectDynamicTest5.scala
new file mode 100644
index 000000000..17836efe4
--- /dev/null
+++ b/tests/neg/dynamicSelectDynamicTest5.scala
@@ -0,0 +1,7 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  new Foo().bazSelectUpdate(6) = "a" // error
+}
diff --git a/tests/neg/dynamicSelectDynamicTest6.scala b/tests/neg/dynamicSelectDynamicTest6.scala
new file mode 100644
index 000000000..8df9bf492
--- /dev/null
+++ b/tests/neg/dynamicSelectDynamicTest6.scala
@@ -0,0 +1,11 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def selectDynamic(name: Int): String = ???
+}
+
+object DynamicTest {
+  def testSelect: String = {
+    new Foo().bazSelect // error
+  }
+}
diff --git a/tests/neg/dynamicSelectDynamicTest7.scala b/tests/neg/dynamicSelectDynamicTest7.scala
new file mode 100644
index 000000000..4b4207844
--- /dev/null
+++ b/tests/neg/dynamicSelectDynamicTest7.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def applyDynamic(name: String)(args: Any*): String = ???
+}
+
+object DynamicTest {
+  new Foo().selectDynamic("bar") // error
+}
diff --git a/tests/neg/dynamicUpdateDynamicTest1.scala b/tests/neg/dynamicUpdateDynamicTest1.scala
new file mode 100644
index 000000000..8eba9fe60
--- /dev/null
+++ b/tests/neg/dynamicUpdateDynamicTest1.scala
@@ -0,0 +1,7 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic
+
+object DynamicTest {
+  new Foo().bazUpdate = 42 // error
+}
diff --git a/tests/neg/dynamicUpdateDynamicTest2.scala b/tests/neg/dynamicUpdateDynamicTest2.scala
new file mode 100644
index 000000000..8bb8a9537
--- /dev/null
+++ b/tests/neg/dynamicUpdateDynamicTest2.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def updateDynamic(name: String)(value: String): Unit = ???
+}
+
+object DynamicTest {
+  new Foo().bazUpdate = 42 // error
+}
diff --git a/tests/neg/dynamicUpdateDynamicTest3.scala b/tests/neg/dynamicUpdateDynamicTest3.scala
new file mode 100644
index 000000000..22008dda4
--- /dev/null
+++ b/tests/neg/dynamicUpdateDynamicTest3.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def updateDynamic(name: String)(value: Int): Unit = ???
+}
+
+object DynamicTest {
+  def test: Int = new Foo().bazUpdate = 42 // error
+}
diff --git a/tests/neg/dynamicUpdateDynamicTest4.scala b/tests/neg/dynamicUpdateDynamicTest4.scala
new file mode 100644
index 000000000..3cdd32b3c
--- /dev/null
+++ b/tests/neg/dynamicUpdateDynamicTest4.scala
@@ -0,0 +1,9 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def updateDynamic(name: Int)(value: Int): Unit = ???
+}
+
+object DynamicTest {
+  new Foo().bazUpdate = 42 // error
+}
diff --git a/tests/run/dynamicDynamicTests.scala b/tests/run/dynamicDynamicTests.scala
new file mode 100644
index 000000000..3f8da8298
--- /dev/null
+++ b/tests/run/dynamicDynamicTests.scala
@@ -0,0 +1,164 @@
+import scala.language.dynamics
+
+class Foo extends scala.Dynamic {
+  def selectDynamic(name: String): String = "selectDynamic(" + name + ")"
+  def applyDynamic(name: String)(args: Any*): String = "applyDynamic(" + name + ")" + args.mkString("(", ", ", ")")
+  def applyDynamicNamed(name: String)(args: (String, Any)*): String = "applyDynamicNamed(" + name + ")" + args.mkString("(", ", ", ")")
+  def updateDynamic(name: String)(value: Any): String = "updateDynamic(" + name + ")(" + value + ")"
+}
+
+class Bar(self: String) extends scala.Dynamic {
+  def selectDynamic(name: String): Bar = new Bar(self + ".selectDynamic(" + name + ")")
+  def applyDynamic(name: String)(args: Any*): Bar = new Bar(self + ".applyDynamic(" + name + ")" + args.mkString("(", ", ", ")"))
+  def applyDynamicNamed(name: String)(args: (String, Any)*): Bar = new Bar(self + ".applyDynamicNamed(" + name + ")" + args.mkString("(", ", ", ")"))
+  def updateDynamic(name: String)(value: Any): Bar = new Bar(self + ".updateDynamic(" + name + ")(" + value + ")")
+  def update(key: Int, value: Int): Bar = new Bar(self + ".update(" + key + ", " + value + ")")
+  override def toString = self
+}
+
+class Baz extends scala.Dynamic {
+  def selectDynamic(name: String): String = "selectDynamic(" + name + ")"
+  def applyDynamic(name: String)(args: String*): String = "applyDynamic(" + name + ")" + args.mkString("(", ", ", ")")
+  def applyDynamicNamed(name: String)(args: (String, Any)*): String = "applyDynamicNamed(" + name + ")" + args.mkString("(", ", ", ")")
+  def updateDynamic(name: String)(value: String): String = "updateDynamic(" + name + ")(" + value + ")"
+}
+
+object Test {
+  implicit class StringUpdater(str: String) {
+    def update(name: String, v: String) = s"$str.update(" + name + ", " + v + ")"
+  }
+
+  var failed = false
+
+  def assertEquals(expected: String, actual: Any): Unit = {
+    if (expected != actual.toString) {
+      println("Error: expected <" + expected + "> but was <" + actual.toString + ">")
+      failed = true
+    }
+  }
+
+  def main(args: Array[String]): Unit = {
+    runFooTests1()
+    runFooTests2()
+    runBarTests()
+    runBazTests()
+    assert(!failed)
+  }
+
+  /** Test the basics of the transfomation rules. */
+  def runFooTests1() = {
+    val foo = new Foo
+
+    assertEquals("selectDynamic(bazSelect)", foo.bazSelect)
+
+    assertEquals("applyDynamic(bazApply)()", foo.bazApply())
+    assertEquals("applyDynamic(bazApply)(1)", foo.bazApply(1))
+    assertEquals("applyDynamic(bazApply)(1, 2, 3)", foo.bazApply(1, 2, 3))
+    assertEquals("applyDynamic(bazApply)(1, 2, a)", foo.bazApply(1, 2, "a"))
+    assertEquals("applyDynamic(bazApply)(1, 2, a)", foo.bazApply(List(1, 2, "a"): _*))
+
+    assertEquals("applyDynamicNamed(bazApply)((a,1))", foo.bazApply(a = 1))
+    assertEquals("applyDynamicNamed(bazApply)((a,1), (b,2))", foo.bazApply(a = 1, b = 2))
+    assertEquals("applyDynamicNamed(bazApply)((a,1), (,0))", foo.bazApply(a = 1, 0))
+    assertEquals("applyDynamicNamed(bazApply)((a,1), (a,5))", foo.bazApply(a = 1, a = 5))
+    assertEquals("applyDynamicNamed(bazApply)((,d), (a,1), (,5), (a,c))", foo.bazApply("d", a = 1, 5, a = 'c'))
+
+    assertEquals("updateDynamic(bazUpdate)(abc)", foo.bazUpdate = "abc")
+
+    assertEquals("selectDynamic(bazSelectUpdate).update(key, value)", foo.bazSelectUpdate("key") = "value")
+  }
+
+  /** Test implicit conversions kick in before dynamic calls. */
+  def runFooTests2() = {
+    implicit class Bar(foo: Foo) {
+      def bazSelect: String = "Bar.bazSelect"
+      def bazApply(args: Any*): String = args.mkString("Bar.bazApply(", ", ", ")")
+      def bazApplyNamed(a: Int = -1, b: String = "-1"): String = "Bar.bazApplyNamed(" + a + ", " + b + ")"
+    }
+
+    val foo = new Foo
+
+    assertEquals("Bar.bazSelect", foo.bazSelect)
+
+    assertEquals("Bar.bazApply()", foo.bazApply())
+    assertEquals("Bar.bazApply(1)", foo.bazApply(1))
+    assertEquals("Bar.bazApply(1, 2, 3)", foo.bazApply(1, 2, 3))
+    assertEquals("Bar.bazApply(1, 2, a)", foo.bazApply(1, 2, "a"))
+
+    assertEquals("Bar.bazApplyNamed(1, -1)", foo.bazApplyNamed(a = 1))
+    assertEquals("Bar.bazApplyNamed(1, 2)", foo.bazApplyNamed(a = 1, b = "2"))
+    assertEquals("Bar.bazApplyNamed(1, abc)", foo.bazApplyNamed(a = 1, "abc"))
+
+    assertEquals("selectDynamic(bazSelectUpdate).update(key, value)", foo.bazSelectUpdate("key") = "value")
+  }
+
+  /** Test cains of dynamic calls. */
+  def runBarTests() = {
+    val bar = new Bar("bar")
+
+    // dynamics combined with themselfs
+    assertEquals("bar.selectDynamic(select1).selectDynamic(select2).selectDynamic(select3)",
+        bar.select1.select2.select3)
+    assertEquals("bar.applyDynamic(apply1)().applyDynamic(apply2)().applyDynamic(apply3)()",
+        bar.apply1().apply2().apply3())
+    assertEquals("bar.applyDynamic(apply1)(1).applyDynamic(apply2)(1, 2).applyDynamic(apply3)(1, 2, 3)",
+        bar.apply1(1).apply2(1, 2).apply3(1, 2, 3))
+    assertEquals("bar.applyDynamicNamed(apply1)((a,1)).applyDynamicNamed(apply2)((,1), (b,2))",
+        bar.apply1(a = 1).apply2(1, b = 2))
+    assertEquals("bar.updateDynamic(update1)(1).updateDynamic(update2)(4)", (bar.update1 = 1).update2 = 4)
+    assertEquals("bar.selectDynamic(update1).update(1, 2).selectDynamic(update2).update(3, 4)",
+        (bar.update1(1) = 2).update2(3) = 4)
+
+    // selectDynamic combined with every other dynamic
+    assertEquals("bar.applyDynamic(apply1)().selectDynamic(select1)", bar.apply1().select1)
+    assertEquals("bar.selectDynamic(select1).applyDynamic(apply2)()", bar.select1.apply2())
+    assertEquals("bar.applyDynamicNamed(apply1)((a,1)).selectDynamic(select1)", bar.apply1(a = 1).select1)
+    assertEquals("bar.selectDynamic(select1).applyDynamicNamed(apply1)((a,1))", bar.select1.apply1(a = 1))
+    assertEquals("bar.updateDynamic(update1)(1).selectDynamic(select1)", (bar.update1 = 1).select1)
+    assertEquals("bar.selectDynamic(select1).updateDynamic(update1)(1)", bar.select1.update1 = 1)
+    assertEquals("bar.selectDynamic(update1).update(0, 1).selectDynamic(select1)", (bar.update1(0) = 1).select1)
+    assertEquals("bar.selectDynamic(select1).selectDynamic(update1).update(0, 1)", bar.select1.update1(0) = 1)
+
+    // applyDynamic combined with every remaninig dynamic
+    assertEquals("bar.applyDynamic(apply1)().applyDynamicNamed(apply2)((a,1))", bar.apply1().apply2(a = 1))
+    assertEquals("bar.applyDynamicNamed(apply1)((a,1)).applyDynamic(apply2)()", bar.apply1(a = 1).apply2())
+    assertEquals("bar.applyDynamic(apply1)().updateDynamic(update1)(1)", bar.apply1().update1 = 1)
+    assertEquals("bar.updateDynamic(update1)(1).applyDynamic(apply1)()", (bar.update1 = 1).apply1())
+    assertEquals("bar.applyDynamic(apply1)().selectDynamic(update1).update(0, 1)", bar.apply1().update1(0) = 1)
+    assertEquals("bar.selectDynamic(update1).update(0, 1).applyDynamic(apply1)()", (bar.update1(0) = 1).apply1())
+
+    // applyDynamicNamed combined with every remaninig dynamic
+    assertEquals("bar.applyDynamicNamed(apply1)((a,1)).updateDynamic(update1)(1)", bar.apply1(a = 1).update1 = 1)
+    assertEquals("bar.updateDynamic(update1)(1).applyDynamicNamed(apply1)((a,1))", (bar.update1 = 1).apply1(a = 1))
+    assertEquals("bar.applyDynamicNamed(apply1)((a,1)).selectDynamic(update1).update(0, 1)", bar.apply1(a = 1).update1(0) = 1)
+    assertEquals("bar.selectDynamic(update1).update(0, 1).applyDynamicNamed(apply1)((a,1))", (bar.update1(0) = 1).apply1(a = 1))
+
+    // updateDynamic combined selectDynamic(_).update(_, _)
+    assertEquals("bar.updateDynamic(update1)(1).selectDynamic(update2).update(0, 1)", (bar.update1 = 1).update2(0) = 1)
+    assertEquals("bar.selectDynamic(update1).update(0, 1).updateDynamic(update2)(1)", (bar.update1(0) = 1).update2 = 1)
+  }
+
+  /** Test implicit conversion in the arguments of the dynamic call. */
+  def runBazTests() = {
+    implicit def intToString(n: Int): String = n.toString
+
+    val baz = new Baz
+
+    assertEquals("applyDynamic(bazApply)()", baz.bazApply())
+    assertEquals("applyDynamic(bazApply)(1)", baz.bazApply(1))
+    assertEquals("applyDynamic(bazApply)(1, 2, 3)", baz.bazApply(1, 2, 3))
+    assertEquals("applyDynamic(bazApply)(1, 2, a)", baz.bazApply(1, 2, "a"))
+
+    assertEquals("applyDynamicNamed(bazApply)((a,1))", baz.bazApply(a = 1))
+    assertEquals("applyDynamicNamed(bazApply)((a,1), (b,2))", baz.bazApply(a = 1, b = 2))
+    assertEquals("applyDynamicNamed(bazApply)((a,1), (,0))", baz.bazApply(a = 1, 0))
+    assertEquals("applyDynamicNamed(bazApply)((a,1), (a,5))", baz.bazApply(a = 1, a = 5))
+    assertEquals("applyDynamicNamed(bazApply)((,4), (a,1), (,5), (a,9))", baz.bazApply(4, a = 1, 5, a = 9))
+
+    assertEquals("updateDynamic(bazUpdate)(10)", baz.bazUpdate = 10)
+
+    assertEquals("selectDynamic(bazSelectUpdate).update(key, 10)", baz.bazSelectUpdate("key") = 10)
+    assertEquals("selectDynamic(bazSelectUpdate).update(7, value)", baz.bazSelectUpdate(7) = "value")
+    assertEquals("selectDynamic(bazSelectUpdate).update(7, 10)", baz.bazSelectUpdate(7) = 10)
+  }
+}