diff options
| author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-09-02 11:59:38 +0000 |
|---|---|---|
| committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-09-02 11:59:38 +0000 |
| commit | c51f9f392fa1603e4d2b692bdcca9ffac3710539 (patch) | |
| tree | 465b73d07033ac6e21bd6f73b233dc41c12d7205 /test | |
| parent | 918fb944b611ee08b5f5596c2fbc5123d2f09917 (diff) | |
| download | scala-c51f9f392fa1603e4d2b692bdcca9ffac3710539.tar.gz scala-c51f9f392fa1603e4d2b692bdcca9ffac3710539.tar.bz2 scala-c51f9f392fa1603e4d2b692bdcca9ffac3710539.zip | |
Merged revisions 22802-22803 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r22802 | moors | 2010-08-20 12:01:09 +0200 (Fri, 20 Aug 2010) | 6 lines
closes #3575. stricter override checking for java members with default
access: can only override such a member from the same package
cloneSymbol now preserves privateWithin -- need to reset it explicitly now when before it was assumed to be not to be carried over
rewrote accessibility in overriding checks so they're more readable,
but hopefully with same semantics
review by odersky
........
r22803 | moors | 2010-08-20 13:32:45 +0200 (Fri, 20 Aug 2010) | 2 lines
closes #3757. got paren wrong during refactoring. no review ........
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/neg/t3757.check | 4 | ||||
| -rw-r--r-- | test/files/neg/t3757/A.java | 5 | ||||
| -rw-r--r-- | test/files/neg/t3757/B.scala | 5 |
3 files changed, 14 insertions, 0 deletions
diff --git a/test/files/neg/t3757.check b/test/files/neg/t3757.check new file mode 100644 index 0000000000..1507df8c4f --- /dev/null +++ b/test/files/neg/t3757.check @@ -0,0 +1,4 @@ +B.scala:4: error: method foo overrides nothing + override def foo = "B" + ^ +one error found diff --git a/test/files/neg/t3757/A.java b/test/files/neg/t3757/A.java new file mode 100644 index 0000000000..37da86fe15 --- /dev/null +++ b/test/files/neg/t3757/A.java @@ -0,0 +1,5 @@ +package a; + +public abstract class A { + abstract String foo(); // package protected! +}
\ No newline at end of file diff --git a/test/files/neg/t3757/B.scala b/test/files/neg/t3757/B.scala new file mode 100644 index 0000000000..7c78fb634e --- /dev/null +++ b/test/files/neg/t3757/B.scala @@ -0,0 +1,5 @@ +package b + +class B extends a.A { + override def foo = "B" +}
\ No newline at end of file |