diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-09-22 19:44:09 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-09-22 19:44:09 +0200 |
commit | df704ef7389ff6265afc1278783489ee97ee4ce7 (patch) | |
tree | ca7e4df33c4e5404f18e0b664e28c7c8bc4e3375 /test/files/run | |
parent | 9995935b6160171527b121263db75b56be6a9ca7 (diff) | |
parent | fe755d5ff2518ff94d6a0dee43f14ba24f9af5eb (diff) | |
download | scala-df704ef7389ff6265afc1278783489ee97ee4ce7.tar.gz scala-df704ef7389ff6265afc1278783489ee97ee4ce7.tar.bz2 scala-df704ef7389ff6265afc1278783489ee97ee4ce7.zip |
Merge pull request #4761 from lrytz/merge-2.11-to-2.12-sep-22
Merge 2.11 to 2.12 sep 22
Diffstat (limited to 'test/files/run')
29 files changed, 38 insertions, 40 deletions
diff --git a/test/files/run/class-symbol-contravariant.check b/test/files/run/class-symbol-contravariant.check index 1d95273b50..5166fce96a 100644 --- a/test/files/run/class-symbol-contravariant.check +++ b/test/files/run/class-symbol-contravariant.check @@ -1,10 +1,8 @@ scala> :power -** Power User mode enabled - BEEP WHIR GYVE ** -** :phase has been set to 'typer'. ** -** scala.tools.nsc._ has been imported ** -** global._, definitions._ also imported ** -** Try :help, :vals, power.<tab> ** +Power mode enabled. :phase is at typer. +import scala.tools.nsc._, intp.global._, definitions._ +Try :help or completions for vals._ and power._ scala> val u = rootMirror.universe u: $r.intp.global.type = <global> diff --git a/test/files/run/constant-type.check b/test/files/run/constant-type.check index b92f1481a3..9df1353354 100644 --- a/test/files/run/constant-type.check +++ b/test/files/run/constant-type.check @@ -1,10 +1,8 @@ scala> :power -** Power User mode enabled - BEEP WHIR GYVE ** -** :phase has been set to 'typer'. ** -** scala.tools.nsc._ has been imported ** -** global._, definitions._ also imported ** -** Try :help, :vals, power.<tab> ** +Power mode enabled. :phase is at typer. +import scala.tools.nsc._, intp.global._, definitions._ +Try :help or completions for vals._ and power._ scala> val s = transformedType(StringClass.toType).asInstanceOf[Type] s: $r.intp.global.Type = String diff --git a/test/files/run/list_map.scala b/test/files/run/list_map.scala index fba3aae228..fba3aae228 100755..100644 --- a/test/files/run/list_map.scala +++ b/test/files/run/list_map.scala diff --git a/test/files/run/repl-paste-2.check b/test/files/run/repl-paste-2.check index dbf5363c0f..4c589df41a 100644 --- a/test/files/run/repl-paste-2.check +++ b/test/files/run/repl-paste-2.check @@ -1,7 +1,7 @@ scala> scala> 999l -// Detected repl transcript paste: ctrl-D to finish. +// Detected repl transcript. Paste more, or ctrl-D to finish. res4: Int = 0123 diff --git a/test/files/run/repl-power.check b/test/files/run/repl-power.check index 4e030bd9fa..0d4a30b8e3 100644 --- a/test/files/run/repl-power.check +++ b/test/files/run/repl-power.check @@ -1,10 +1,8 @@ scala> :power -** Power User mode enabled - BEEP WHIR GYVE ** -** :phase has been set to 'typer'. ** -** scala.tools.nsc._ has been imported ** -** global._, definitions._ also imported ** -** Try :help, :vals, power.<tab> ** +Power mode enabled. :phase is at typer. +import scala.tools.nsc._, intp.global._, definitions._ +Try :help or completions for vals._ and power._ scala> // guarding against "error: reference to global is ambiguous" diff --git a/test/files/run/repl-transcript.check b/test/files/run/repl-transcript.check index 762a96b9cc..d0b455cbf6 100644 --- a/test/files/run/repl-transcript.check +++ b/test/files/run/repl-transcript.check @@ -1,7 +1,7 @@ scala> scala> class Bippity -// Detected repl transcript paste: ctrl-D to finish. +// Detected repl transcript. Paste more, or ctrl-D to finish. defined class Bippity diff --git a/test/files/run/t2127.scala b/test/files/run/t2127.scala index 839c8d6a5c..839c8d6a5c 100755..100644 --- a/test/files/run/t2127.scala +++ b/test/files/run/t2127.scala diff --git a/test/files/run/t2503.scala b/test/files/run/t2503.scala index 21801e2dbd..21801e2dbd 100755..100644 --- a/test/files/run/t2503.scala +++ b/test/files/run/t2503.scala diff --git a/test/files/run/t3026.scala b/test/files/run/t3026.scala index 22dde9cc03..22dde9cc03 100755..100644 --- a/test/files/run/t3026.scala +++ b/test/files/run/t3026.scala diff --git a/test/files/run/t4658.check b/test/files/run/t4658.check index bb6405175e..3bc52daef3 100644 --- a/test/files/run/t4658.check +++ b/test/files/run/t4658.check @@ -1,5 +1,5 @@ Ranges: -1073741824 +-1073741824 1073741824 0 0 @@ -20,7 +20,7 @@ Ranges: -10 IntRanges: -1073741824 --1073741824 +1073741824 0 0 55 @@ -78,3 +78,6 @@ BigIntRanges: -24 -30 -10 +BigInt agrees with Long: true +Long agrees with Int when rounded: true +Numeric Int agrees with Range: true diff --git a/test/files/run/t4658.scala b/test/files/run/t4658.scala index 8c07c50694..7fc6d4584c 100644 --- a/test/files/run/t4658.scala +++ b/test/files/run/t4658.scala @@ -2,6 +2,7 @@ import scala.collection.immutable.NumericRange //#4658 object Test { + // Only works for Int values! Need to rethink explicit otherwise. case class R(start: Int, end: Int, step: Int = 1, inclusive: Boolean = true) val rangeData = Array( @@ -28,6 +29,14 @@ object Test { numericLongRanges.foreach{range => println(range.sum)} println("BigIntRanges:") numericBigIntRanges.foreach{range => println(range.sum)} + println("BigInt agrees with Long: " + + (numericLongRanges zip numericBigIntRanges).forall{ case (lr, bir) => lr.sum == bir.sum } + ) + println("Long agrees with Int when rounded: " + + (numericLongRanges zip numericIntRanges).forall{ case (lr, ir) => lr.sum.toInt == ir.sum } + ) + println("Numeric Int agrees with Range: " + + (numericIntRanges zip ranges).forall{ case (ir, r) => ir.sum == r.sum } + ) } - }
\ No newline at end of file diff --git a/test/files/run/t5699.check b/test/files/run/t5699.check index df19644ae6..df19644ae6 100755..100644 --- a/test/files/run/t5699.check +++ b/test/files/run/t5699.check diff --git a/test/files/run/t5699.scala b/test/files/run/t5699.scala index 409bcd250c..409bcd250c 100755..100644 --- a/test/files/run/t5699.scala +++ b/test/files/run/t5699.scala diff --git a/test/files/run/t5717.scala b/test/files/run/t5717.scala index a0997f5a49..a0997f5a49 100755..100644 --- a/test/files/run/t5717.scala +++ b/test/files/run/t5717.scala diff --git a/test/files/run/t6146b.check b/test/files/run/t6146b.check index 0e0c216cd7..11149c50fd 100644 --- a/test/files/run/t6146b.check +++ b/test/files/run/t6146b.check @@ -4,11 +4,9 @@ It would fail on the following inputs: S2(), S3() ^ scala> :power -** Power User mode enabled - BEEP WHIR GYVE ** -** :phase has been set to 'typer'. ** -** scala.tools.nsc._ has been imported ** -** global._, definitions._ also imported ** -** Try :help, :vals, power.<tab> ** +Power mode enabled. :phase is at typer. +import scala.tools.nsc._, intp.global._, definitions._ +Try :help or completions for vals._ and power._ scala> val u = rootMirror.universe; import u._, language._ u: $r.intp.global.type = <global> diff --git a/test/files/run/t6439.check b/test/files/run/t6439.check index eee2da1b12..dd7ba9f81d 100644 --- a/test/files/run/t6439.check +++ b/test/files/run/t6439.check @@ -48,11 +48,9 @@ scala> type F = Int // no warn defined type alias F scala> :power -** Power User mode enabled - BEEP WHIR GYVE ** -** :phase has been set to 'typer'. ** -** scala.tools.nsc._ has been imported ** -** global._, definitions._ also imported ** -** Try :help, :vals, power.<tab> ** +Power mode enabled. :phase is at typer. +import scala.tools.nsc._, intp.global._, definitions._ +Try :help or completions for vals._ and power._ scala> object lookup { import intp._ diff --git a/test/files/run/t7246.check b/test/files/run/t7246.check index ce01362503..ce01362503 100755..100644 --- a/test/files/run/t7246.check +++ b/test/files/run/t7246.check diff --git a/test/files/run/t7246/Outer.java b/test/files/run/t7246/Outer.java index 163276fb3b..163276fb3b 100755..100644 --- a/test/files/run/t7246/Outer.java +++ b/test/files/run/t7246/Outer.java diff --git a/test/files/run/t7246/Test.scala b/test/files/run/t7246/Test.scala index 9f23ca8f3a..9f23ca8f3a 100755..100644 --- a/test/files/run/t7246/Test.scala +++ b/test/files/run/t7246/Test.scala diff --git a/test/files/run/t7246b.check b/test/files/run/t7246b.check index 5073bd8617..5073bd8617 100755..100644 --- a/test/files/run/t7246b.check +++ b/test/files/run/t7246b.check diff --git a/test/files/run/t7246b/Base.scala b/test/files/run/t7246b/Base.scala index 4e71d3313d..4e71d3313d 100755..100644 --- a/test/files/run/t7246b/Base.scala +++ b/test/files/run/t7246b/Base.scala diff --git a/test/files/run/t7246b/Outer.java b/test/files/run/t7246b/Outer.java index 53a79316ef..53a79316ef 100755..100644 --- a/test/files/run/t7246b/Outer.java +++ b/test/files/run/t7246b/Outer.java diff --git a/test/files/run/t7246b/Test.scala b/test/files/run/t7246b/Test.scala index f0982ea8d0..f0982ea8d0 100755..100644 --- a/test/files/run/t7246b/Test.scala +++ b/test/files/run/t7246b/Test.scala diff --git a/test/files/run/t7341.flags b/test/files/run/t7341.flags index ae08446055..ae08446055 100755..100644 --- a/test/files/run/t7341.flags +++ b/test/files/run/t7341.flags diff --git a/test/files/run/t7341.scala b/test/files/run/t7341.scala index ffea7f918b..ffea7f918b 100755..100644 --- a/test/files/run/t7341.scala +++ b/test/files/run/t7341.scala diff --git a/test/files/run/t7747-repl.check b/test/files/run/t7747-repl.check index 487daf4878..d698ea668d 100644 --- a/test/files/run/t7747-repl.check +++ b/test/files/run/t7747-repl.check @@ -295,11 +295,9 @@ scala> b(a) res4: String = Found Sum scala> :power -** Power User mode enabled - BEEP WHIR GYVE ** -** :phase has been set to 'typer'. ** -** scala.tools.nsc._ has been imported ** -** global._, definitions._ also imported ** -** Try :help, :vals, power.<tab> ** +Power mode enabled. :phase is at typer. +import scala.tools.nsc._, intp.global._, definitions._ +Try :help or completions for vals._ and power._ scala> intp.lastRequest res5: $r.intp.Request = Request(line=def $ires3 = intp.global, 1 trees) diff --git a/test/files/run/tpeCache-tyconCache.check b/test/files/run/tpeCache-tyconCache.check index ac13d32f91..b26f1ab8a1 100644 --- a/test/files/run/tpeCache-tyconCache.check +++ b/test/files/run/tpeCache-tyconCache.check @@ -1,10 +1,8 @@ scala> :power -** Power User mode enabled - BEEP WHIR GYVE ** -** :phase has been set to 'typer'. ** -** scala.tools.nsc._ has been imported ** -** global._, definitions._ also imported ** -** Try :help, :vals, power.<tab> ** +Power mode enabled. :phase is at typer. +import scala.tools.nsc._, intp.global._, definitions._ +Try :help or completions for vals._ and power._ scala> diff --git a/test/files/run/viewtest.scala b/test/files/run/viewtest.scala index 581958e9a6..581958e9a6 100755..100644 --- a/test/files/run/viewtest.scala +++ b/test/files/run/viewtest.scala diff --git a/test/files/run/weakconform.scala b/test/files/run/weakconform.scala index 30a12b9298..30a12b9298 100755..100644 --- a/test/files/run/weakconform.scala +++ b/test/files/run/weakconform.scala |