Skip to content

Commit

Permalink
Merge in the latest from master
Browse files Browse the repository at this point in the history
  • Loading branch information
josharnold52 committed Jul 22, 2011
2 parents 71096b3 + 41e79aa commit 9f3b07b
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions src/main/scala/com/codecommit/antixml/Zipper.scala
Expand Up @@ -110,13 +110,7 @@ trait Zipper[+A <: Node] extends Group[A] with IndexedSeqLike[A, Zipper[A]] with
(Map[Int, Int]() /: maps) { _ ++ _ }
}

val initialMap = Map[Int, Set[Int]]((0 to result.size).toSeq flatMap { i =>
childMap get(i) match {
case Some(s: Set[Int]) if s.size == 0 => Some((i, s))
case _ => None
}
} :_*)
val (_, aggregate, childMap2) = result.slice(from, to).zipWithIndex.foldLeft((0, Vector[B](), initialMap)) {
val (_, aggregate, childMap2) = result.slice(from, to).zipWithIndex.foldLeft((0, Vector[B](), Map[Int, Set[Int]]())) {
case ((start, acc, childMap2), (chunk, i)) => {
val size = chunk.size
val source = inverseMap(i)
Expand Down

0 comments on commit 9f3b07b

Please sign in to comment.