From 1683c95e159006d40a8458d29ef266ca741752c7 Mon Sep 17 00:00:00 2001
From: Som Snytt <som.snytt@gmail.com>
Date: Thu, 25 Jul 2013 12:58:56 -0700
Subject: SI-7622 Clean Up Phase Assembly

Let optimiser components and continuations plugin opt-out
when required flags are not set.

Wasted time on a whitespace error in check file, so let
--debug dump the processed check file and its diff.
---
 .../neg/t7494-cyclic-dependency/ThePlugin.scala    | 41 ----------------------
 .../neg/t7494-cyclic-dependency/sample_2.flags     |  1 -
 .../neg/t7494-cyclic-dependency/sample_2.scala     |  6 ----
 .../neg/t7494-cyclic-dependency/scalac-plugin.xml  |  5 ---
 4 files changed, 53 deletions(-)
 delete mode 100644 test/pending/neg/t7494-cyclic-dependency/ThePlugin.scala
 delete mode 100644 test/pending/neg/t7494-cyclic-dependency/sample_2.flags
 delete mode 100644 test/pending/neg/t7494-cyclic-dependency/sample_2.scala
 delete mode 100644 test/pending/neg/t7494-cyclic-dependency/scalac-plugin.xml

(limited to 'test/pending/neg')

diff --git a/test/pending/neg/t7494-cyclic-dependency/ThePlugin.scala b/test/pending/neg/t7494-cyclic-dependency/ThePlugin.scala
deleted file mode 100644
index bd94ce60d7..0000000000
--- a/test/pending/neg/t7494-cyclic-dependency/ThePlugin.scala
+++ /dev/null
@@ -1,41 +0,0 @@
-package scala.test.plugins
-
-import scala.tools.nsc
-import nsc.Global
-import nsc.Phase
-import nsc.plugins.Plugin
-import nsc.plugins.PluginComponent
-
-class ThePlugin(val global: Global) extends Plugin {
-  import global._
-
-  val name = "cyclicdependency"
-  val description = "Declares two phases that have a cyclic dependency"
-  val components = List[PluginComponent](thePhase1,thePhase2)
-  
-  private object thePhase1 extends PluginComponent {
-    val global = ThePlugin.this.global
-
-    val runsAfter = List[String]("tailcalls","cyclicdependency2")
-
-    val phaseName = ThePlugin.this.name + "1"
-
-    def newPhase(prev: Phase) = new ThePhase(prev)    
-  }
-  
-  private object thePhase2 extends PluginComponent {
-    val global = ThePlugin.this.global
-
-    val runsAfter = List[String]("dce","cyclicdependency1")
-
-    val phaseName = ThePlugin.this.name + "2"
-
-    def newPhase(prev: Phase) = new ThePhase(prev)    
-  }
-  
-  private class ThePhase(prev: Phase) extends Phase(prev) {
-    def name = ThePlugin.this.name
-    def run {}
-  }
-}
-
diff --git a/test/pending/neg/t7494-cyclic-dependency/sample_2.flags b/test/pending/neg/t7494-cyclic-dependency/sample_2.flags
deleted file mode 100644
index db25b88a12..0000000000
--- a/test/pending/neg/t7494-cyclic-dependency/sample_2.flags
+++ /dev/null
@@ -1 +0,0 @@
--Xplugin:. -Xplugin-require:cyclicdependency
diff --git a/test/pending/neg/t7494-cyclic-dependency/sample_2.scala b/test/pending/neg/t7494-cyclic-dependency/sample_2.scala
deleted file mode 100644
index 73cdc64e40..0000000000
--- a/test/pending/neg/t7494-cyclic-dependency/sample_2.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-
-package sample
-
-// just a sample that is compiled with the sample plugin enabled
-object Sample extends App {
-}
diff --git a/test/pending/neg/t7494-cyclic-dependency/scalac-plugin.xml b/test/pending/neg/t7494-cyclic-dependency/scalac-plugin.xml
deleted file mode 100644
index 2558d6fd03..0000000000
--- a/test/pending/neg/t7494-cyclic-dependency/scalac-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<plugin>
-  <name>ignored</name>
-  <classname>scala.test.plugins.ThePlugin</classname>
-</plugin>
-
-- 
cgit v1.2.3