added @deprecatedName annotation, allowing to d...

added @deprecatedName annotation, allowing to deprecate parameter names.
review by prokopec.

7 files changed, 66 insertions, 5 deletions

diff --git a/test/files/neg/names-defaults-neg-warn.check b/test/files/neg/names-defaults-neg-warn.check
new file mode 100644
index 0000000000..e1085acf76
--- /dev/null
+++ b/test/files/neg/names-defaults-neg-warn.check
@@ -0,0 +1,7 @@
+names-defaults-neg-warn.scala:11: error: the parameter name s has been deprecated. Use x instead.
+  deprNam2.f(s = "dlfkj")
+               ^
+names-defaults-neg-warn.scala:12: error: the parameter name x has been deprecated. Use s instead.
+  deprNam2.g(x = "dlkjf")
+               ^
+two errors found
diff --git a/test/files/neg/names-defaults-neg-warn.flags b/test/files/neg/names-defaults-neg-warn.flags
new file mode 100644
index 0000000000..d1b831ea87
--- /dev/null
+++ b/test/files/neg/names-defaults-neg-warn.flags
@@ -0,0 +1 @@
+-deprecation -Xfatal-warnings
\ No newline at end of file
diff --git a/test/files/neg/names-defaults-neg-warn.scala b/test/files/neg/names-defaults-neg-warn.scala
new file mode 100644
index 0000000000..7cb956cc86
--- /dev/null
+++ b/test/files/neg/names-defaults-neg-warn.scala
@@ -0,0 +1,14 @@
+object Test extends Application {
+  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
+  }
+
+  deprNam2.f(s = new Object)
+  deprNam2.f(s = "dlfkj")
+  deprNam2.g(x = "dlkjf")
+  deprNam2.g(s = new Object)
+}
diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check
index b2b00b7050..ec786c5e03 100644
--- a/test/files/neg/names-defaults-neg.check
+++ b/test/files/neg/names-defaults-neg.check
@@ -107,17 +107,30 @@ Error occurred in an application involving default arguments.
 names-defaults-neg.scala:86: error: module extending its companion class cannot use default constructor arguments
     object C extends C()
              ^
-names-defaults-neg.scala:120: error: reference to var2 is ambiguous; it is both, a parameter
+names-defaults-neg.scala:90: error: deprecated parameter name x has to be distinct from any other parameter name (deprecated or not).
+  def deprNam1(x: Int, @deprecatedName('x) y: String) = 0
+                                           ^
+names-defaults-neg.scala:91: error: deprecated parameter name a has to be distinct from any other parameter name (deprecated or not).
+  def deprNam2(a: String)(@deprecatedName('a) b: Int) = 1
+                                              ^
+names-defaults-neg.scala:93: warning: the parameter name y has been deprecated. Use b instead.
+  deprNam3(y = 10, b = 2)
+             ^
+names-defaults-neg.scala:93: error: parameter specified twice: b
+  deprNam3(y = 10, b = 2)
+                     ^
+names-defaults-neg.scala:127: error: reference to var2 is ambiguous; it is both, a parameter
 name of the method and the name of a variable currently in scope.
   delay(var2 = 40)
              ^
-names-defaults-neg.scala:123: error: missing parameter type for expanded function ((x$1) => a = x$1)
+names-defaults-neg.scala:130: error: missing parameter type for expanded function ((x$1) => a = x$1)
   val taf2: Int => Unit = testAnnFun(a = _, b = get("+"))
                                          ^
-names-defaults-neg.scala:124: error: parameter specified twice: a
+names-defaults-neg.scala:131: error: parameter specified twice: a
   val taf3 = testAnnFun(b = _: String, a = get(8))
                                          ^
-names-defaults-neg.scala:125: error: wrong number of parameters; expected = 2
+names-defaults-neg.scala:132: error: wrong number of parameters; expected = 2
   val taf4: (Int, String) => Unit = testAnnFun(_, b = _)
                                               ^
-29 errors found
+one warning found
+32 errors found
diff --git a/test/files/neg/names-defaults-neg.scala b/test/files/neg/names-defaults-neg.scala
index 43883540a0..8d1ec4ce96 100644
--- a/test/files/neg/names-defaults-neg.scala
+++ b/test/files/neg/names-defaults-neg.scala
@@ -86,6 +86,13 @@ object Test extends Application {
     object C extends C()
   }
 
+  // deprecated names
+  def deprNam1(x: Int, @deprecatedName('x) y: String) = 0
+  def deprNam2(a: String)(@deprecatedName('a) b: Int) = 1
+  def deprNam3(@deprecatedName('x) a: Int, @deprecatedName('y) b: Int) = a + b
+  deprNam3(y = 10, b = 2)
+
+
   // DEFINITIONS
   def test1(a: Int, b: String) = a +": "+ b
   def test2(x: Unit) = println("test2")
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)