From 585069c0b65070d5fef0a58e455ad0ffe4390215 Mon Sep 17 00:00:00 2001 From: Grzegorz Kossakowski Date: Fri, 14 Sep 2012 10:45:46 +0200 Subject: Revert "WIP add private/lazy checks and a few tests." This reverts commit 227239018b38ab7218ee6b30493c9c8e1836c8c9. --- test/files/neg/static-annot.check | 11 +---------- test/files/neg/static-annot.scala | 14 -------------- 2 files changed, 1 insertion(+), 24 deletions(-) (limited to 'test/files/neg') diff --git a/test/files/neg/static-annot.check b/test/files/neg/static-annot.check index 66efebdcee..80aebcd406 100644 --- a/test/files/neg/static-annot.check +++ b/test/files/neg/static-annot.check @@ -4,16 +4,7 @@ static-annot.scala:8: error: Only members of top-level objects and their nested static-annot.scala:27: error: @static annotated field bar has the same name as a member of class Conflicting @static val bar = 1 ^ -static-annot.scala:37: error: The @static annotation is only allowed on public members. - @static private val bar = 1 - ^ -static-annot.scala:38: error: The @static annotation is only allowed on public members. - @static private val baz = 2 - ^ -static-annot.scala:39: error: The @static annotation is not allowed on lazy members. - @static lazy val bam = 3 - ^ static-annot.scala:14: error: Only members of top-level objects and their nested objects can be annotated with @static. @static val blah = 2 ^ -6 errors found \ No newline at end of file +three errors found \ No newline at end of file diff --git a/test/files/neg/static-annot.scala b/test/files/neg/static-annot.scala index c6c626d42b..b8c4651076 100644 --- a/test/files/neg/static-annot.scala +++ b/test/files/neg/static-annot.scala @@ -31,17 +31,3 @@ object Conflicting { class Conflicting { val bar = 45 } - - -object PrivateProtectedLazy { - @static private val bar = 1 - @static private val baz = 2 - @static lazy val bam = 3 -} - - -class PrivateProtectedLazy { - println(PrivateProtectedLazy.bar) - println(PrivateProtectedLazy.baz) - println(PrivateProtectedLazy.bam) -} -- cgit v1.2.3