summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2010-08-03 20:03:08 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2010-08-03 20:03:08 +0000
commitdb99926628a2b636a548049c1204fee78c77b9bb (patch)
tree88122a98135c3c2165ad6364819a66854d61ec16 /test/files/run
parent958fb1c6f48aeecf5fc56ad9debbfad8d6d0fc66 (diff)
downloadscala-db99926628a2b636a548049c1204fee78c77b9bb.tar.gz
scala-db99926628a2b636a548049c1204fee78c77b9bb.tar.bz2
scala-db99926628a2b636a548049c1204fee78c77b9bb.zip
added @deprecatedName annotation, allowing to d...
added @deprecatedName annotation, allowing to deprecate parameter names. review by prokopec.
Diffstat (limited to 'test/files/run')
-rw-r--r--test/files/run/names-defaults.check3
-rw-r--r--test/files/run/names-defaults.scala16
2 files changed, 19 insertions, 0 deletions
diff --git a/test/files/run/names-defaults.check b/test/files/run/names-defaults.check
index b4effa26d2..5b271a5d28 100644
--- a/test/files/run/names-defaults.check
+++ b/test/files/run/names-defaults.check
@@ -106,3 +106,6 @@ blublu1
my text
List(1, 2)
3
+1
+2
+3
diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala
index 8ddfcd950d..2a50d26cdd 100644
--- a/test/files/run/names-defaults.scala
+++ b/test/files/run/names-defaults.scala
@@ -350,6 +350,22 @@ object Test extends Application {
class DBLAH(val y: String = "2") extends CBLAH()
(new DBLAH())
+ // deprecated names
+ def deprNam1(@deprecatedName('x) a: Int, @deprecatedName('y) b: Int) = a + b
+ deprNam1(y = 10, a = 1)
+ deprNam1(b = 2, x = 10)
+
+ object deprNam2 {
+ def f(@deprecatedName('s) x: String) = 1
+ def f(s: Object) = 2
+
+ def g(@deprecatedName('x) s: Object) = 3
+ def g(s: String) = 4
+ }
+ println(deprNam2.f(s = "dlf"))
+ println(deprNam2.f(s = new Object))
+ println(deprNam2.g(x = "sljkfd"))
+
// DEFINITIONS
def test1(a: Int, b: String) = println(a +": "+ b)