summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sources/scalac/ast/TreeInfo.java8
-rw-r--r--sources/scalac/transformer/matching/BerrySethi.java7
2 files changed, 14 insertions, 1 deletions
diff --git a/sources/scalac/ast/TreeInfo.java b/sources/scalac/ast/TreeInfo.java
index 6321fc280b..ed442bdf5d 100644
--- a/sources/scalac/ast/TreeInfo.java
+++ b/sources/scalac/ast/TreeInfo.java
@@ -294,4 +294,12 @@ public class TreeInfo {
return false;
}
+ /** @todo replace with cleaner test (e.g. of a symbol flag)
+ */
+ public static boolean isNameOfStarPattern( Name n ) {
+ String s = n.toString();
+ return (s.indexOf("$") != -1)
+ &&(!s.startsWith("nest"));
+ }
+
}
diff --git a/sources/scalac/transformer/matching/BerrySethi.java b/sources/scalac/transformer/matching/BerrySethi.java
index 2a1aecf29e..1de1a0f192 100644
--- a/sources/scalac/transformer/matching/BerrySethi.java
+++ b/sources/scalac/transformer/matching/BerrySethi.java
@@ -2,6 +2,7 @@ package scalac.transformer.matching ;
import scalac.ApplicationError ;
import scalac.ast.Tree ;
+import scalac.ast.TreeInfo ;
import scalac.util.Name ;
import Tree.* ;
@@ -17,11 +18,15 @@ import java.util.* ;
class BerrySethi {
boolean isStar( Name n ) {
+ return TreeInfo.isNameOfStarPattern( n );
+ }
+ /*
+
String s = n.toString();
return (s.indexOf("$") != -1)
&&(!s.startsWith("nest"));
}
-
+ */
HashSet labels;