diff options
author | Aleksandar Prokopec <axel22@gmail.com> | 2012-08-27 16:03:59 +0200 |
---|---|---|
committer | Aleksandar Prokopec <axel22@gmail.com> | 2012-08-27 17:15:39 +0200 |
commit | 373f22a2022519ab894c1ea77460e6460d7c2ee4 (patch) | |
tree | 54a77d2414cfa80b6a3e878acb06b1b6526887f5 /test/files/neg | |
parent | 5bdfddefd7ff13476185b67d869a92c6c9f94506 (diff) | |
download | scala-373f22a2022519ab894c1ea77460e6460d7c2ee4.tar.gz scala-373f22a2022519ab894c1ea77460e6460d7c2ee4.tar.bz2 scala-373f22a2022519ab894c1ea77460e6460d7c2ee4.zip |
Fix SI-4581.
Specifically, the final flag on the generated static field
is no longer ommitted.
Fix 2 failing test-cases.
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/static-annot.check | 5 | ||||
-rw-r--r-- | test/files/neg/t4581.check | 0 | ||||
-rw-r--r-- | test/files/neg/t4581/static-declaration_1.scala | 14 | ||||
-rw-r--r-- | test/files/neg/t4581/static_2.java | 15 |
4 files changed, 33 insertions, 1 deletions
diff --git a/test/files/neg/static-annot.check b/test/files/neg/static-annot.check index 66efebdcee..c98e7d9658 100644 --- a/test/files/neg/static-annot.check +++ b/test/files/neg/static-annot.check @@ -13,7 +13,10 @@ static-annot.scala:38: error: The @static annotation is only allowed on public m static-annot.scala:39: error: The @static annotation is not allowed on lazy members. @static lazy val bam = 3 ^ +static-annot.scala:52: error: The @static annotation is not allowed on method definitions. + @static def x = 42 + ^ 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 +7 errors found diff --git a/test/files/neg/t4581.check b/test/files/neg/t4581.check new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/files/neg/t4581.check diff --git a/test/files/neg/t4581/static-declaration_1.scala b/test/files/neg/t4581/static-declaration_1.scala new file mode 100644 index 0000000000..f9a66b29c1 --- /dev/null +++ b/test/files/neg/t4581/static-declaration_1.scala @@ -0,0 +1,14 @@ + + + + + +object Constants { + import scala.annotation.static + @static val Const: Int = 0 // should generate a static final field + @static final val FinalConst: Int = 0 // ditto + @static var MutableField: Int = 0 // should not be final +} + + + diff --git a/test/files/neg/t4581/static_2.java b/test/files/neg/t4581/static_2.java new file mode 100644 index 0000000000..2fd5bf1d82 --- /dev/null +++ b/test/files/neg/t4581/static_2.java @@ -0,0 +1,15 @@ + + + + +public class static_2 { + public static void main(String[] args) { + Constants.Const = 17; + Constants.FinalConst = 99; + Constants.MutableField = 199; + } +} + + + + |