Added typer.Mode

Replaces desugar.Mode. Is now a value class representing a set.

2 files changed, 6 insertions, 4 deletions

diff --git a/test/test/DeSugarTest.scala b/test/test/DeSugarTest.scala
index 45967a9dd..09d97872b 100644
--- a/test/test/DeSugarTest.scala
+++ b/test/test/DeSugarTest.scala
@@ -10,6 +10,7 @@ import dotty.tools.dotc._
 import ast.Trees._
 import ast.desugar
 import ast.desugar._
+import typer.Mode
 
 import scala.collection.mutable.ListBuffer
 
@@ -20,16 +21,16 @@ class DeSugarTest extends ParserTest {
   import Mode._
 
   object DeSugar extends TreeTransformer {
-    var curMode: Mode.Value = Mode.Expr
-    def withMode[T](mode: Mode.Value)(op: => T) = {
+    var curMode: Mode = Mode.Expr
+    def withMode[T](mode: Mode)(op: => T) = {
       val saved = curMode
       curMode = mode
       try op
       finally curMode = saved
     }
 
-    def transform(tree: Tree, mode: Mode.Value): Tree = withMode(mode) { transform(tree) }
-    def transform(trees: List[Tree], mode: Mode.Value): List[Tree] = withMode(mode) { transform(trees) }
+    def transform(tree: Tree, mode: Mode): Tree = withMode(mode) { transform(tree) }
+    def transform(trees: List[Tree], mode: Mode): List[Tree] = withMode(mode) { transform(trees) }
 
     override def transform(tree: Tree): Tree = {
       val tree1 = desugar(tree, curMode)
diff --git a/test/test/showTree.scala b/test/test/showTree.scala
index 957131cf7..9476d994b 100644
--- a/test/test/showTree.scala
+++ b/test/test/showTree.scala
@@ -3,6 +3,7 @@ import dotty.tools.dotc._
 import ast.Trees._
 import ast.desugar
 import ast.desugar._
+import typer.Mode
 
 object showTree extends DeSugarTest {