From 68a8e291507b8ab369847fd42becda1b3ea07d0c Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Tue, 10 May 2016 14:05:18 +0200
Subject: [PATCH] Move files to the right packages
---
.../ExprStructure.scala | 6 +++---
.../FunctionClosureSuite.scala | 21 +++++++++----------
2 files changed, 13 insertions(+), 14 deletions(-)
rename src/main/scala/leon/invariant/{datastructure => util}/ExprStructure.scala (96%)
rename src/test/scala/leon/unit/{purescala => utils}/FunctionClosureSuite.scala (97%)
diff --git a/src/main/scala/leon/invariant/datastructure/ExprStructure.scala b/src/main/scala/leon/invariant/util/ExprStructure.scala
similarity index 96%
rename from src/main/scala/leon/invariant/datastructure/ExprStructure.scala
rename to src/main/scala/leon/invariant/util/ExprStructure.scala
index f597cd773..3907ac376 100644
--- a/src/main/scala/leon/invariant/datastructure/ExprStructure.scala
+++ b/src/main/scala/leon/invariant/util/ExprStructure.scala
@@ -1,10 +1,10 @@
package leon
package invariant.util
-import purescala.Expressions._
import purescala.ExprOps._
-import purescala.Extractors._
-import purescala.Types._
+import purescala.Expressions._
+import purescala.Extractors.Operator
+import purescala.Types.{ClassType, TypeParameter}
/**
* A class that looks for structural equality of expressions
diff --git a/src/test/scala/leon/unit/purescala/FunctionClosureSuite.scala b/src/test/scala/leon/unit/utils/FunctionClosureSuite.scala
similarity index 97%
rename from src/test/scala/leon/unit/purescala/FunctionClosureSuite.scala
rename to src/test/scala/leon/unit/utils/FunctionClosureSuite.scala
index 98132fd9a..54f7844d5 100644
--- a/src/test/scala/leon/unit/purescala/FunctionClosureSuite.scala
+++ b/src/test/scala/leon/unit/utils/FunctionClosureSuite.scala
@@ -1,16 +1,15 @@
/* Copyright 2009-2016 EPFL, Lausanne */
-package leon.unit.utils
-
-import leon.test._
-import leon.purescala.Common._
-import leon.purescala.Expressions._
-import leon.purescala.Types._
-import leon.purescala.TypeOps.isSubtypeOf
-import leon.purescala.Definitions._
-import leon.purescala.ExprOps._
-import leon.purescala.FunctionClosure
-
+package leon
+package unit.utils
+
+import purescala.Common._
+import purescala.Definitions._
+import purescala.ExprOps._
+import purescala.Expressions._
+import purescala.FunctionClosure
+import purescala.Types._
+import test._
import org.scalatest._
class FunctionClosureSuite extends FunSuite with helpers.ExpressionsDSL {
--
GitLab