From 5a8dfad583b825158cf0abdae5d73a4a7f8cd997 Mon Sep 17 00:00:00 2001
From: Aleksandar Prokopec <axel22@gmail.com>
Date: Tue, 14 Aug 2012 18:00:23 +0200
Subject: Fixes SI-6189.

Disable @static for the REPL code.
The problem is that there are no companion classes generated for objects
that contain the top-level declarations in the REPL.
When there is no companion class, the selecting a @static field will translate
to a getter call, instead of to a field load.
---
 test/files/neg/static-annot.scala      |  6 ++++++
 test/files/run/static-annot-repl.check | 32 ++++++++++++++++++++++++++++++++
 test/files/run/static-annot-repl.scala | 22 ++++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 test/files/run/static-annot-repl.check
 create mode 100644 test/files/run/static-annot-repl.scala

(limited to 'test/files')

diff --git a/test/files/neg/static-annot.scala b/test/files/neg/static-annot.scala
index c6c626d42b..c0b5ed30d8 100644
--- a/test/files/neg/static-annot.scala
+++ b/test/files/neg/static-annot.scala
@@ -45,3 +45,9 @@ 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
new file mode 100644
index 0000000000..d1029a9809
--- /dev/null
+++ b/test/files/run/static-annot-repl.check
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 0000000000..1d2e9b2d7e
--- /dev/null
+++ b/test/files/run/static-annot-repl.scala
@@ -0,0 +1,22 @@
+
+
+
+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
+}
+"""
+
+}
-- 
cgit v1.2.3