From 3c3ac6fb53982c3ccf542dd27797ae2e10d40ebe Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Sat, 23 Jul 2016 22:33:52 +0200
Subject: [PATCH] More private fields
---
src/main/scala/inox/ast/CallGraph.scala | 2 +-
src/main/scala/inox/ast/Constructors.scala | 2 +-
src/main/scala/inox/ast/Definitions.scala | 4 ++--
src/main/scala/inox/ast/ExprOps.scala | 1 -
src/main/scala/inox/ast/GenTreeOps.scala | 2 +-
src/main/scala/inox/ast/TreeOps.scala | 2 +-
src/main/scala/inox/ast/Trees.scala | 2 +-
src/main/scala/inox/ast/TypeOps.scala | 2 +-
8 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/scala/inox/ast/CallGraph.scala b/src/main/scala/inox/ast/CallGraph.scala
index fd00dd082..11e39b1c7 100644
--- a/src/main/scala/inox/ast/CallGraph.scala
+++ b/src/main/scala/inox/ast/CallGraph.scala
@@ -6,7 +6,7 @@ package ast
import utils.Graphs._
trait CallGraph {
- val trees: Trees
+ private[ast] val trees: Trees
import trees._
import trees.exprOps._
val symbols: Symbols
diff --git a/src/main/scala/inox/ast/Constructors.scala b/src/main/scala/inox/ast/Constructors.scala
index fed2d4ce1..4b6781e83 100644
--- a/src/main/scala/inox/ast/Constructors.scala
+++ b/src/main/scala/inox/ast/Constructors.scala
@@ -10,7 +10,7 @@ package ast
* @define encodingof Encoding of
* */
trait Constructors {
- val trees: Trees
+ private[ast] val trees: Trees
import trees._
import trees.exprOps._
implicit val symbols: Symbols
diff --git a/src/main/scala/inox/ast/Definitions.scala b/src/main/scala/inox/ast/Definitions.scala
index 47903f24f..b6d136c2c 100644
--- a/src/main/scala/inox/ast/Definitions.scala
+++ b/src/main/scala/inox/ast/Definitions.scala
@@ -87,7 +87,7 @@ trait Definitions { self: Trees =>
with Constructors
with Paths {
- val trees: self.type = self
+ private[ast] val trees: self.type = self
val symbols: this.type = this
// @nv: this is a hack to reinject `this` into the set of implicits
@@ -271,7 +271,7 @@ trait Definitions { self: Trees =>
}
case class TypedAbstractClassDef(cd: AbstractClassDef, tps: Seq[Type])(implicit val symbols: Symbols) extends TypedClassDef {
- def descendants: Seq[TypedClassDef] = cd.descendants.map(_.typed(tps))
+ def descendants: Seq[TypedCaseClassDef] = cd.descendants.map(_.typed(tps))
}
case class TypedCaseClassDef(cd: CaseClassDef, tps: Seq[Type])(implicit val symbols: Symbols) extends TypedClassDef {
diff --git a/src/main/scala/inox/ast/ExprOps.scala b/src/main/scala/inox/ast/ExprOps.scala
index dd88569e7..c5d3a275e 100644
--- a/src/main/scala/inox/ast/ExprOps.scala
+++ b/src/main/scala/inox/ast/ExprOps.scala
@@ -26,7 +26,6 @@ import scala.reflect._
*
*/
trait ExprOps extends GenTreeOps {
- val trees: Trees
import trees._
type SubTree = Expr
diff --git a/src/main/scala/inox/ast/GenTreeOps.scala b/src/main/scala/inox/ast/GenTreeOps.scala
index 7e179f003..d75706378 100644
--- a/src/main/scala/inox/ast/GenTreeOps.scala
+++ b/src/main/scala/inox/ast/GenTreeOps.scala
@@ -23,7 +23,7 @@ trait TreeExtractor {
* @tparam SubTree The type of the tree
*/
trait GenTreeOps {
- val trees: Trees
+ private[ast] val trees: Trees
import trees._
type SubTree <: Tree
diff --git a/src/main/scala/inox/ast/TreeOps.scala b/src/main/scala/inox/ast/TreeOps.scala
index cbd7b36ad..1fbfbf6a0 100644
--- a/src/main/scala/inox/ast/TreeOps.scala
+++ b/src/main/scala/inox/ast/TreeOps.scala
@@ -3,7 +3,7 @@ package inox
package ast
trait TreeOps {
- val trees: Trees
+ private[ast] val trees: Trees
import trees._
trait TreeTransformer {
diff --git a/src/main/scala/inox/ast/Trees.scala b/src/main/scala/inox/ast/Trees.scala
index a8a6bdf3a..426a6e9c9 100644
--- a/src/main/scala/inox/ast/Trees.scala
+++ b/src/main/scala/inox/ast/Trees.scala
@@ -27,7 +27,7 @@ trait Trees extends Expressions with Extractors with Types with Definitions with
}
object exprOps extends {
- val trees: Trees.this.type = Trees.this
+ private[ast] val trees: Trees.this.type = Trees.this
} with ExprOps
/** Represents a unique symbol in Inox.
diff --git a/src/main/scala/inox/ast/TypeOps.scala b/src/main/scala/inox/ast/TypeOps.scala
index d02ceb26c..44abc861a 100644
--- a/src/main/scala/inox/ast/TypeOps.scala
+++ b/src/main/scala/inox/ast/TypeOps.scala
@@ -4,7 +4,7 @@ package inox
package ast
trait TypeOps {
- val trees: Trees
+ private[ast] val trees: Trees
import trees._
implicit val symbols: Symbols
--
GitLab