summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorAleksandar Prokopec <axel22@gmail.com>2012-08-27 16:03:59 +0200
committerAleksandar Prokopec <axel22@gmail.com>2012-08-27 17:15:39 +0200
commit373f22a2022519ab894c1ea77460e6460d7c2ee4 (patch)
tree54a77d2414cfa80b6a3e878acb06b1b6526887f5 /test/files/run
parent5bdfddefd7ff13476185b67d869a92c6c9f94506 (diff)
downloadscala-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/run')
-rw-r--r--test/files/run/static-annot-repl.check12
1 files changed, 9 insertions, 3 deletions
diff --git a/test/files/run/static-annot-repl.check b/test/files/run/static-annot-repl.check
index d1029a9809..3a1532b823 100644
--- a/test/files/run/static-annot-repl.check
+++ b/test/files/run/static-annot-repl.check
@@ -13,7 +13,9 @@ scala> @static val x2 = 43
x2: Int = 43
scala> @static def x3 = 44
-x3: Int
+<console>:8: error: The @static annotation is not allowed on method definitions.
+ @static def x3 = 44
+ ^
scala> x1
res0: Int = 42
@@ -22,11 +24,15 @@ scala> x2
res1: Int = 43
scala> x3
-res2: Int = 44
+<console>:9: error: not found: value x3
+ x3
+ ^
scala> class Test {
@static def x = 42
}
-defined class Test
+<console>:9: error: The @static annotation is not allowed on method definitions.
+ @static def x = 42
+ ^
scala> \ No newline at end of file