diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-11-12 13:30:08 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-11-12 13:30:08 +0000 |
| commit | 55ce01a926ec6fcc0474a905a6a0026811527d72 (patch) | |
| tree | a6600aef9c9c981bda8252c28f1a542acf9a7511 /test/files/run | |
| parent | df13e31bbb5f0dedc9739687bae553512a4a2517 (diff) | |
| download | scala-55ce01a926ec6fcc0474a905a6a0026811527d72.tar.gz scala-55ce01a926ec6fcc0474a905a6a0026811527d72.tar.bz2 scala-55ce01a926ec6fcc0474a905a6a0026811527d72.zip | |
Merged revisions 19543,19545-19547 via svnmerge...
Merged revisions 19543,19545-19547 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r19543 | rytz | 2009-11-12 12:10:13 +0100 (Thu, 12 Nov 2009) | 1 line
fixed #2470.
........
r19545 | cunei | 2009-11-12 13:07:09 +0100 (Thu, 12 Nov 2009) | 2 lines
removed disabled files
........
r19546 | rytz | 2009-11-12 13:31:49 +0100 (Thu, 12 Nov 2009) | 1 line
fix #2488.
........
r19547 | odersky | 2009-11-12 14:08:04 +0100 (Thu, 12 Nov 2009) | 1 line
Allow protected access to constructor in superclass. Closes #1836
........
Diffstat (limited to 'test/files/run')
| -rw-r--r-- | test/files/run/names-defaults.check | 4 | ||||
| -rw-r--r-- | test/files/run/names-defaults.scala | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/test/files/run/names-defaults.check b/test/files/run/names-defaults.check index 937f95962b..47d09a5083 100644 --- a/test/files/run/names-defaults.check +++ b/test/files/run/names-defaults.check @@ -18,12 +18,16 @@ get: [ get: 4 get: @ 4: @ +get: 10 +get: flu +10: flu get: 8 get: 9 get: % get: 5 5: %, 17 12: ', 13, 16 +1: bird, swine, 10 6: ~ get: 7 get: + diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala index 008939cc9d..d5524b95ab 100644 --- a/test/files/run/names-defaults.scala +++ b/test/files/run/names-defaults.scala @@ -13,8 +13,10 @@ object Test extends Application { // mixing named and positional test1(get(4), b = get("@")) + test1(a = get(10), get("flu")) test2(get(8), v = get(9))(get("%"), l = get(5)) test3(12, 13)("'", d = 16) + test3(a = 1, "swine")(c = "bird", d = 10L) // anonymous functions |