summaryrefslogtreecommitdiff
path: root/sources
diff options
context:
space:
mode:
authorburaq <buraq@epfl.ch>2005-06-16 16:45:21 +0000
committerburaq <buraq@epfl.ch>2005-06-16 16:45:21 +0000
commit7fd0b4b8c8db2b9e186904018a28f90fe35d085b (patch)
tree3d115bb9dbd403801e0b6832c78d5898c1bd5658 /sources
parent95bafdf4ead36bb13e16c6ffb8e653b443405651 (diff)
downloadscala-7fd0b4b8c8db2b9e186904018a28f90fe35d085b.tar.gz
scala-7fd0b4b8c8db2b9e186904018a28f90fe35d085b.tar.bz2
scala-7fd0b4b8c8db2b9e186904018a28f90fe35d085b.zip
ok, kicked out handling of "alternative" patter...
ok, kicked out handling of "alternative" patterns in Matthias' matcher
Diffstat (limited to 'sources')
-rw-r--r--sources/scala/tools/scalac/transformer/matching/PatternMatcher.scala5
-rw-r--r--sources/scala/tools/scalac/transformer/matching/PatternNodeCreator.scala4
-rw-r--r--sources/scala/tools/scalac/transformer/matching/PatternNodeDebugPrinter.scala3
3 files changed, 6 insertions, 6 deletions
diff --git a/sources/scala/tools/scalac/transformer/matching/PatternMatcher.scala b/sources/scala/tools/scalac/transformer/matching/PatternMatcher.scala
index d55fcdaa73..836c46f9f5 100644
--- a/sources/scala/tools/scalac/transformer/matching/PatternMatcher.scala
+++ b/sources/scala/tools/scalac/transformer/matching/PatternMatcher.scala
@@ -305,9 +305,6 @@ class PatternMatcher(unit: CompilationUnit) extends PatternTool(unit) {
enter1(pat, index, target, newCasted, env);
case SequencePat(newCasted, len) =>
enter1(pat, index, target, newCasted, env);
- /* Test
- case AltPat() =>
- */
case _ =>
enter1(pat, index, target, casted, env);
}
@@ -781,10 +778,12 @@ class PatternMatcher(unit: CompilationUnit) extends PatternTool(unit) {
return gen.If(cf.Equals(selector.duplicate(), tree),
toTree(node.and),
toTree(node.or, selector.duplicate()));
+ /*
case AltPat(header) =>
return gen.If(toTree(header),
toTree(node.and),
toTree(node.or, selector.duplicate()));
+ */
}
}
diff --git a/sources/scala/tools/scalac/transformer/matching/PatternNodeCreator.scala b/sources/scala/tools/scalac/transformer/matching/PatternNodeCreator.scala
index 1b656e6af1..fdda3f01ab 100644
--- a/sources/scala/tools/scalac/transformer/matching/PatternNodeCreator.scala
+++ b/sources/scala/tools/scalac/transformer/matching/PatternNodeCreator.scala
@@ -65,14 +65,14 @@ package scala.tools.scalac.transformer.matching {
node.setType(tree.getType());
node;
}
-
+ /*
def AltPat(pos: int, header:Header ) = {
val node = new AltPat(header);
node.pos = pos;
node.setType(header.getTpe());
node;
}
-
+ */
// factories
def Header(pos: int, tpe: Type, selector:Tree) = {
diff --git a/sources/scala/tools/scalac/transformer/matching/PatternNodeDebugPrinter.scala b/sources/scala/tools/scalac/transformer/matching/PatternNodeDebugPrinter.scala
index 78318c6f10..c2a4c459e8 100644
--- a/sources/scala/tools/scalac/transformer/matching/PatternNodeDebugPrinter.scala
+++ b/sources/scala/tools/scalac/transformer/matching/PatternNodeDebugPrinter.scala
@@ -96,13 +96,14 @@ package scala.tools.scalac.transformer.matching {
if (patNode.or != null)
print(patNode.or, indent);
+ /*
case AltPat(header) =>
Console.println(indent + "-- ALTERNATIVES:");
print(header, indent + " * ");
print(patNode.and, indent + " * -> ");
if (patNode.or != null)
print(patNode.or, indent);
-
+*/
case _b:Body =>
if ((_b.guard.length == 0) && (_b.body.length == 0))
Console.println(indent + "true");