diff options
author | Paul Phillips <paulp@improving.org> | 2011-05-29 21:30:29 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2011-05-29 21:30:29 +0000 |
commit | a8926ae0b28d606e240f409adca69f1d91f45990 (patch) | |
tree | d33af8c263ca170a4440d3f4005f69f0916b5b14 /test/files | |
parent | 4c7d23b470b71e730024d1f7797f742dc97207fa (diff) | |
download | scala-a8926ae0b28d606e240f409adca69f1d91f45990.tar.gz scala-a8926ae0b28d606e240f409adca69f1d91f45990.tar.bz2 scala-a8926ae0b28d606e240f409adca69f1d91f45990.zip |
Now :t types declarations as well as expression...
Now :t types declarations as well as expressions, and cleans up the
output the same way the repl does so stray unsolved type constraints
don't befuddle anyone. Closes #4391, no review.
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/run/bug4556.check | 17 | ||||
-rw-r--r-- | test/files/run/bug4556.scala | 9 | ||||
-rw-r--r-- | test/files/run/repl-colon-type.check | 57 | ||||
-rw-r--r-- | test/files/run/repl-colon-type.scala | 23 |
4 files changed, 80 insertions, 26 deletions
diff --git a/test/files/run/bug4556.check b/test/files/run/bug4556.check deleted file mode 100644 index 69d0b4fda1..0000000000 --- a/test/files/run/bug4556.check +++ /dev/null @@ -1,17 +0,0 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> :type [List(1, 2, 3)] -<console>:2: error: illegal start of simple expression - [List(1, 2, 3)] - ^ - - -scala> :type List(1, 2, 3) -List[Int] - -scala> - -scala> diff --git a/test/files/run/bug4556.scala b/test/files/run/bug4556.scala deleted file mode 100644 index 8f682ce7df..0000000000 --- a/test/files/run/bug4556.scala +++ /dev/null @@ -1,9 +0,0 @@ -import scala.tools.partest.ReplTest - -object Test extends ReplTest { - def code = """ - |:type [List(1, 2, 3)] - |:type List(1, 2, 3) - """.stripMargin -} - diff --git a/test/files/run/repl-colon-type.check b/test/files/run/repl-colon-type.check new file mode 100644 index 0000000000..66c2fcc77f --- /dev/null +++ b/test/files/run/repl-colon-type.check @@ -0,0 +1,57 @@ +Type in expressions to have them evaluated. +Type :help for more information. + +scala> + +scala> :type List[1, 2, 3] +<console>:2: error: identifier expected but integer literal found. + List[1, 2, 3] + ^ + + +scala> :type List(1, 2, 3) +List[Int] + +scala> :type def foo[T](x: T) = List(x) +[T](x: T)List[T] + +scala> :type val bar = List(Set(1)) +List[scala.collection.immutable.Set[Int]] + +scala> :type lazy val bar = Set(Set(1)) +scala.collection.immutable.Set[scala.collection.immutable.Set[Int]] + +scala> :type def f[T >: Null, U <: String](x: T, y: U) = Set(x, y) +[T >: Null, U <: String](x: T, y: U)scala.collection.immutable.Set[Any] + +scala> :type def x = 1 ; def bar[T >: Null <: AnyRef](xyz: T) = 5 +[T >: Null <: AnyRef](xyz: T)Int + +scala> + +scala> :type 5 +Int + +scala> :type val f = 5 +Int + +scala> :type lazy val f = 5 +Int + +scala> :type protected lazy val f = 5 +Int + +scala> :type def f = 5 +Int + +scala> :type def f() = 5 +()Int + +scala> + +scala> :type def g[T](xs: Set[_ <: T]) = Some(xs.head) +[T](xs: Set[_ <: T])Some[T] + +scala> + +scala> diff --git a/test/files/run/repl-colon-type.scala b/test/files/run/repl-colon-type.scala new file mode 100644 index 0000000000..39ab580d2a --- /dev/null +++ b/test/files/run/repl-colon-type.scala @@ -0,0 +1,23 @@ +import scala.tools.partest.ReplTest + +object Test extends ReplTest { + def code = """ + |:type List[1, 2, 3] + |:type List(1, 2, 3) + |:type def foo[T](x: T) = List(x) + |:type val bar = List(Set(1)) + |:type lazy val bar = Set(Set(1)) + |:type def f[T >: Null, U <: String](x: T, y: U) = Set(x, y) + |:type def x = 1 ; def bar[T >: Null <: AnyRef](xyz: T) = 5 + | + |:type 5 + |:type val f = 5 + |:type lazy val f = 5 + |:type protected lazy val f = 5 + |:type def f = 5 + |:type def f() = 5 + | + |:type def g[T](xs: Set[_ <: T]) = Some(xs.head) + """.stripMargin +} + |