diff options
Diffstat (limited to 'test/files/run')
| -rw-r--r-- | test/files/run/fors.scala | 4 | ||||
| -rw-r--r-- | test/files/run/forvaleq.scala | 14 | ||||
| -rw-r--r-- | test/files/run/mapConserve.scala | 2 | ||||
| -rw-r--r-- | test/files/run/repl-suppressed-warnings.check | 25 | ||||
| -rw-r--r-- | test/files/run/repl-suppressed-warnings.scala | 7 | ||||
| -rw-r--r-- | test/files/run/sequenceComparisons.scala | 4 | ||||
| -rw-r--r-- | test/files/run/t1939.scala | 2 |
7 files changed, 35 insertions, 23 deletions
diff --git a/test/files/run/fors.scala b/test/files/run/fors.scala index c7682f563d..54afdc710b 100644 --- a/test/files/run/fors.scala +++ b/test/files/run/fors.scala @@ -76,10 +76,10 @@ object Test extends App { for {x <- it if x % 2 == 0} print(x + " "); println for (x <- it; - val y = 2 + y = 2 if x % y == 0) print(x + " "); println for {x <- it - val y = 2 + y = 2 if x % y == 0} print(x + " "); println // arrays diff --git a/test/files/run/forvaleq.scala b/test/files/run/forvaleq.scala index 40dbfd099a..8c1824a769 100644 --- a/test/files/run/forvaleq.scala +++ b/test/files/run/forvaleq.scala @@ -24,7 +24,7 @@ object Test { val input = L.range(0,20) val oddFirstTimesTwo = for {x <- input - val xf = firstDigit(x) + xf = firstDigit(x) if xf % 2 == 1} yield x*2 println(oddFirstTimesTwo) @@ -36,9 +36,9 @@ object Test { val input = L.range(0, 20) val oddFirstTimesTwo = for {x <- input - val xf = firstDigit(x) - val yf = x - firstDigit(x) / 10 - val (a, b) = (xf - yf, xf + yf) + xf = firstDigit(x) + yf = x - firstDigit(x) / 10 + (a, b) = (xf - yf, xf + yf) if xf % 2 == 1} yield a + b println(oddFirstTimesTwo) @@ -51,7 +51,7 @@ object Test { val input = L.range(0, 20).iterator val oddFirstTimesTwo = for {x <- input - val xf = firstDigit(x) + xf = firstDigit(x) if xf % 2 == 1} yield x*2 println(oddFirstTimesTwo.toList) @@ -63,7 +63,7 @@ object Test { val input = L.range(0,20) val oddFirstTimesTwo = for {x <- input - val xf = firstDigit(x) + xf = firstDigit(x) if xf % 2 == 1} yield xf*2 println(oddFirstTimesTwo) @@ -80,7 +80,7 @@ object Test { val input = L.range(0,20) for {x <- input - val xf = fdct(x) + xf = fdct(x) if xf % 2 == 1} yield xf diff --git a/test/files/run/mapConserve.scala b/test/files/run/mapConserve.scala index 176e38bed4..a285113b11 100644 --- a/test/files/run/mapConserve.scala +++ b/test/files/run/mapConserve.scala @@ -30,7 +30,7 @@ object Test { def main(args: Array[String]) { for (length <- 0 to maxListLength; bitmap <- 0 until (1 << length); - val data = List.range(0, length) map { x: Int => + data = List.range(0, length) map { x: Int => if ((bitmap & (1 << x)) != 0) BigInt(x+16) else BigInt(x) }) diff --git a/test/files/run/repl-suppressed-warnings.check b/test/files/run/repl-suppressed-warnings.check index 0c449f348c..a8ab9296c0 100644 --- a/test/files/run/repl-suppressed-warnings.check +++ b/test/files/run/repl-suppressed-warnings.check @@ -30,12 +30,18 @@ scala> object o { } } case class DingDangDoobie(ding: Int, dang: Int, doobie: Double) - case class Dongoo ; case class Heyooooo ; for (x <- 1 to 10 ; val y = x ; z = y) yield x + case class Dongoo + @serializable case class Heyooooo + + @deprecated("I'm an ironic deprecation warning") def f0 = 5 // where's this disappearing? + def f1 = scala.Math.Pi // and this? } -warning: there were 4 deprecation warnings; re-run with -deprecation for details +warning: there were 6 deprecation warnings; re-run with -deprecation for details warning: there were 3 unchecked warnings; re-run with -unchecked for details defined module o +scala> + scala> :warnings <console>:3: warning: case classes without a parameter list have been deprecated; use either case objects or case classes with `()' as parameter list. @@ -43,15 +49,16 @@ use either case objects or case classes with `()' as parameter list. ^ <console>:11: warning: case classes without a parameter list have been deprecated; use either case objects or case classes with `()' as parameter list. - case class Dongoo ; case class Heyooooo ; for (x <- 1 to 10 ; val y = x ; z = y) yield x - ^ + case class Dongoo + ^ <console>:11: warning: case classes without a parameter list have been deprecated; use either case objects or case classes with `()' as parameter list. - case class Dongoo ; case class Heyooooo ; for (x <- 1 to 10 ; val y = x ; z = y) yield x - ^ -<console>:11: warning: for comprehension assignment without a `val' declaration is deprecated. - case class Dongoo ; case class Heyooooo ; for (x <- 1 to 10 ; val y = x ; z = y) yield x - ^ + case class Dongoo + ^ +<console>:12: warning: case classes without a parameter list have been deprecated; +use either case objects or case classes with `()' as parameter list. + @serializable case class Heyooooo + ^ scala> diff --git a/test/files/run/repl-suppressed-warnings.scala b/test/files/run/repl-suppressed-warnings.scala index 5ecc16f34c..2d96a8eb24 100644 --- a/test/files/run/repl-suppressed-warnings.scala +++ b/test/files/run/repl-suppressed-warnings.scala @@ -19,8 +19,13 @@ object o { } } case class DingDangDoobie(ding: Int, dang: Int, doobie: Double) - case class Dongoo ; case class Heyooooo ; for (x <- 1 to 10 ; val y = x ; z = y) yield x + case class Dongoo + @serializable case class Heyooooo + + @deprecated("I'm an ironic deprecation warning") def f0 = 5 // where's this disappearing? + def f1 = scala.Math.Pi // and this? } + :warnings """ } diff --git a/test/files/run/sequenceComparisons.scala b/test/files/run/sequenceComparisons.scala index 2b5833aacc..c2f7ddc697 100644 --- a/test/files/run/sequenceComparisons.scala +++ b/test/files/run/sequenceComparisons.scala @@ -104,10 +104,10 @@ object Test { val scrut = s1f(seq) for (Method(f, (trueList, falseList), descr) <- methodList) { - for (s <- trueList; val rhs = s2f(s)) + for (s <- trueList; rhs = s2f(s)) assertOne(scrut, rhs, f(scrut, rhs), descr) - for (s <- falseList; val rhs = s2f(s)) + for (s <- falseList; rhs = s2f(s)) assertOne(scrut, rhs, !f(scrut, rhs), "!(" + descr + ")") } } diff --git a/test/files/run/t1939.scala b/test/files/run/t1939.scala index 5a36348761..7626e8bc1a 100644 --- a/test/files/run/t1939.scala +++ b/test/files/run/t1939.scala @@ -25,7 +25,7 @@ object Test extends App { def f(ts: List[tType]): Unit = { - for (t <- ts; val m = t.module) {} + for (t <- ts; m = t.module) {} ts.map(t => t.module).foreach { _ => () } // ts.map(t => (t : T).module).foreach { _ => () } // runs successfully } |