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 /src/reflect/scala/reflect/internal/Symbols.scala | |
| 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 'src/reflect/scala/reflect/internal/Symbols.scala')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index 14d742fc2c..efdc8f7435 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -3471,8 +3471,8 @@ trait Symbols extends api.Symbols { self: SymbolTable => assert((prev eq null) || phaseId(validFrom) > phaseId(prev.validFrom), this) assert(validFrom != NoPeriod, this) - override def toString() = - "TypeHistory(" + phaseOf(validFrom)+":"+runId(validFrom) + "," + info + "," + prev + ")" + private def phaseString = "%s: %s".format(phaseOf(validFrom), info) + override def toString = toList reverseMap (_.phaseString) mkString ", " def toList: List[TypeHistory] = this :: ( if (prev eq null) Nil else prev.toList ) |