summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-12-20 01:40:10 -0800
committerPaul Phillips <paulp@improving.org>2012-12-20 01:40:10 -0800
commite78473e3e84aab88c3839c7d6828f2a1395a7968 (patch)
tree28b28efb7b660f1c09ea0a02937b6ff0e466cfc5
parentfc82bc69f1553f0b8def4a50240052366b37b411 (diff)
parentb53c35c0660527a978dc44ea49fd66766e1a126d (diff)
downloadscala-e78473e3e84aab88c3839c7d6828f2a1395a7968.tar.gz
scala-e78473e3e84aab88c3839c7d6828f2a1395a7968.tar.bz2
scala-e78473e3e84aab88c3839c7d6828f2a1395a7968.zip
Merge pull request #1788 from retronym/ticket/6848
Implicit vars should have non-implicit setters.
-rw-r--r--src/reflect/scala/reflect/internal/Flags.scala2
-rw-r--r--test/files/pos/setter-not-implicit.flags1
-rw-r--r--test/files/pos/setter-not-implicit.scala3
3 files changed, 5 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Flags.scala b/src/reflect/scala/reflect/internal/Flags.scala
index 30dd9c3e49..a0362c8921 100644
--- a/src/reflect/scala/reflect/internal/Flags.scala
+++ b/src/reflect/scala/reflect/internal/Flags.scala
@@ -262,7 +262,7 @@ class Flags extends ModifierFlags {
* Getters of immutable values also get STABLE.
*/
final val GetterFlags = ~(PRESUPER | MUTABLE)
- final val SetterFlags = ~(PRESUPER | MUTABLE | STABLE | CASEACCESSOR)
+ final val SetterFlags = ~(PRESUPER | MUTABLE | STABLE | CASEACCESSOR | IMPLICIT)
/** When a symbol for a default getter is created, it inherits these
* flags from the method with the default. Other flags applied at creation
diff --git a/test/files/pos/setter-not-implicit.flags b/test/files/pos/setter-not-implicit.flags
new file mode 100644
index 0000000000..792c40565b
--- /dev/null
+++ b/test/files/pos/setter-not-implicit.flags
@@ -0,0 +1 @@
+-feature -Xfatal-warnings \ No newline at end of file
diff --git a/test/files/pos/setter-not-implicit.scala b/test/files/pos/setter-not-implicit.scala
new file mode 100644
index 0000000000..9bfffc2ceb
--- /dev/null
+++ b/test/files/pos/setter-not-implicit.scala
@@ -0,0 +1,3 @@
+object O {
+ implicit var x: Int = 0
+}