diff options
| author | Paul Phillips <paulp@improving.org> | 2012-09-14 13:08:05 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-09-14 13:08:05 -0700 |
| commit | 493d16306cf0e836da9c77a4768dd42620dd1a72 (patch) | |
| tree | fee4965ed7d69ca25a888875839b2f54445e7338 /test | |
| parent | 261b1c785668ae42a29d9217cc4a8f305a724e2f (diff) | |
| parent | e498fac7fdbda3187a2a4fffcdf7fa4f9ddb7ac8 (diff) | |
| download | scala-493d16306cf0e836da9c77a4768dd42620dd1a72.tar.gz scala-493d16306cf0e836da9c77a4768dd42620dd1a72.tar.bz2 scala-493d16306cf0e836da9c77a4768dd42620dd1a72.zip | |
Merge pull request #1299 from namin/si-6245
Fix for SI-6245 with workaround for SI-2296.
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/t2296a.check | 5 | ||||
| -rw-r--r-- | test/files/neg/t2296a/J.java (renamed from test/files/run/t2296a/J.java) | 0 | ||||
| -rw-r--r-- | test/files/neg/t2296a/S.scala (renamed from test/files/run/t2296a/S.scala) | 0 | ||||
| -rw-r--r-- | test/files/neg/t2296b.check | 5 | ||||
| -rw-r--r-- | test/files/neg/t2296b/J_1.java (renamed from test/files/run/t2296b/J_1.java) | 0 | ||||
| -rw-r--r-- | test/files/neg/t2296b/S_2.scala (renamed from test/files/run/t2296b/S_2.scala) | 0 | ||||
| -rw-r--r-- | test/files/pos/t6245/Base.java | 5 | ||||
| -rw-r--r-- | test/files/pos/t6245/Foo.scala | 9 | ||||
| -rw-r--r-- | test/files/pos/t6245/Vis.java | 3 | ||||
| -rw-r--r-- | test/files/run/t2296a.check | 2 | ||||
| -rw-r--r-- | test/files/run/t2296b.check | 2 |
11 files changed, 27 insertions, 4 deletions
diff --git a/test/files/neg/t2296a.check b/test/files/neg/t2296a.check new file mode 100644 index 0000000000..863b861046 --- /dev/null +++ b/test/files/neg/t2296a.check @@ -0,0 +1,5 @@ +S.scala:6: error: Implementation restriction: trait S accesses protected method foo inside a concrete trait method. +Add an accessor in a class extending class J as a workaround. + foo() + ^ +one error found diff --git a/test/files/run/t2296a/J.java b/test/files/neg/t2296a/J.java index 78ff3e9804..78ff3e9804 100644 --- a/test/files/run/t2296a/J.java +++ b/test/files/neg/t2296a/J.java diff --git a/test/files/run/t2296a/S.scala b/test/files/neg/t2296a/S.scala index 532d038a42..532d038a42 100644 --- a/test/files/run/t2296a/S.scala +++ b/test/files/neg/t2296a/S.scala diff --git a/test/files/neg/t2296b.check b/test/files/neg/t2296b.check new file mode 100644 index 0000000000..07cc54d573 --- /dev/null +++ b/test/files/neg/t2296b.check @@ -0,0 +1,5 @@ +S_2.scala:6: error: Implementation restriction: trait S accesses protected method foo inside a concrete trait method. +Add an accessor in a class extending class J_1 as a workaround. + foo() + ^ +one error found diff --git a/test/files/run/t2296b/J_1.java b/test/files/neg/t2296b/J_1.java index 4c91d47073..4c91d47073 100644 --- a/test/files/run/t2296b/J_1.java +++ b/test/files/neg/t2296b/J_1.java diff --git a/test/files/run/t2296b/S_2.scala b/test/files/neg/t2296b/S_2.scala index 6cdb0cfaba..6cdb0cfaba 100644 --- a/test/files/run/t2296b/S_2.scala +++ b/test/files/neg/t2296b/S_2.scala diff --git a/test/files/pos/t6245/Base.java b/test/files/pos/t6245/Base.java new file mode 100644 index 0000000000..651ea08bf2 --- /dev/null +++ b/test/files/pos/t6245/Base.java @@ -0,0 +1,5 @@ +package t1; + +public class Base { + protected Vis inner; +} diff --git a/test/files/pos/t6245/Foo.scala b/test/files/pos/t6245/Foo.scala new file mode 100644 index 0000000000..f5f997fbff --- /dev/null +++ b/test/files/pos/t6245/Foo.scala @@ -0,0 +1,9 @@ +import t1.Vis + +abstract class Foo extends t1.Base { + trait Nested { + def crash() { + inner + } + } +} diff --git a/test/files/pos/t6245/Vis.java b/test/files/pos/t6245/Vis.java new file mode 100644 index 0000000000..4267f4e40b --- /dev/null +++ b/test/files/pos/t6245/Vis.java @@ -0,0 +1,3 @@ +package t1; + +public class Vis { } diff --git a/test/files/run/t2296a.check b/test/files/run/t2296a.check deleted file mode 100644 index f75aec9d81..0000000000 --- a/test/files/run/t2296a.check +++ /dev/null @@ -1,2 +0,0 @@ -J.foo() -J.foo() diff --git a/test/files/run/t2296b.check b/test/files/run/t2296b.check deleted file mode 100644 index f75aec9d81..0000000000 --- a/test/files/run/t2296b.check +++ /dev/null @@ -1,2 +0,0 @@ -J.foo() -J.foo() |