summaryrefslogtreecommitdiff
path: root/test/files/neg/lazy-override.check
diff options
context:
space:
mode:
authorAntonio Cunei <antonio.cunei@epfl.ch>2008-11-25 18:05:48 +0000
committerAntonio Cunei <antonio.cunei@epfl.ch>2008-11-25 18:05:48 +0000
commitaf47e5b433ea538bf096a176c88f3c91116e09cd (patch)
treeb3e66e93fb653570ebbef16183cf4f2be2111c12 /test/files/neg/lazy-override.check
parent2d61f09332dbc6038f869c6a23a95dca1bc3b6c7 (diff)
downloadscala-af47e5b433ea538bf096a176c88f3c91116e09cd.tar.gz
scala-af47e5b433ea538bf096a176c88f3c91116e09cd.tar.bz2
scala-af47e5b433ea538bf096a176c88f3c91116e09cd.zip
Merging everything from the 2.8.x development b...
Merging everything from the 2.8.x development branch back to trunk. - If you were working on trunk, please keep working on trunk If you were - working on 2.8-devel, please switch to trunk now
Diffstat (limited to 'test/files/neg/lazy-override.check')
-rw-r--r--test/files/neg/lazy-override.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/lazy-override.check b/test/files/neg/lazy-override.check
index d1c9d305f0..793e6b2020 100644
--- a/test/files/neg/lazy-override.check
+++ b/test/files/neg/lazy-override.check
@@ -1,8 +1,8 @@
-lazy-override.scala:11: error: error overriding value x in class A of type Int;
+lazy-override.scala:11: error: overriding value x in class A of type Int;
lazy value x cannot override a concrete non-lazy value
override lazy val x: Int = { print("/*B.x*/"); 3 }
^
-lazy-override.scala:13: error: error overriding lazy value y in class A of type Int;
+lazy-override.scala:13: error: overriding lazy value y in class A of type Int;
value y must be declared lazy to override a concrete lazy value
override val y: Int = { print("/*B.y*/"); 3 }
^