summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-10-08 15:32:52 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-10-08 15:32:52 +0000
commitbd46c931f0fba3a9bee8816a7b2fb77ed33bc361 (patch)
treeefef9c3b5c5e59e7d8d42bb2b6e22adac94d13f5 /test/files
parent29a8a8f77998b640f5083e87cd735301dd63922a (diff)
downloadscala-bd46c931f0fba3a9bee8816a7b2fb77ed33bc361.tar.gz
scala-bd46c931f0fba3a9bee8816a7b2fb77ed33bc361.tar.bz2
scala-bd46c931f0fba3a9bee8816a7b2fb77ed33bc361.zip
Fix for #547 and #1404.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/interpreter.check9
-rw-r--r--test/files/run/interpreter.scala6
2 files changed, 15 insertions, 0 deletions
diff --git a/test/files/run/interpreter.check b/test/files/run/interpreter.check
index ef8de4dc97..64eeca14ba 100644
--- a/test/files/run/interpreter.check
+++ b/test/files/run/interpreter.check
@@ -34,6 +34,15 @@ scala> hello
scala>
scala>
+scala> atom: scala.xml.Atom[Unit] = ()
+
+scala>
+scala> defined class S
+
+scala> fish: S = fish
+
+scala>
+scala>
scala> defined class Foo
scala> defined class Bar
diff --git a/test/files/run/interpreter.scala b/test/files/run/interpreter.scala
index 13abc565f7..1ebe72ed2a 100644
--- a/test/files/run/interpreter.scala
+++ b/test/files/run/interpreter.scala
@@ -22,6 +22,12 @@ trait PointlessTrait
val (x,y) = (2,3)
println("hello")
+// ambiguous toString problem from #547
+val atom = new scala.xml.Atom()
+// overriding toString problem from #1404
+class S(override val toString : String)
+val fish = new S("fish")
+
// implicit conversions
case class Foo(n: Int)
case class Bar(n: Int)