summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2010-12-08 06:07:27 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2010-12-08 06:07:27 +0000
commit6e15632fcbcb8578b30850ee93b3d3d8c9f3e7b9 (patch)
treecdf601a76c953bd0ed77b02cd62a2baaa67267b5 /test
parent9a7e511b3e851eba9e8cd7a422d21af9b8023204 (diff)
downloadscala-6e15632fcbcb8578b30850ee93b3d3d8c9f3e7b9.tar.gz
scala-6e15632fcbcb8578b30850ee93b3d3d8c9f3e7b9.tar.bz2
scala-6e15632fcbcb8578b30850ee93b3d3d8c9f3e7b9.zip
again: relax access boundry check for overridin...
again: relax access boundry check for overriding protected java members. review by eugenevigdorchik.
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t3946.check5
-rw-r--r--test/files/neg/t3946/J.java4
-rw-r--r--test/files/neg/t3946/S_1.scala4
-rw-r--r--test/files/pos/t3946/A.java5
-rw-r--r--test/files/pos/t3946/Test_1.scala12
5 files changed, 17 insertions, 13 deletions
diff --git a/test/files/neg/t3946.check b/test/files/neg/t3946.check
deleted file mode 100644
index 6379b50dba..0000000000
--- a/test/files/neg/t3946.check
+++ /dev/null
@@ -1,5 +0,0 @@
-S_1.scala:3: error: overriding method m in class J of type ()Unit;
- method m has weaker access privileges; it should be at least protected[p]
- override protected def m { }
- ^
-one error found
diff --git a/test/files/neg/t3946/J.java b/test/files/neg/t3946/J.java
deleted file mode 100644
index 189b8e1d23..0000000000
--- a/test/files/neg/t3946/J.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package p;
-public class J {
- protected void m() { return; }
-}
diff --git a/test/files/neg/t3946/S_1.scala b/test/files/neg/t3946/S_1.scala
deleted file mode 100644
index 2c52094701..0000000000
--- a/test/files/neg/t3946/S_1.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-package p
-class S extends J {
- override protected def m { }
-}
diff --git a/test/files/pos/t3946/A.java b/test/files/pos/t3946/A.java
new file mode 100644
index 0000000000..70265229df
--- /dev/null
+++ b/test/files/pos/t3946/A.java
@@ -0,0 +1,5 @@
+package p;
+
+public class A {
+ protected void f() {}
+}
diff --git a/test/files/pos/t3946/Test_1.scala b/test/files/pos/t3946/Test_1.scala
new file mode 100644
index 0000000000..0cceff3aab
--- /dev/null
+++ b/test/files/pos/t3946/Test_1.scala
@@ -0,0 +1,12 @@
+package q {
+ class B extends p.A {
+ override protected def f() { }
+ }
+}
+
+package p {
+ object T {
+ val a = new A()
+ a.f()
+ }
+}