summaryrefslogtreecommitdiff
path: root/test/files/run
diff options
context:
space:
mode:
authorJosh Suereth <Joshua.Suereth@gmail.com>2012-09-01 09:05:37 -0700
committerJosh Suereth <Joshua.Suereth@gmail.com>2012-09-01 09:05:37 -0700
commitf275cff8ddb75fd041b040a6f5c1e019a43a2bff (patch)
treeb6f7054d05a86ed05f2f1c305f3dfc7b8ae246e4 /test/files/run
parentc4d81e1e2de3c9724cce32dee4345298d46ef1cc (diff)
parent373f22a2022519ab894c1ea77460e6460d7c2ee4 (diff)
downloadscala-f275cff8ddb75fd041b040a6f5c1e019a43a2bff.tar.gz
scala-f275cff8ddb75fd041b040a6f5c1e019a43a2bff.tar.bz2
scala-f275cff8ddb75fd041b040a6f5c1e019a43a2bff.zip
Merge pull request #1201 from axel22/issue/4581
Fix SI-4581.
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