Some cleanup

src/main/scala/leon/codegen/runtime/ChooseEntryPoint.scala

@@ -4,11 +4,8 @@ package leon
 package codegen.runtime
 
 import utils._
-import purescala.Common._
-import purescala.Definitions._
-import purescala.Expressions.{Tuple => LeonTuple, _}
+import purescala.Expressions._
 import purescala.ExprOps.valuateWithModel
-import purescala.Types._
 import purescala.Constructors._
 import solvers.TimeoutSolver
 import solvers.z3._

src/main/scala/leon/datagen/GrammarDataGen.scala

@@ -3,24 +3,14 @@
 package leon
 package datagen
 
-import purescala.Common._
 import purescala.Expressions._
-import purescala.Types._
-import purescala.Definitions._
-import utils.StreamUtils._
-
-import purescala.Definitions._
-import purescala.ExprOps._
 import purescala.Types.TypeTree
 import purescala.Common._
 import purescala.Constructors._
 import purescala.Extractors._
 import evaluators._
-import synthesis.utils._
 import bonsai.enumerators._
 
-import scala.collection.mutable.{Map=>MutableMap}
-
 import synthesis.utils._
 
 /** Utility functions to generate values of a given type.

src/main/scala/leon/frontends/scalac/SaveImports.scala

@@ -4,10 +4,6 @@ package leon
 package frontends.scalac
 
 import scala.tools.nsc._
-import scala.tools.nsc.plugins._
-
-import purescala.Definitions.Program
-import purescala.Definitions.{ModuleDef => LeonModuleDef, _}
 import utils.{Position => LeonPosition, RangePosition => LeonRangePosition, OffsetPosition => LeonOffsetPosition}
 
 trait SaveImports extends SubComponent {

src/main/scala/leon/purescala/ScalaPrinter.scala

@@ -5,17 +5,14 @@ package purescala
 
 import Constructors._
 import Extractors._
-
 import PrinterHelpers._
+import Common._
+import Expressions._
+import Types._
+import Definitions._
 
 /** This pretty-printer only print valid scala syntax */
 class ScalaPrinter(opts: PrinterOptions, sb: StringBuffer = new StringBuffer) extends PrettyPrinter(opts, sb) {
-  import Common._
-  import Expressions._
-  import Types._
-  import Definitions._
-
-  import java.lang.StringBuffer
 
   override def pp(tree: Tree)(implicit ctx: PrinterContext): Unit = {
    

src/main/scala/leon/purescala/Transformer.scala

@@ -3,7 +3,7 @@
 package leon
 package purescala
 
-import purescala.Expressions._
+import purescala.Expressions.Expr
 
 trait Transformer {
   def transform(e: Expr): Expr

src/main/scala/leon/purescala/Types.scala

@@ -5,11 +5,12 @@ package purescala
 
 import scala.language.implicitConversions
 
+import Common._
+import Expressions._
+import Definitions._
+import TypeOps._
+
 object Types {
-  import Common._
-  import Expressions._
-  import Definitions._
-  import TypeOps._
 
   trait Typed {
     def getType: TypeTree

src/main/scala/leon/repair/RepairCostModel.scala

@@ -2,8 +2,8 @@
 
 package leon
 package repair
-import synthesis._
 
+import synthesis._
 import synthesis.rules._
 import repair.rules._
 

src/main/scala/leon/repair/RepairPhase.scala

@@ -13,8 +13,8 @@ object RepairPhase extends LeonPhase[Program, Program] {
   implicit val debugSection = utils.DebugSectionRepair
 
   def run(ctx: LeonContext)(program: Program): Program = {
-    var repairFuns: Option[Seq[String]] = ctx.findOption(SharedOptions.FunctionsOptionDef)
-    var verifTimeoutMs: Option[Long] = ctx.findOption(SharedOptions.Timeout) map { _ * 1000 }
+    val repairFuns: Option[Seq[String]] = ctx.findOption(SharedOptions.FunctionsOptionDef)
+    val verifTimeoutMs: Option[Long] = ctx.findOption(SharedOptions.Timeout) map { _ * 1000 }
 
     val reporter = ctx.reporter
 

src/main/scala/leon/repair/rules/GuidedCloser.scala

@@ -8,16 +8,12 @@ import synthesis._
 
 import leon.utils.Simplifiers
 import purescala.Expressions._
-import purescala.Definitions._
-import purescala.Common._
-import purescala.Types._
 import purescala.ExprOps._
 import purescala.Extractors._
 import purescala.Constructors._
 
 import Witnesses._
 
-import solvers._
 import graph._
 
 case object GuidedCloser extends NormalizingRule("Guided Closer") {

src/main/scala/leon/solvers/SimpleAssumptionSolverAPI.scala

@@ -3,8 +3,8 @@
 package leon
 package solvers
 
-import purescala.Common._
-import purescala.Expressions._
+import purescala.Common.Identifier
+import purescala.Expressions.Expr
 
 class SimpleAssumptionSolverAPI(sf: SolverFactory[AssumptionSolver]) extends SimpleSolverAPI(sf) {
 

src/main/scala/leon/solvers/Solver.scala

@@ -3,7 +3,7 @@
 package leon
 package solvers
 
-import utils._
+import utils.DebugSectionSolver
 import purescala.Expressions.Expr
 import purescala.Common.Identifier
 

src/main/scala/leon/synthesis/SynthesisSettings.scala

@@ -3,7 +3,6 @@
 package leon
 package synthesis
 
-import scala.language.existentials
 import leon.purescala.Definitions.FunDef
 
 case class SynthesisSettings(

src/main/scala/leon/synthesis/Synthesizer.scala

@@ -4,7 +4,7 @@ package leon
 package synthesis
 
 import purescala.Common._
-import purescala.Definitions.{Program, FunDef, ModuleDef, DefType, ValDef}
+import purescala.Definitions._
 import purescala.ExprOps._
 import purescala.Expressions._
 import purescala.Constructors._

src/main/scala/leon/utils/ASCIIHelpers.scala

@@ -28,7 +28,7 @@ object ASCIIHelpers {
 
             val cols = constraints.getOrElse(k, 1)
 
-            val size = c.vString.size
+            val size = c.vString.length
 
             constraints += k -> (cols max size)
 
@@ -67,13 +67,13 @@ object ASCIIHelpers {
     def render: String = {
       val colSizes = computeColumnSizes
 
-      val fullWidth = Math.max(colSizes.sum + colSizes.size*2, title.size + 7)
+      val fullWidth = Math.max(colSizes.sum + colSizes.size*2, title.length + 7)
 
       val sb = new StringBuffer
 
-      sb append "  ┌─"+("─"*title.size)+"─┐\n"
-      sb append "╔═╡ "+      title     +" ╞" + ("═" * (fullWidth-title.size-5)) + "╗\n"
-      sb append "║ └─"+("─"*title.size)+"─┘" + (" " * (fullWidth-title.size-5)) + "║\n"
+      sb append "  ┌─"+("─"*title.length)+"─┐\n"
+      sb append "╔═╡ "+      title     +" ╞" + ("═" * (fullWidth-title.length-5)) + "╗\n"
+      sb append "║ └─"+("─"*title.length)+"─┘" + (" " * (fullWidth-title.length-5)) + "║\n"
 
       for (r <- rows) r match {
         case Separator =>