summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/Global.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-10-05 16:46:46 -0700
committerPaul Phillips <paulp@improving.org>2013-10-05 16:46:46 -0700
commite609f1f20b0dce4905271b92aebd0298c7862859 (patch)
tree70575372a93261f656805ab9f709f967f24f38b6 /src/compiler/scala/tools/nsc/Global.scala
parent90a312669b37d6e3e3f08685953ded24759e6102 (diff)
downloadscala-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 'src/compiler/scala/tools/nsc/Global.scala')
-rw-r--r--src/compiler/scala/tools/nsc/Global.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 92bfe6e0fe..1cd3e0ec4b 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -135,6 +135,8 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
val global: Global.this.type = Global.this
} with OverridingPairs
+ type SymbolPair = overridingPairs.SymbolPair
+
// Optimizer components
/** ICode analysis for optimization */