diff --git a/enumset/src/commonMain/kotlin/EnumSet32.kt b/enumset/src/commonMain/kotlin/EnumSet32.kt index 12cb90a..6e00c1d 100644 --- a/enumset/src/commonMain/kotlin/EnumSet32.kt +++ b/enumset/src/commonMain/kotlin/EnumSet32.kt @@ -18,6 +18,15 @@ package opensavvy.enumset import kotlin.enums.EnumEntries +@ExperimentalEnumSetApi +private fun > Iterable.toBitSet(): MutableBitSet32 { + val elements = MutableBitSet32() + for (element in this) { + elements.add(element.ordinal) + } + return elements +} + @ExperimentalEnumSetApi internal class EnumSet32> private constructor( private val set: BitSet32, @@ -52,13 +61,7 @@ internal class EnumSet32> private constructor( } override fun containsAll(elements: Collection): Boolean { - val elementsMask = MutableBitSet32() - for (element in elements) { - val ordinal = element.ordinal - elementsMask.add(ordinal) - } - - return set.containsAll(elementsMask) + return set.containsAll(elements.toBitSet()) } override fun toString(): String = @@ -80,12 +83,7 @@ internal class EnumSet32> private constructor( companion object { internal fun > of(elements: Iterable, entries: EnumEntries): EnumSet32 { - val elementsSet = MutableBitSet32() - for (element in elements) { - elementsSet.add(element.ordinal) - } - - return EnumSet32(elementsSet.toSet(), entries) + return EnumSet32(elements.toBitSet().toSet(), entries) } } } @@ -119,13 +117,13 @@ internal class MutableEnumSet32> private constructor( set.remove(element.ordinal) override fun addAll(elements: Collection): Boolean = - set.addAll(elements.map { it.ordinal }) + set.addAll(elements.toBitSet()) override fun removeAll(elements: Collection): Boolean = - set.removeAll(elements.map { it.ordinal }) + set.removeAll(elements.toBitSet()) override fun retainAll(elements: Collection): Boolean = - set.retainAll(elements.map { it.ordinal }) + set.retainAll(elements.toBitSet()) override fun clear() { set.clear() @@ -146,15 +144,8 @@ internal class MutableEnumSet32> private constructor( } } - override fun containsAll(elements: Collection): Boolean { - val elementsMask = MutableBitSet32() - for (element in elements) { - val ordinal = element.ordinal - elementsMask.add(ordinal) - } - - return set.containsAll(elementsMask) - } + override fun containsAll(elements: Collection): Boolean = + set.containsAll(elements.toBitSet()) override fun toString(): String = this.joinToString(", ", "[", "]")