diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-14 00:12:51 +0200 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-10-14 00:12:51 +0200 |
| commit | b126e5c31b2bc57df5d0d5cf3508babe1dd7a759 (patch) | |
| tree | e1c71882fe860ac0bdd1f79b0ec45757a7c888be /test/files/neg/names-defaults-neg.check | |
| parent | 71d4e285064e9d3475a0badecf283ea95166df6d (diff) | |
| parent | 392d1ddb1588d69c2e8ae10a2b3e902c7229b772 (diff) | |
| download | scala-b126e5c31b2bc57df5d0d5cf3508babe1dd7a759.tar.gz scala-b126e5c31b2bc57df5d0d5cf3508babe1dd7a759.tar.bz2 scala-b126e5c31b2bc57df5d0d5cf3508babe1dd7a759.zip | |
Merge remote-tracking branch 'scala/master' into fix-merge-3018
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Typers.scala
Diffstat (limited to 'test/files/neg/names-defaults-neg.check')
| -rw-r--r-- | test/files/neg/names-defaults-neg.check | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check index cdc12c2490..880ddc4327 100644 --- a/test/files/neg/names-defaults-neg.check +++ b/test/files/neg/names-defaults-neg.check @@ -7,6 +7,11 @@ names-defaults-neg.scala:5: error: type mismatch; required: Int test1(b = 2, a = "#") ^ +names-defaults-neg.scala:5: error: type mismatch; + found : Int(2) + required: String + test1(b = 2, a = "#") + ^ names-defaults-neg.scala:8: error: positional after named argument. test1(b = "(*", 23) ^ @@ -122,6 +127,12 @@ names-defaults-neg.scala:131: error: reference to var2 is ambiguous; it is both names-defaults-neg.scala:134: error: missing parameter type for expanded function ((x$1) => a = x$1) val taf2: Int => Unit = testAnnFun(a = _, b = get("+")) ^ +names-defaults-neg.scala:134: error: not found: value a + val taf2: Int => Unit = testAnnFun(a = _, b = get("+")) + ^ +names-defaults-neg.scala:134: error: not found: value get + val taf2: Int => Unit = testAnnFun(a = _, b = get("+")) + ^ names-defaults-neg.scala:135: error: parameter 'a' is already specified at parameter position 1 val taf3 = testAnnFun(b = _: String, a = get(8)) ^ @@ -131,6 +142,9 @@ names-defaults-neg.scala:136: error: missing parameter type for expanded functio names-defaults-neg.scala:136: error: missing parameter type for expanded function ((x$4) => b = x$4) val taf4: (Int, String) => Unit = testAnnFun(_, b = _) ^ +names-defaults-neg.scala:136: error: not found: value b + val taf4: (Int, String) => Unit = testAnnFun(_, b = _) + ^ names-defaults-neg.scala:144: error: variable definition needs type because 'x' is used as a named argument in its body. def t3 { var x = t.f(x = 1) } ^ @@ -168,4 +182,4 @@ names-defaults-neg.scala:180: error: reference to x is ambiguous; it is both a m class u18 { var x: Int = u.f(x = 1) } ^ four warnings found -42 errors found +46 errors found |