natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move the implicit BitSet=>Ordered[BitSet] coercion to 

automata/SubsetConstruction, where it is used


git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@5645 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
mihaylov 2006-01-26 17:33:39 +00:00
parent 8371b87201
commit e7829ff427
2 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/library/scala/collection/immutable/BitSet.scala
View File

@ -38,36 +38,3 @@ class BitSet(val size: Int, val capacity: Int, ba: Array[Int], copy: Boolean)
ba;
}
object BitSet {
implicit def toOrdered(bs: BitSet): Ordered[BitSet] = new Ordered[BitSet] {
def compareTo [b >: BitSet <% Ordered[b]](other: b): Int = other match {
case that: BitSet => {
val it1 = bs.elements;
val it2 = that.elements;
var res = 0;
while((0 == res) && it1.hasNext) {
while((0 == res) && it2.hasNext) {
if (!it1.hasNext)
res = -1
else {
val i1 = it1.next;
val i2 = it2.next;
if (i1 < i2)
res = -1
else if (i1 > i2)
res = 1
}
}
if (it1.hasNext)
res = 1
}
if (it2.hasNext)
res = -1;
res
}
//case _ => -(other.compareTo(this))
}
}
}

32
src/library/scala/util/automata/SubsetConstruction.scala
View File

@ -1,13 +1,43 @@
package scala.util.automata ;
class SubsetConstruction[T <: AnyRef](val nfa: NondetWordAutom[T]) {
//import nfa.{ _labelT, labels };
import nfa.labels ;
import scala.collection.{immutable, mutable, Map} ;
import immutable.{ BitSet, TreeMap, TreeSet } ;
implicit def toOrdered(bs: BitSet): Ordered[BitSet] = new Ordered[BitSet] {
def compareTo [b >: BitSet <% Ordered[b]](other: b): Int = other match {
case that: BitSet => {
val it1 = bs.elements;
val it2 = that.elements;
var res = 0;
while((0 == res) && it1.hasNext) {
while((0 == res) && it2.hasNext) {
if (!it1.hasNext)
res = -1
else {
val i1 = it1.next;
val i2 = it2.next;
if (i1 < i2)
res = -1
else if (i1 > i2)
res = 1
}
}
if (it1.hasNext)
res = 1
}
if (it2.hasNext)
res = -1;
res
}
//case _ => -(other.compareTo(this))
}
}
/** the set {0} */
final val _initialBitSet = {
val rbs = new mutable.BitSet(1);