From 4ee3005441e6f040eb9a0de639a85e52588826b2 Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Tue, 17 Mar 2015 14:50:48 +0100
Subject: [PATCH] Rename XLang Trees

---
 src/main/scala/leon/evaluators/RecursiveEvaluator.scala      | 2 +-
 src/main/scala/leon/frontends/scalac/CodeExtraction.scala    | 4 ++--
 src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala        | 2 +-
 src/main/scala/leon/verification/InjectAsserts.scala         | 2 +-
 src/main/scala/leon/xlang/ArrayTransformation.scala          | 2 +-
 src/main/scala/leon/xlang/EpsilonElimination.scala           | 2 +-
 src/main/scala/leon/xlang/{TreeOps.scala => ExprOps.scala}   | 4 ++--
 src/main/scala/leon/xlang/{Trees.scala => Expressions.scala} | 2 +-
 src/main/scala/leon/xlang/ImperativeCodeElimination.scala    | 2 +-
 src/main/scala/leon/xlang/NoXLangFeaturesChecking.scala      | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)
 rename src/main/scala/leon/xlang/{TreeOps.scala => ExprOps.scala} (95%)
 rename src/main/scala/leon/xlang/{Trees.scala => Expressions.scala} (99%)

diff --git a/src/main/scala/leon/evaluators/RecursiveEvaluator.scala b/src/main/scala/leon/evaluators/RecursiveEvaluator.scala
index e6e516c67..39d4cdbee 100644
--- a/src/main/scala/leon/evaluators/RecursiveEvaluator.scala
+++ b/src/main/scala/leon/evaluators/RecursiveEvaluator.scala
@@ -13,7 +13,7 @@ import purescala.Extractors._
 
 import solvers.TimeoutSolver
 
-import xlang.Trees._
+import xlang.Expressions._
 import solvers.SolverFactory
 import synthesis.ConvertHoles.convertHoles
 
diff --git a/src/main/scala/leon/frontends/scalac/CodeExtraction.scala b/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
index 379413fea..06d89326c 100644
--- a/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
+++ b/src/main/scala/leon/frontends/scalac/CodeExtraction.scala
@@ -25,8 +25,8 @@ import purescala.Constructors._
 import purescala.ExprOps._
 import purescala.TypeOps._
 import purescala.DefOps.packageOf
-import xlang.Trees.{Block => LeonBlock, _}
-import xlang.TreeOps._
+import xlang.Expressions.{Block => LeonBlock, _}
+import xlang.ExprOps._
 
 import utils.{DefinedPosition, Position => LeonPosition, OffsetPosition => LeonOffsetPosition, RangePosition => LeonRangePosition}
 
diff --git a/src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala b/src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala
index bc2571639..331bc0008 100644
--- a/src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala
+++ b/src/main/scala/leon/solvers/z3/AbstractZ3Solver.scala
@@ -13,7 +13,7 @@ import purescala.Constructors._
 import purescala.Extractors._
 import purescala.Expressions._
 import purescala.TypeOps._
-import xlang.Trees._
+import xlang.Expressions._
 import purescala.ExprOps._
 import purescala.Types._
 
diff --git a/src/main/scala/leon/verification/InjectAsserts.scala b/src/main/scala/leon/verification/InjectAsserts.scala
index cdeae613b..0a67d9cc0 100644
--- a/src/main/scala/leon/verification/InjectAsserts.scala
+++ b/src/main/scala/leon/verification/InjectAsserts.scala
@@ -4,7 +4,7 @@ package leon
 package utils
 
 import purescala.Expressions._
-import xlang.Trees._
+import xlang.Expressions._
 import purescala.ExprOps._
 import purescala.Definitions._
 import purescala.Constructors._
diff --git a/src/main/scala/leon/xlang/ArrayTransformation.scala b/src/main/scala/leon/xlang/ArrayTransformation.scala
index 63a454ecc..90360fe3d 100644
--- a/src/main/scala/leon/xlang/ArrayTransformation.scala
+++ b/src/main/scala/leon/xlang/ArrayTransformation.scala
@@ -7,7 +7,7 @@ import leon.LeonContext
 import leon.purescala.Common._
 import leon.purescala.Definitions._
 import leon.purescala.Expressions._
