diff options
| author | Paul Phillips <paulp@improving.org> | 2010-10-03 22:53:59 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-10-03 22:53:59 +0000 |
| commit | a03131199109b51b4a3051aa2c016d516bec6e36 (patch) | |
| tree | d4f6eb62ea09145f8a005ea85a54eb9bd3fc332d /src/library | |
| parent | 2c59afc2c15ddcd124fd175eb30c0cdf9d98463b (diff) | |
| download | scala-a03131199109b51b4a3051aa2c016d516bec6e36.tar.gz scala-a03131199109b51b4a3051aa2c016d516bec6e36.tar.bz2 scala-a03131199109b51b4a3051aa2c016d516bec6e36.zip | |
Work on the pattern matcher.
patches for #3887 and #3888, but I determined that I could achieve the
same effect by deleting a bunch of code, so I did. This left only a few
lines in TransMatch, so I eliminated it, which led me to remember that
many places still reference non-existent phase transmatch, so those were
updated. Notes:
* This swaps equality tests on stable identifier patterns. They
have never conformed to the spec (as noted long ago in ticket #785)
which says "The pattern matches any value v such that r == v" whereas
until now the test being performed was v == r.
* An issue was introduced with specialization in that the implementation
of "isTupleType" in Definitions relied upon sym == TupleClass(elems.length).
This test is untrue for specialized tuples, causing mysterious behavior
because only some tuples are specialized. There is now "isTupleTypeOrSubtype"
although it seems likely the former implementation is unnecessary.
The issue is sidestepped if one uses "getProductArgs" to retrieve the element
types because it sifts through the base types for the Product symbol.
Closes #3887 and #3888, review by dmharrah.
Diffstat (limited to 'src/library')
| -rwxr-xr-x | src/library/scala/reflect/generic/Trees.scala | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/library/scala/reflect/generic/Trees.scala b/src/library/scala/reflect/generic/Trees.scala index c880a335de..87ce15dd24 100755 --- a/src/library/scala/reflect/generic/Trees.scala +++ b/src/library/scala/reflect/generic/Trees.scala @@ -296,23 +296,23 @@ trait Trees { self: Universe => case class Block(stats: List[Tree], expr: Tree) extends TermTree - /** Case clause in a pattern match, eliminated by TransMatch + /** Case clause in a pattern match, eliminated during explicitouter * (except for occurrences in switch statements) */ case class CaseDef(pat: Tree, guard: Tree, body: Tree) extends Tree - /** Alternatives of patterns, eliminated by TransMatch, except for + /** Alternatives of patterns, eliminated by explicitouter, except for * occurrences in encoded Switch stmt (=remaining Match(CaseDef(...)) */ case class Alternative(trees: List[Tree]) extends TermTree - /** Repetition of pattern, eliminated by TransMatch */ + /** Repetition of pattern, eliminated by explicitouter */ case class Star(elem: Tree) extends TermTree - /** Bind of a variable to a rhs pattern, eliminated by TransMatch + /** Bind of a variable to a rhs pattern, eliminated by explicitouter * * @param name * @param body @@ -343,12 +343,11 @@ trait Trees { self: Universe => extends TermTree /** <p> - * Pattern matching expression (before <code>TransMatch</code>) - * Switch statements (after TransMatch) + * Pattern matching expression (before explicitouter) + * Switch statements (after explicitouter) * </p> * <p> - * After <code>TransMatch</code>, cases will satisfy the following - * constraints: + * After explicitouter, cases will satisfy the following constraints: * </p> * <ul> * <li>all guards are EmptyTree,</li> |