diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-09-14 10:45:43 +0200 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-09-17 20:26:08 +0200 |
commit | 6b9e1a0747159128da1e84795c1be6698e16ee43 (patch) | |
tree | 78922e7ef36a25cbdd473f2f5e44986ed9727a36 /test/files | |
parent | 6854842cf88f020289b783983d13ebef4d7605f4 (diff) | |
download | scala-6b9e1a0747159128da1e84795c1be6698e16ee43.tar.gz scala-6b9e1a0747159128da1e84795c1be6698e16ee43.tar.bz2 scala-6b9e1a0747159128da1e84795c1be6698e16ee43.zip |
Revert "Fixes SI-6189."
This reverts commit 5a8dfad583b825158cf0abdae5d73a4a7f8cd997.
Conflicts:
src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/neg/static-annot.scala | 6 | ||||
-rw-r--r-- | test/files/run/static-annot-repl.check | 32 | ||||
-rw-r--r-- | test/files/run/static-annot-repl.scala | 22 |
3 files changed, 0 insertions, 60 deletions
diff --git a/test/files/neg/static-annot.scala b/test/files/neg/static-annot.scala index c0b5ed30d8..c6c626d42b 100644 --- a/test/files/neg/static-annot.scala +++ b/test/files/neg/static-annot.scala @@ -45,9 +45,3 @@ class PrivateProtectedLazy { println(PrivateProtectedLazy.baz) println(PrivateProtectedLazy.bam) } - - -class StaticDef { - // this should not crash the compiler - @static def x = 42 -} diff --git a/test/files/run/static-annot-repl.check b/test/files/run/static-annot-repl.check deleted file mode 100644 index d1029a9809..0000000000 --- a/test/files/run/static-annot-repl.check +++ /dev/null @@ -1,32 +0,0 @@ -Type in expressions to have them evaluated. -Type :help for more information. - -scala> - -scala> import annotation.static -import annotation.static - -scala> @static var x1 = 42 -x1: Int = 42 - -scala> @static val x2 = 43 -x2: Int = 43 - -scala> @static def x3 = 44 -x3: Int - -scala> x1 -res0: Int = 42 - -scala> x2 -res1: Int = 43 - -scala> x3 -res2: Int = 44 - -scala> class Test { - @static def x = 42 -} -defined class Test - -scala>
\ No newline at end of file diff --git a/test/files/run/static-annot-repl.scala b/test/files/run/static-annot-repl.scala deleted file mode 100644 index 1d2e9b2d7e..0000000000 --- a/test/files/run/static-annot-repl.scala +++ /dev/null @@ -1,22 +0,0 @@ - - - -import scala.tools.partest.ReplTest - - - -object Test extends ReplTest { - def code = """ -import annotation.static -@static var x1 = 42 -@static val x2 = 43 -@static def x3 = 44 -x1 -x2 -x3 -class Test { - @static def x = 42 -} -""" - -} |