*** empty log message ***

1 files changed, 5 insertions, 6 deletions

diff --git a/sources/scala/tools/nsc/Global.scala b/sources/scala/tools/nsc/Global.scala
index ef00c40ce1..e683b63be9 100755
--- a/sources/scala/tools/nsc/Global.scala
+++ b/sources/scala/tools/nsc/Global.scala
@@ -16,7 +16,7 @@ import util._;
 import ast._;
 import ast.parser._;
 import typechecker._;
-//import matching.TransMatcher;
+import matching.TransMatcher;
 import transform._;
 
 class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable with Trees with CompilationUnits {
@@ -170,13 +170,12 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
   }
   val uncurryPhase = new uncurry.Phase(refchecksPhase);
 
-/*
   object transmatcher extends TransMatcher {
     val global: Global.this.type = Global.this;
 
   }
-*/
-  //val transMatchPhase = new transmatcher.Phase(uncurryPhase);
+
+  val transMatchPhase = new transmatcher.Phase(uncurryPhase);
   //object typesAsValues extends TypesAsValues {
   //  val global: Global.this.type = Global.this;
   //}
@@ -184,7 +183,7 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
   object sampleTransform extends SampleTransform {
     val global: Global.this.type = Global.this;
   }
-  val samplePhase = new sampleTransform.Phase(uncurryPhase);
+  val samplePhase = new sampleTransform.Phase(transMatchPhase);
 
   //val transMatchPhase = new transmatcher.TransMatchPhase(picklePhase);
 /*
@@ -245,7 +244,7 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
 	informTime(globalPhase.description, startTime);
       }
       globalPhase = if (settings.stop contains globalPhase.name) terminalPhase else globalPhase.next;
-      if (settings.check contains globalPhase.name) checker.checkTrees;
+      if (settings.check contains globalPhase.name) { phase = globalPhase; checker.checkTrees; }
     }
     if (settings.Xshowcls.value != "") showDef(newTermName(settings.Xshowcls.value), false);
     if (settings.Xshowobj.value != "") showDef(newTermName(settings.Xshowobj.value), true);