From e609f1f20b0dce4905271b92aebd0298c7862859 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sat, 5 Oct 2013 16:46:46 -0700 Subject: 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. --- test/files/neg/t3653.check | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/files/neg/t3653.check') diff --git a/test/files/neg/t3653.check b/test/files/neg/t3653.check index ac6e2ca9dc..ad68e29fb4 100644 --- a/test/files/neg/t3653.check +++ b/test/files/neg/t3653.check @@ -1,7 +1,7 @@ t3653.scala:3: error: double definition: -method x:(implicit x: Int)Int and -method x:(i: Int)Int at line 2 -have same type after erasure: (x: Int)Int +def x(i: Int): Int at line 2 and +def x(implicit x: Int): Int at line 3 +have same type after erasure: (i: Int)Int def x(implicit x: Int) = 5 ^ one error found -- cgit v1.2.3