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/files/run | |
| 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/files/run')
| -rw-r--r-- | test/files/run/t2296a.check | 2 | ||||
| -rw-r--r-- | test/files/run/t2296a/J.java | 7 | ||||
| -rw-r--r-- | test/files/run/t2296a/S.scala | 18 | ||||
| -rw-r--r-- | test/files/run/t2296b.check | 2 | ||||
| -rw-r--r-- | test/files/run/t2296b/J_1.java | 7 | ||||
| -rw-r--r-- | test/files/run/t2296b/S_2.scala | 18 |
6 files changed, 0 insertions, 54 deletions
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/t2296a/J.java b/test/files/run/t2296a/J.java deleted file mode 100644 index 78ff3e9804..0000000000 --- a/test/files/run/t2296a/J.java +++ /dev/null @@ -1,7 +0,0 @@ -package j; - -public class J { - protected void foo() { - System.out.println("J.foo()"); - } -}
\ No newline at end of file diff --git a/test/files/run/t2296a/S.scala b/test/files/run/t2296a/S.scala deleted file mode 100644 index 532d038a42..0000000000 --- a/test/files/run/t2296a/S.scala +++ /dev/null @@ -1,18 +0,0 @@ -package s { - import j.J - - trait S extends J { - def bar() { - foo() - } - } - - class SC extends J with S -} - -object Test { - def main(args : Array[String]) { - (new s.SC).bar() - (new s.S { }).bar() - } -}
\ No newline at end of file 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() diff --git a/test/files/run/t2296b/J_1.java b/test/files/run/t2296b/J_1.java deleted file mode 100644 index 4c91d47073..0000000000 --- a/test/files/run/t2296b/J_1.java +++ /dev/null @@ -1,7 +0,0 @@ -package j; - -public class J_1 { - protected void foo() { - System.out.println("J.foo()"); - } -}
\ No newline at end of file diff --git a/test/files/run/t2296b/S_2.scala b/test/files/run/t2296b/S_2.scala deleted file mode 100644 index 6cdb0cfaba..0000000000 --- a/test/files/run/t2296b/S_2.scala +++ /dev/null @@ -1,18 +0,0 @@ -package s { - import j.J_1 - - trait S extends J_1 { - def bar() { - foo() - } - } - - class SC extends J_1 with S -} - -object Test { - def main(args : Array[String]) { - (new s.SC).bar() - (new s.S { }).bar() - } -} |