-import leon.xlang.Trees._
+import leon.xlang.Expressions._
 import leon.purescala.Extractors._
 import leon.purescala.Types._
 
diff --git a/src/main/scala/leon/xlang/EpsilonElimination.scala b/src/main/scala/leon/xlang/EpsilonElimination.scala
index 3a1c8498e..6891bdd4b 100644
--- a/src/main/scala/leon/xlang/EpsilonElimination.scala
+++ b/src/main/scala/leon/xlang/EpsilonElimination.scala
@@ -8,7 +8,7 @@ import leon.purescala.Common._
 import leon.purescala.Definitions._
 import leon.purescala.Expressions._
 import leon.purescala.ExprOps._
-import leon.xlang.Trees._
+import leon.xlang.Expressions._
 
 object EpsilonElimination extends TransformationPhase {
 
diff --git a/src/main/scala/leon/xlang/TreeOps.scala b/src/main/scala/leon/xlang/ExprOps.scala
similarity index 95%
rename from src/main/scala/leon/xlang/TreeOps.scala
rename to src/main/scala/leon/xlang/ExprOps.scala
index 296bfe9f7..c62240c72 100644
--- a/src/main/scala/leon/xlang/TreeOps.scala
+++ b/src/main/scala/leon/xlang/ExprOps.scala
@@ -4,10 +4,10 @@ package leon
 package xlang
 
 import purescala.Expressions._
-import xlang.Trees._
+import xlang.Expressions._
 import purescala.ExprOps._
 
-object TreeOps {
+object ExprOps {
   
   def isXLang(expr: Expr): Boolean = exists {
     case Block(_, _) | Assignment(_, _) |
diff --git a/src/main/scala/leon/xlang/Trees.scala b/src/main/scala/leon/xlang/Expressions.scala
similarity index 99%
rename from src/main/scala/leon/xlang/Trees.scala
rename to src/main/scala/leon/xlang/Expressions.scala
index 095340622..1e4cb75ab 100644
--- a/src/main/scala/leon/xlang/Trees.scala
+++ b/src/main/scala/leon/xlang/Expressions.scala
@@ -10,7 +10,7 @@ import purescala.Extractors._
 import purescala.{PrettyPrintable, PrinterContext}
 import utils._
 
-object Trees {
+object Expressions {
   import purescala.PrinterHelpers._
 
   case class Block(exprs: Seq[Expr], last: Expr) extends Expr with NAryExtractable with PrettyPrintable {
diff --git a/src/main/scala/leon/xlang/ImperativeCodeElimination.scala b/src/main/scala/leon/xlang/ImperativeCodeElimination.scala
index 5622b4e44..e3fc725b6 100644
--- a/src/main/scala/leon/xlang/ImperativeCodeElimination.scala
+++ b/src/main/scala/leon/xlang/ImperativeCodeElimination.scala
@@ -10,7 +10,7 @@ import leon.purescala.Extractors._
 import leon.purescala.Constructors._
 import leon.purescala.ExprOps._
 import leon.purescala.TypeOps._
-import leon.xlang.Trees._
+import leon.xlang.Expressions._
 
 object ImperativeCodeElimination extends LeonPhase[Program, (Program, Set[FunDef])] {
 
diff --git a/src/main/scala/leon/xlang/NoXLangFeaturesChecking.scala b/src/main/scala/leon/xlang/NoXLangFeaturesChecking.scala
index 38a42c494..80f0e1a72 100644
--- a/src/main/scala/leon/xlang/NoXLangFeaturesChecking.scala
+++ b/src/main/scala/leon/xlang/NoXLangFeaturesChecking.scala
@@ -8,7 +8,7 @@ import purescala.Definitions._
 
 import utils.Position
 
-import xlang.Trees._
+import xlang.Expressions._
 
 object NoXLangFeaturesChecking extends UnitPhase[Program] {
 
-- 
GitLab