disabled transmatch for the moment

2 files changed, 13 insertions, 9 deletions

diff --git a/config/list/nsc.lst b/config/list/nsc.lst
index 5f6143184e..35e99779ac 100644
--- a/config/list/nsc.lst
+++ b/config/list/nsc.lst
@@ -23,6 +23,12 @@ ast/parser/Parsers.scala
 ast/parser/Scanners.scala
 ast/parser/Tokens.scala
 
+#matching/CodeFactory.scala
+#matching/PatternMatcher.scala
+#matching/PatternNodeCreator.scala
+#matching/PatternUtil.scala
+#matching/TransMatcher.scala
+
 symtab/Definitions.scala
 symtab/Flags.scala
 symtab/InfoTransformers.scala
@@ -43,8 +49,6 @@ symtab/classfile/Pickler.scala
 symtab/classfile/SymblfileParser.scala
 symtab/classfile/UnPickler.scala
 
-transmatch/TransMatcher.scala
-
 typechecker/Analyzer.scala
 typechecker/ConstantFolder.scala
 typechecker/Contexts.scala
diff --git a/sources/scala/tools/nsc/Global.scala b/sources/scala/tools/nsc/Global.scala
index 0f8e785d8c..5358a5f3d9 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 transmatch._;
+import matching._;
 import transform._;
 
 class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable with Trees with CompilationUnits {
@@ -143,9 +143,9 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
   }
   val infer = new analyzer.Inferencer(analyzer.NoContext);
 
-  object transmatcher extends TransMatcher {
-    val global: Global.this.type = Global.this;
-  }
+  //object transmatcher extends TransMatcher {
+  //  val global: Global.this.type = Global.this;
+  //}
 
   object sampleTransform extends SampleTransform {
     val global: Global.this.type = Global.this;
@@ -154,9 +154,9 @@ class Global(val settings: Settings, val reporter: Reporter) extends SymbolTable
   val namerPhase = new analyzer.NamerPhase(parserPhase);
   val typeCheckPhase = new analyzer.TypeCheckPhase(namerPhase);
   val picklePhase = new pickler.PicklePhase(typeCheckPhase);
-  val transMatchPhase = new transmatcher.TransMatchPhase(picklePhase);
-  val samplePhase = new sampleTransform.Phase(transMatchPhase);
-
+  //val transMatchPhase = new transmatcher.TransMatchPhase(picklePhase);
+  //val samplePhase = new sampleTransform.Phase(transMatchPhase);
+  val samplePhase = new sampleTransform.Phase(typeCheckPhase);
 /*
   object icode extends ICode {
     val symtab: Global.this.type = Global.this