More changed to accomodate stainless

src/main/scala/inox/ast/CallGraph.scala

@@ -6,7 +6,7 @@ package ast
 import utils.Graphs._
 
 trait CallGraph {
-  private[ast] val trees: Trees
+  protected val trees: Trees
   import trees._
   import trees.exprOps._
   protected val symbols: Symbols

src/main/scala/inox/ast/Constructors.scala

@@ -10,7 +10,7 @@ package ast
   * @define encodingof Encoding of
   *  */
 trait Constructors {
-  private[ast] val trees: Trees
+  protected val trees: Trees
   import trees._
   import trees.exprOps._
   protected implicit val symbols: Symbols

src/main/scala/inox/ast/Definitions.scala

@@ -96,7 +96,7 @@ trait Definitions { self: Trees =>
     val classes: Map[Identifier, ClassDef]
     val functions: Map[Identifier, FunDef]
 
-    private[ast] val trees: self.type = self
+    protected val trees: self.type = self
     protected val symbols: this.type = this
 
     // @nv: this is a hack to reinject `this` into the set of implicits

src/main/scala/inox/ast/ExprOps.scala

@@ -48,7 +48,7 @@ trait ExprOps extends GenTreeOps {
     case _ => None
   } (expr)
 
-  object VariableExtractor {
+  protected class VariableExtractor {
     def unapply(e: Expr): Option[(Set[Variable], Set[Variable])] = e match {
       case v: Variable => Some((Set(v), Set.empty))
       case Let(vd, _, _) => Some((Set.empty, Set(vd.toVariable)))
@@ -59,6 +59,8 @@ trait ExprOps extends GenTreeOps {
     }
   }
 
+  protected val VariableExtractor = new VariableExtractor
+
   /** Returns the set of free variables in an expression */
   def variablesOf(expr: Expr): Set[Variable] = {
     fold[Set[Variable]] { case (e, subs) =>

src/main/scala/inox/ast/Trees.scala

@@ -35,11 +35,11 @@ trait Trees
     override def toString = asString(PrinterOptions.fromContext(InoxContext.printNames))
   }
 
-  object exprOps extends {
+  val exprOps: ExprOps { val trees: Trees.this.type } = new {
     protected val trees: Trees.this.type = Trees.this
   } with ExprOps
 
-  object dsl extends {
+  val dsl: DSL { val trees: Trees.this.type } = new {
     protected val trees: Trees.this.type = Trees.this
   } with DSL
 

src/main/scala/inox/ast/TypeOps.scala

@@ -4,7 +4,7 @@ package inox
 package ast
 
 trait TypeOps {
-  private[ast] val trees: Trees
+  protected val trees: Trees
   import trees._
   protected implicit val symbols: Symbols