diff options
| author | Burak Emir <emir@epfl.ch> | 2007-08-06 15:10:12 +0000 |
|---|---|---|
| committer | Burak Emir <emir@epfl.ch> | 2007-08-06 15:10:12 +0000 |
| commit | d5dceac54c9023c7e886c8199fa8e000b9b1e99b (patch) | |
| tree | f30014bbf4f0b4bb1b96d1b7d2030638d51d1b30 /src | |
| parent | 17ddb5c33ca64043c784f1bad7fbd7042018664f (diff) | |
| download | scala-d5dceac54c9023c7e886c8199fa8e000b9b1e99b.tar.gz scala-d5dceac54c9023c7e886c8199fa8e000b9b1e99b.tar.bz2 scala-d5dceac54c9023c7e886c8199fa8e000b9b1e99b.zip | |
replaced `_.tpe.symbol.tag' with getCaseTag(_) ...
replaced `_.tpe.symbol.tag' with getCaseTag(_) calls
Diffstat (limited to 'src')
3 files changed, 7 insertions, 15 deletions
diff --git a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala index 53f3d667e9..57c389b25a 100644 --- a/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala +++ b/src/compiler/scala/tools/nsc/matching/ParallelMatching.scala @@ -224,7 +224,7 @@ trait ParallelMatching { if(isDefaultPattern(p)) insertDefault(i,strip1(xs.head)) else - insertTagIndexPair(p.tpe./*?type?*/symbol.tag, i) + insertTagIndexPair( getCaseTag(p.tpe), i) i += 1 xs = xs.tail } @@ -235,17 +235,7 @@ trait ParallelMatching { case Row(pats,s,g,b) => val nbindings = s ::: strip1(column(index)).toList.map { v => (v,scrutinee) } Row(column(tagIndexPairs.index)::pats, nbindings, g, b) - } - - /*{ - var trs = tagIndexPairs - while(trs ne null) { - Console.println((trs.tag,trs.index)) - trs = trs.next - } - }*/ - //System.exit(-1) - + } } diff --git a/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala b/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala index 1a68d873dc..af294ce550 100644 --- a/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala +++ b/src/compiler/scala/tools/nsc/matching/PatternMatchers.scala @@ -1062,7 +1062,7 @@ print() while (node ne null) node match { case ConstrPat(casted) => - cases = insertNode(node.tpe./*?type?*/symbol.tag, node, cases) + cases = insertNode(getCaseTag(node.tpe) , node, cases) node = node.or case DefaultPat() => @@ -1070,7 +1070,7 @@ print() node = node.or case VariablePat(tree) if node.tpe./*?type?*/symbol hasFlag Flags.CASE => - cases = insertNode(node.tpe./*?type?*/symbol.tag, node, cases) + cases = insertNode(getCaseTag(node.tpe), node, cases) node = node.or case _ => diff --git a/src/compiler/scala/tools/nsc/matching/PatternNodes.scala b/src/compiler/scala/tools/nsc/matching/PatternNodes.scala index 4fc3db664f..2321ce09d8 100644 --- a/src/compiler/scala/tools/nsc/matching/PatternNodes.scala +++ b/src/compiler/scala/tools/nsc/matching/PatternNodes.scala @@ -33,8 +33,10 @@ trait PatternNodes { self: transform.ExplicitOuter => case z => z } - // + // this method obtains tag method in a defensive way + def getCaseTag(x:Type): Int = { x.typeSymbol.tag } + // type SymSet = collection.immutable.Set[Symbol] /** returns the child patterns of a pattern |