Skip to content
Snippets Groups Projects
Commit c5ba0f22 authored by Manos Koukoutos's avatar Manos Koukoutos
Browse files

Remove unneeded utils, small fixes

parent dc4c2b7d
No related branches found
No related tags found
No related merge requests found
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
package inox package inox
package solvers.z3 package solvers.z3
import utils._
import solvers.{z3 => _, _} import solvers.{z3 => _, _}
import unrolling._ import unrolling._
import theories._ import theories._
......
...@@ -23,7 +23,7 @@ abstract class FreeableIterator[T] extends Iterator[T] { ...@@ -23,7 +23,7 @@ abstract class FreeableIterator[T] extends Iterator[T] {
override def map[B](f: T => B): FreeableIterator[B] = { override def map[B](f: T => B): FreeableIterator[B] = {
new FreeableIterator[B] { new FreeableIterator[B] {
def computeNext() = orig.computeNext.map(f) def computeNext() = orig.computeNext().map(f)
def free() = orig.free() def free() = orig.free()
} }
} }
...@@ -35,7 +35,7 @@ abstract class FreeableIterator[T] extends Iterator[T] { ...@@ -35,7 +35,7 @@ abstract class FreeableIterator[T] extends Iterator[T] {
def computeNext() = { def computeNext() = {
if (c < n) { if (c < n) {
c += 1 c += 1
orig.computeNext orig.computeNext()
} else { } else {
None None
} }
...@@ -47,7 +47,7 @@ abstract class FreeableIterator[T] extends Iterator[T] { ...@@ -47,7 +47,7 @@ abstract class FreeableIterator[T] extends Iterator[T] {
override def takeWhile(p: T => Boolean) = { override def takeWhile(p: T => Boolean) = {
new FreeableIterator[T] { new FreeableIterator[T] {
def computeNext(): Option[T] = orig.computeNext.filter(p) def computeNext(): Option[T] = orig.computeNext().filter(p)
def free(): Unit = orig.free() def free(): Unit = orig.free()
} }
} }
......
...@@ -16,8 +16,7 @@ object GraphOps { ...@@ -16,8 +16,7 @@ object GraphOps {
if (noPreds.isEmpty) { if (noPreds.isEmpty) {
if (hasPreds.isEmpty) Right(done.reverse) if (hasPreds.isEmpty) Right(done.reverse)
else Left(hasPreds.keySet) else Left(hasPreds.keySet)
} } else {
else {
val found : Seq[A] = noPreds.keys.toSeq val found : Seq[A] = noPreds.keys.toSeq
tSort(hasPreds mapValues { _ -- found }, found ++ done) tSort(hasPreds mapValues { _ -- found }, found ++ done)
} }
......
/* Copyright 2009-2016 EPFL, Lausanne */
package inox.utils
import scala.collection.mutable.ArrayBuffer
class GrowableIterable[T](init: Seq[T], growth: Iterator[T]) extends Iterable[T] {
private var buffer = new ArrayBuffer[T]() ++ init
var canGrow = () => true
private val cachingIterator = new Iterator[T] {
def hasNext = canGrow() && growth.hasNext
def next() = {
val res = growth.next()
buffer += res
res
}
}
def += (more: T) = buffer += more
def ++=(more: Iterable[T]) = buffer ++= more
def -= (less: T) = buffer -= less
def --=(less: Iterable[T]) = buffer --= less
def iterator: Iterator[T] = {
buffer.iterator ++ cachingIterator
}
def bufferedCount = buffer.size
def sortBufferBy[B](f: T => B)(implicit ord: math.Ordering[B]) = {
buffer = buffer.sortBy(f)
}
}
/* Copyright 2009-2016 EPFL, Lausanne */
package inox.utils
/** Represents a pretty-printable report */
abstract class Report {
def summaryString: String
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment