From cf6f42f2b7612b94cf9b53a6d55da87c98062e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ali=20Sinan=20K=C3=B6ksal?= <alisinan@gmail.com>
Date: Thu, 24 Mar 2011 17:06:24 +0000
Subject: [PATCH] rename ancestor plugin class
---
project/build/funcheck.scala | 2 ++
src/funcheck/CPPlugin.scala | 2 +-
src/funcheck/Extractors.scala | 2 +-
src/funcheck/FunCheckPlugin.scala | 2 +-
src/funcheck/{AbstractPlugin.scala => PluginBase.scala} | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
rename src/funcheck/{AbstractPlugin.scala => PluginBase.scala} (81%)
diff --git a/project/build/funcheck.scala b/project/build/funcheck.scala
index b4e503d0e..705da8b7e 100644
--- a/project/build/funcheck.scala
+++ b/project/build/funcheck.scala
@@ -9,6 +9,7 @@ class FunCheckProject(info: ProjectInfo) extends DefaultProject(info) with FileT
lazy val purescala = project(".", "PureScala Definitions", new PureScalaProject(_))
lazy val plugin = project(".", "FunCheck Plugin", new PluginProject(_), purescala, multisetsLib)
+ // lazy val cp = project(".", "Constraint programming plugin", new CPProject(_), purescala, multisetsLib, plugin)
lazy val multisetsLib = project(".", "Multiset Placeholder Library", new MultisetsLibProject(_))
lazy val multisets = project(".", "Multiset Solver", new MultisetsProject(_), plugin, purescala, multisetsLib)
lazy val orderedsets = project(".", "Ordered Sets Solver", new OrderedSetsProject(_), plugin, purescala)
@@ -17,6 +18,7 @@ class FunCheckProject(info: ProjectInfo) extends DefaultProject(info) with FileT
lazy val extensionJars : List[Path] = multisetsLib.jarPath :: multisets.jarPath :: orderedsets.jarPath :: setconstraints.jarPath :: Nil
val scriptPath: Path = "." / "funcheck"
+ val cpScriptPath: Path = "." / "scalac-cp"
lazy val all = task { None } dependsOn(generateScript) describedAs("Compile everything and produce a script file.")
diff --git a/src/funcheck/CPPlugin.scala b/src/funcheck/CPPlugin.scala
index e39cc73d0..386b5083c 100644
--- a/src/funcheck/CPPlugin.scala
+++ b/src/funcheck/CPPlugin.scala
@@ -5,7 +5,7 @@ import scala.tools.nsc.{Global,Phase}
import scala.tools.nsc.plugins.{Plugin,PluginComponent}
/** This class is the entry point for the plugin. */
-class CPPlugin(val global: Global) extends AbstractPlugin {
+class CPPlugin(val global: Global) extends PluginBase {
import global._
val name = "constraint-programming"
diff --git a/src/funcheck/Extractors.scala b/src/funcheck/Extractors.scala
index bf92c52e2..79ace4187 100644
--- a/src/funcheck/Extractors.scala
+++ b/src/funcheck/Extractors.scala
@@ -5,7 +5,7 @@ import scala.tools.nsc._
/** Contains extractors to pull-out interesting parts of the Scala ASTs. */
trait Extractors {
val global: Global
- val pluginInstance: AbstractPlugin
+ val pluginInstance: PluginBase
import global._
import global.definitions._
diff --git a/src/funcheck/FunCheckPlugin.scala b/src/funcheck/FunCheckPlugin.scala
index 247c77f37..40f5df8f0 100644
--- a/src/funcheck/FunCheckPlugin.scala
+++ b/src/funcheck/FunCheckPlugin.scala
@@ -5,7 +5,7 @@ import scala.tools.nsc.{Global,Phase}
import scala.tools.nsc.plugins.{Plugin,PluginComponent}
/** This class is the entry point for the plugin. */
-class FunCheckPlugin(val global: Global) extends AbstractPlugin {
+class FunCheckPlugin(val global: Global) extends PluginBase {
import global._
val name = "funcheck"
diff --git a/src/funcheck/AbstractPlugin.scala b/src/funcheck/PluginBase.scala
similarity index 81%
rename from src/funcheck/AbstractPlugin.scala
rename to src/funcheck/PluginBase.scala
index 07847a298..62a5e83e3 100644
--- a/src/funcheck/AbstractPlugin.scala
+++ b/src/funcheck/PluginBase.scala
@@ -4,7 +4,7 @@ import scala.tools.nsc
import scala.tools.nsc.{Global,Phase}
import scala.tools.nsc.plugins.{Plugin,PluginComponent}
-abstract class AbstractPlugin extends Plugin {
+abstract class PluginBase extends Plugin {
import global._
var silentlyTolerateNonPureBodies: Boolean = false
--
GitLab