From ff9e58557532f1c6384ef1dd8d3e52bfcd854bd6 Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Tue, 10 May 2016 14:03:09 +0200
Subject: [PATCH] Fix file names

---
 .../scala/leon/invariant/datastructure/ExprStructure.scala  | 3 ---
 .../{SolverPool.scala => SolverPoolFactory.scala}           | 0
 .../{UnionProgramset.scala => UnionProgramSet.scala}        | 6 ------
 .../{InstProgSimplifier.scala => ProgramSimplifier.scala}   | 0
 ...ionCountPhase.scala => RecursionCountInstrumenter.scala} | 0
 .../{StackSpacePhase.scala => StackSpaceInstrumenter.scala} | 0
 6 files changed, 9 deletions(-)
 rename src/main/scala/leon/solvers/combinators/{SolverPool.scala => SolverPoolFactory.scala} (100%)
 rename src/main/scala/leon/synthesis/programsets/{UnionProgramset.scala => UnionProgramSet.scala} (73%)
 rename src/main/scala/leon/transformations/{InstProgSimplifier.scala => ProgramSimplifier.scala} (100%)
 rename src/main/scala/leon/transformations/{RecursionCountPhase.scala => RecursionCountInstrumenter.scala} (100%)
 rename src/main/scala/leon/transformations/{StackSpacePhase.scala => StackSpaceInstrumenter.scala} (100%)

diff --git a/src/main/scala/leon/invariant/datastructure/ExprStructure.scala b/src/main/scala/leon/invariant/datastructure/ExprStructure.scala
index 9a78a3512..f597cd773 100644
--- a/src/main/scala/leon/invariant/datastructure/ExprStructure.scala
+++ b/src/main/scala/leon/invariant/datastructure/ExprStructure.scala
@@ -1,13 +1,10 @@
 package leon
 package invariant.util
 
-import purescala.Common._
-import purescala.Definitions._
 import purescala.Expressions._
 import purescala.ExprOps._
 import purescala.Extractors._
 import purescala.Types._
-import scala.collection.mutable.{ Set => MutableSet, Map => MutableMap }
 
 /**
  * A class that looks for structural equality of expressions
diff --git a/src/main/scala/leon/solvers/combinators/SolverPool.scala b/src/main/scala/leon/solvers/combinators/SolverPoolFactory.scala
similarity index 100%
rename from src/main/scala/leon/solvers/combinators/SolverPool.scala
rename to src/main/scala/leon/solvers/combinators/SolverPoolFactory.scala
diff --git a/src/main/scala/leon/synthesis/programsets/UnionProgramset.scala b/src/main/scala/leon/synthesis/programsets/UnionProgramSet.scala
similarity index 73%
rename from src/main/scala/leon/synthesis/programsets/UnionProgramset.scala
rename to src/main/scala/leon/synthesis/programsets/UnionProgramSet.scala
index bf49d8195..4ebaeb566 100644
--- a/src/main/scala/leon/synthesis/programsets/UnionProgramset.scala
+++ b/src/main/scala/leon/synthesis/programsets/UnionProgramSet.scala
@@ -3,12 +3,6 @@
 package leon
 package synthesis.programsets
 
-import leon.purescala
-import purescala.Expressions._
-import purescala.Extractors._
-import purescala.Constructors._
-import purescala.Types._
-
 object UnionProgramSet {
   def apply[T](sets: Seq[ProgramSet[T]]): UnionProgramSet[T] = {
     new UnionProgramSet(sets)
diff --git a/src/main/scala/leon/transformations/InstProgSimplifier.scala b/src/main/scala/leon/transformations/ProgramSimplifier.scala
similarity index 100%
rename from src/main/scala/leon/transformations/InstProgSimplifier.scala
rename to src/main/scala/leon/transformations/ProgramSimplifier.scala
diff --git a/src/main/scala/leon/transformations/RecursionCountPhase.scala b/src/main/scala/leon/transformations/RecursionCountInstrumenter.scala
similarity index 100%
rename from src/main/scala/leon/transformations/RecursionCountPhase.scala
rename to src/main/scala/leon/transformations/RecursionCountInstrumenter.scala
diff --git a/src/main/scala/leon/transformations/StackSpacePhase.scala b/src/main/scala/leon/transformations/StackSpaceInstrumenter.scala
similarity index 100%
rename from src/main/scala/leon/transformations/StackSpacePhase.scala
rename to src/main/scala/leon/transformations/StackSpaceInstrumenter.scala
-- 
GitLab