Fix imports

src/main/scala/leon/purescala/SelfPrettyPrinter.scala

@@ -2,27 +2,16 @@
 
 package leon.purescala
 
-import leon.purescala
-import leon.solvers.{ Model, SolverFactory }
+import Constructors._
+import Expressions._
+import Types._
+import Common._
+import Definitions._
+import leon.evaluators._
 import leon.LeonContext
-import leon.evaluators
 import leon.utils.StreamUtils
-import leon.purescala.Quantification._
-import leon.utils.DebugSectionEvaluation
-import purescala.Definitions.Program
-import purescala.Expressions._
-import purescala.Types.StringType
-import purescala.Constructors._
-import purescala.ExprOps._
-import purescala.Expressions._
-import purescala.Expressions.{Choose }
-import purescala.Extractors._
-import purescala.TypeOps._
-import purescala.Types._
-import purescala.Common._
-import purescala.Definitions._
+
 import scala.collection.mutable.ListBuffer
-import leon.evaluators.DefaultEvaluator
 
 object SelfPrettyPrinter {
   def prettyPrintersForType(inputType: TypeTree)(implicit ctx: LeonContext, program: Program): Stream[Lambda] = {
@@ -185,7 +174,7 @@ class SelfPrettyPrinter extends PrettyPrinterFinder[Lambda, Lambda] { top =>
               orElse
           }
         } catch {
-          case e: evaluators.ContextualEvaluator#EvalError =>
+          case e: ContextualEvaluator#EvalError =>
             ctx.reporter.debug("Error "  + e.msg)
             orElse
         }

src/main/scala/leon/synthesis/rules/StringRender.scala

@@ -69,7 +69,7 @@ case object StringRender extends Rule("StringRender") {
   
   val booleanTemplate = (a: Expr) => StringTemplateGenerator(Hole => IfExpr(a, Hole, Hole))
   
-  import StringSolver.{StringFormToken, StringForm, Problem => SProblem, Equation, Assignment}
+  import StringSolver.{StringFormToken, Problem => SProblem, Equation, Assignment}
   
   /** Augment the left-hand-side to have possible function calls, such as x + "const" + customToString(_) ...
    *  Function calls will be eliminated when converting to a valid problem.

src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala

@@ -5,7 +5,6 @@ package leon.regression.synthesis
 import leon.test._
 
 import leon._
-import leon.purescala.Definitions._
 import leon.synthesis._
 
 import java.io.File