diff options
| author | Paul Phillips <paulp@improving.org> | 2013-10-05 16:46:46 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-10-05 16:46:46 -0700 |
| commit | e609f1f20b0dce4905271b92aebd0298c7862859 (patch) | |
| tree | 70575372a93261f656805ab9f709f967f24f38b6 /test/files/res | |
| parent | 90a312669b37d6e3e3f08685953ded24759e6102 (diff) | |
| download | scala-e609f1f20b0dce4905271b92aebd0298c7862859.tar.gz scala-e609f1f20b0dce4905271b92aebd0298c7862859.tar.bz2 scala-e609f1f20b0dce4905271b92aebd0298c7862859.zip | |
Generalize OverridingPairs to SymbolPairs.
Increases your chance of knowing what is going on in
OverridingPairs. Introduces some new abstractions which I
hope for your own sakes you will put to use in some way:
RelativeTo: operations relative to a prefix
SymbolPair: two symbols being compared for something, and
the enclosing class where the comparison is being performed
Fixed a minor bug with access by accident by way of more
principled pair analysis. See run/private-override.scala.
Upgraded the error message issued on certain conflicts
to give the line numbers of both conflicting methods, as
opposed to just one and you go hunting.
Diffstat (limited to 'test/files/res')
| -rw-r--r-- | test/files/res/t687.check | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/res/t687.check b/test/files/res/t687.check index b741b262b9..5f72c98636 100644 --- a/test/files/res/t687.check +++ b/test/files/res/t687.check @@ -1,8 +1,8 @@ nsc> nsc> t687/QueryB.scala:3: error: name clash between defined and inherited member: -method equals:(o: Object)Boolean and -method equals:(x$1: Any)Boolean in class Any -have same type after erasure: (o: Object)Boolean +def equals(x$1: Any): Boolean in class Any and +override def equals(o: Object): Boolean at line 3 +have same type after erasure: (x$1: Object)Boolean override def equals(o : Object) = false; ^ |