From 7f0a3235a9424cb0b91522003d988781c49f1fb6 Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Fri, 17 Apr 2015 17:35:26 +0200
Subject: [PATCH] Some cleanup
---
.../scala/leon/codegen/runtime/ChooseEntryPoint.scala | 5 +----
src/main/scala/leon/datagen/GrammarDataGen.scala | 10 ----------
.../scala/leon/frontends/scalac/SaveImports.scala | 4 ----
src/main/scala/leon/purescala/ScalaPrinter.scala | 11 ++++-------
src/main/scala/leon/purescala/Transformer.scala | 2 +-
src/main/scala/leon/purescala/Types.scala | 9 +++++----
src/main/scala/leon/repair/RepairCostModel.scala | 2 +-
src/main/scala/leon/repair/RepairPhase.scala | 4 ++--
src/main/scala/leon/repair/rules/GuidedCloser.scala | 4 ----
.../leon/solvers/SimpleAssumptionSolverAPI.scala | 4 ++--
src/main/scala/leon/solvers/Solver.scala | 2 +-
src/main/scala/leon/synthesis/SynthesisSettings.scala | 1 -
src/main/scala/leon/synthesis/Synthesizer.scala | 2 +-
src/main/scala/leon/utils/ASCIIHelpers.scala | 10 +++++-----
14 files changed, 23 insertions(+), 47 deletions(-)
diff --git a/src/main/scala/leon/codegen/runtime/ChooseEntryPoint.scala b/src/main/scala/leon/codegen/runtime/ChooseEntryPoint.scala
index 1e5e0c261..b74b46e89 100644
--- a/src/main/scala/leon/codegen/runtime/ChooseEntryPoint.scala
+++ b/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._
diff --git a/src/main/scala/leon/datagen/GrammarDataGen.scala b/src/main/scala/leon/datagen/GrammarDataGen.scala
index c483233e6..614af333b 100644
--- a/src/main/scala/leon/datagen/GrammarDataGen.scala
+++ b/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.
diff --git a/src/main/scala/leon/frontends/scalac/SaveImports.scala b/src/main/scala/leon/frontends/scalac/SaveImports.scala
index 8edc6dc04..ff7b05240 100644
--- a/src/main/scala/leon/frontends/scalac/SaveImports.scala
+++ b/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 {
diff --git a/src/main/scala/leon/purescala/ScalaPrinter.scala b/src/main/scala/leon/purescala/ScalaPrinter.scala
index eeca5d984..b586ecdbe 100644
--- a/src/main/scala/leon/purescala/ScalaPrinter.scala
+++ b/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 = {
diff --git a/src/main/scala/leon/purescala/Transformer.scala b/src/main/scala/leon/purescala/Transformer.scala
index 498a9c4bf..bddbe0325 100644
--- a/src/main/scala/leon/purescala/Transformer.scala
+++ b/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
diff --git a/src/main/scala/leon/purescala/Types.scala b/src/main/scala/leon/purescala/Types.scala
index b72db6530..1a8352234 100644
--- a/src/main/scala/leon/purescala/Types.scala
+++ b/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
diff --git a/src/main/scala/leon/repair/RepairCostModel.scala b/src/main/scala/leon/repair/RepairCostModel.scala
index 65ba355b9..0d6837f1c 100644
--- a/src/main/scala/leon/repair/RepairCostModel.scala
+++ b/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._
diff --git a/src/main/scala/leon/repair/RepairPhase.scala b/src/main/scala/leon/repair/RepairPhase.scala
index 913e722c9..0b4c0d4c6 100644
--- a/src/main/scala/leon/repair/RepairPhase.scala
+++ b/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
diff --git a/src/main/scala/leon/repair/rules/GuidedCloser.scala b/src/main/scala/leon/repair/rules/GuidedCloser.scala
index 1fc70941a..aa80a394b 100644
--- a/src/main/scala/leon/repair/rules/GuidedCloser.scala
+++ b/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") {
diff --git a/src/main/scala/leon/solvers/SimpleAssumptionSolverAPI.scala b/src/main/scala/leon/solvers/SimpleAssumptionSolverAPI.scala
index 1c51be6d5..cc382dd41 100644
--- a/src/main/scala/leon/solvers/SimpleAssumptionSolverAPI.scala
+++ b/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) {
diff --git a/src/main/scala/leon/solvers/Solver.scala b/src/main/scala/leon/solvers/Solver.scala
index 04a98e765..3703464cf 100644
--- a/src/main/scala/leon/solvers/Solver.scala
+++ b/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
diff --git a/src/main/scala/leon/synthesis/SynthesisSettings.scala b/src/main/scala/leon/synthesis/SynthesisSettings.scala
index caacfea8e..9a52e58d6 100644
--- a/src/main/scala/leon/synthesis/SynthesisSettings.scala
+++ b/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(
diff --git a/src/main/scala/leon/synthesis/Synthesizer.scala b/src/main/scala/leon/synthesis/Synthesizer.scala
index a482a471d..9dabc1233 100644
--- a/src/main/scala/leon/synthesis/Synthesizer.scala
+++ b/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._
diff --git a/src/main/scala/leon/utils/ASCIIHelpers.scala b/src/main/scala/leon/utils/ASCIIHelpers.scala
index affd0ff09..524d1fc04 100644
--- a/src/main/scala/leon/utils/ASCIIHelpers.scala
+++ b/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 =>
--
GitLab