diff options
author | Paul Phillips <paulp@improving.org> | 2013-03-12 19:11:24 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-03-12 19:11:24 -0700 |
commit | ccd1bc082630a3c4b4cfe2e64689b9e316ad8714 (patch) | |
tree | d75200b511d2717195aa5c4f42c4076c5f9fbf5b /test/files/run | |
parent | 52adf130409df57fd612a119e352345cf1c93979 (diff) | |
parent | eb365f9158f29c61410affde21c8f3cd0c6db08f (diff) | |
download | scala-ccd1bc082630a3c4b4cfe2e64689b9e316ad8714.tar.gz scala-ccd1bc082630a3c4b4cfe2e64689b9e316ad8714.tar.bz2 scala-ccd1bc082630a3c4b4cfe2e64689b9e316ad8714.zip |
Merge pull request #2227 from mergeconflict/2.10.x-SI-7132
SI-7132 - don't discard Unit type in interpreter
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/repl-colon-type.check | 21 | ||||
-rw-r--r-- | test/files/run/repl-colon-type.scala | 4 |
2 files changed, 15 insertions, 10 deletions
diff --git a/test/files/run/repl-colon-type.check b/test/files/run/repl-colon-type.check index 56ddd74375..0cb18e989a 100644 --- a/test/files/run/repl-colon-type.check +++ b/test/files/run/repl-colon-type.check @@ -4,12 +4,6 @@ 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] - ^ -<console>:3: error: ']' expected but '}' found. - } - ^ <console>:1: error: identifier expected but integer literal found. List[1, 2, 3] ^ @@ -45,12 +39,9 @@ scala> :type lazy val f = 5 Int scala> :type protected lazy val f = 5 -<console>:2: error: illegal start of statement (no modifiers allowed here) - protected lazy val f = 5 - ^ <console>:5: error: lazy value f cannot be accessed in object $iw Access to protected value f not permitted because - enclosing object $eval in package $line19 is not a subclass of + enclosing object $eval in package $line13 is not a subclass of object $iw where target is defined lazy val $result = `f` ^ @@ -223,4 +214,14 @@ PolyType( scala> +scala> // SI-7132 - :type doesn't understand Unit + +scala> :type () +Unit + +scala> :type println("side effect!") +Unit + +scala> + scala> diff --git a/test/files/run/repl-colon-type.scala b/test/files/run/repl-colon-type.scala index c055b215c2..8cf81a6afe 100644 --- a/test/files/run/repl-colon-type.scala +++ b/test/files/run/repl-colon-type.scala @@ -26,6 +26,10 @@ object Test extends ReplTest { |:type -v Nil.combinations _ |:type -v def f[T <: AnyVal] = List[T]().combinations _ |:type -v def f[T, U >: T](x: T, y: List[U]) = x :: y + | + |// SI-7132 - :type doesn't understand Unit + |:type () + |:type println("side effect!") """.stripMargin } |