diff options
author | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-06-16 18:38:02 +0000 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2010-06-16 18:38:02 +0000 |
commit | fd9ddea91f21ede82cb9083c24e91c3b47da178b (patch) | |
tree | 2d8251f2c9ebf34d0d2e7386264675207104ab61 /test/files/run | |
parent | 59dc9f40bda5a1958f9187714f68568b039e0bcb (diff) | |
download | scala-fd9ddea91f21ede82cb9083c24e91c3b47da178b.tar.gz scala-fd9ddea91f21ede82cb9083c24e91c3b47da178b.tar.bz2 scala-fd9ddea91f21ede82cb9083c24e91c3b47da178b.zip |
removed integration of placeholder syntax and n...
removed integration of placeholder syntax and named arguments. review by
odersky
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/names-defaults.check | 21 | ||||
-rw-r--r-- | test/files/run/names-defaults.scala | 24 |
2 files changed, 15 insertions, 30 deletions
diff --git a/test/files/run/names-defaults.check b/test/files/run/names-defaults.check index 60c7637e3d..b4effa26d2 100644 --- a/test/files/run/names-defaults.check +++ b/test/files/run/names-defaults.check @@ -28,23 +28,10 @@ get: 5 5: %, 17 12: ', 13, 16 1: bird, swine, 10 +20 +30 +40 6: ~ -get: 7 -get: + -7: + -get: + -get: 8 -8: + -9: ? -get: 39 -get: 38 -get: | -10: |, 77 -get: 2.233 -get: < -get: 13 -get: x -13: x, 2.233, < 14: / 100: 100: nix, nix, 982, 982, 0 100: overridden, bla, 0, 0, 555 @@ -87,8 +74,6 @@ lskf2dkflj2 dlkd5nixda10nixdadklfj1dklfj C(dlkf,234,struct)struct??? C(dflkj,234,Some(209))None!! -20020100 -C(dlfkj,11,10)35dlkf dflk10 1-1jupee 12.39 diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala index ee9186c35f..f197d2ff11 100644 --- a/test/files/run/names-defaults.scala +++ b/test/files/run/names-defaults.scala @@ -20,16 +20,20 @@ object Test extends Application { // anonymous functions - val f1: (Int, String) => Unit = test1(_, _); f1(6, "~") - val f2: Int => Unit = test1(a = _, b = get("+")); f2(get(7)) - val f3 = test1(b = _: String, a = get(8)); f3(get("+")) - val f4: (Int, String) => Unit = test1(_, b = _); f4(9, "?") + { + def doMod(f: Int => Unit) { f(20) } + var var1 = 0 + doMod(var1 = _) + println(var1) - val f5: Int => (String, Int) => Unit = test2(v = get(38), u = _)_ - f5(get(39))(get("|"), 10) + synchronized(var1 = 30) + println(var1) - val f6: (Double, String) => Unit = test3(get(13), _)(d = _, c = get("x")) - f6(get(2.233), get("<")) + var var2 = 0 + def delay(var2: => Int) = { var2 } + println(delay(var2 = 40)) + } + val f1: (Int, String) => Unit = test1(_, _); f1(6, "~") test4(14) @@ -151,10 +155,6 @@ object Test extends Application { println(c1.print) val c2 = C("dflkj", c = Some(209): Option[Int])(None, "!!") println(c2.print) - val a_f: String => A[String, Nothing] = new A[String, Nothing](b = _)(d = 100) - println(a_f("20").print) - val c_f: Int => C[Int] = C("dlfkj", c = 10, b = _)(35, e = "dlkf") - println(c_f(11).print) // "super" qualifier |