From 796f08ed256bff9c621bf952aad2e88ff7a1c0c1 Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Thu, 12 May 2016 10:12:04 +0200
Subject: [PATCH] Fix imports
---
.../leon/purescala/SelfPrettyPrinter.scala | 27 ++++++-------------
.../leon/synthesis/rules/StringRender.scala | 2 +-
.../synthesis/SynthesisRegressionSuite.scala | 1 -
3 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/src/main/scala/leon/purescala/SelfPrettyPrinter.scala b/src/main/scala/leon/purescala/SelfPrettyPrinter.scala
index f0817f3bc..71c91c551 100644
--- a/src/main/scala/leon/purescala/SelfPrettyPrinter.scala
+++ b/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
}
diff --git a/src/main/scala/leon/synthesis/rules/StringRender.scala b/src/main/scala/leon/synthesis/rules/StringRender.scala
index dfb6da075..cc20b71fb 100644
--- a/src/main/scala/leon/synthesis/rules/StringRender.scala
+++ b/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.
diff --git a/src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala b/src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
index 06abffdef..ed9be0442 100644
--- a/src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
+++ b/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
--
GitLab