purescala is now independent from the plugin... good for us if we ever want another front-end

src/funcheck/AnalysisComponent.scala

@@ -6,7 +6,6 @@ import scalacheck._
 
 class AnalysisComponent(val global: Global, val pluginInstance: FunCheckPlugin)
   extends PluginComponent
-  with NameAnalyzer
   with CodeExtraction
   // with ScalaCheckIntegrator // Mirco's stuff.
 {

src/funcheck/CodeExtraction.scala

@@ -26,7 +26,7 @@ trait CodeExtraction extends Extractors {
       case None => stopIfErrors; scala.Predef.error("unreachable error.")
     }
 
-    def st2ps(tree: Tree): funcheck.purescala.TypeTrees.TypeTree = toPureScalaType(unit)(tree) match {
+    def st2ps(tree: Tree): purescala.TypeTrees.TypeTree = toPureScalaType(unit)(tree) match {
       case Some(tt) => tt
       case None => stopIfErrors; scala.Predef.error("unreachable error.")
     }
@@ -140,7 +140,7 @@ trait CodeExtraction extends Extractors {
     }
   }
 
-  def toPureScalaType(unit: CompilationUnit)(typeTree: Tree): Option[funcheck.purescala.TypeTrees.TypeTree] = {
+  def toPureScalaType(unit: CompilationUnit)(typeTree: Tree): Option[purescala.TypeTrees.TypeTree] = {
     try {
       Some(scalaType2PureScala(unit, false)(typeTree))
     } catch {
@@ -180,7 +180,7 @@ trait CodeExtraction extends Extractors {
     rec(tree)
   }
 
-  private def scalaType2PureScala(unit: CompilationUnit, silent: Boolean)(tree: Tree): funcheck.purescala.TypeTrees.TypeTree = {
+  private def scalaType2PureScala(unit: CompilationUnit, silent: Boolean)(tree: Tree): purescala.TypeTrees.TypeTree = {
     tree match {
       case tt: TypeTree if tt.tpe == IntClass.tpe => Int32Type
       case tt: TypeTree if tt.tpe == BooleanClass.tpe => BooleanType

src/funcheck/NameAnalyzer.scala

-package funcheck
-
-import scala.tools.nsc._
-import scala.tools.nsc.plugins._
-
-import purescala.Definitions._
-import purescala.Trees._
-import purescala.TypeTrees._
-import purescala.Common._
-
-trait NameAnalyzer extends Extractors {
-  self: AnalysisComponent =>
-
-  import global._
-  import StructuralExtractors._
-  
-  def collectNames(unit: CompilationUnit): Unit = {
-
-  }
-}

src/purescala/Common.scala

-package funcheck.purescala
+package purescala
 
 object Common {
   type Identifier = String

src/purescala/Definitions.scala

-package funcheck.purescala
+package purescala
 
 object Definitions {
   import Common._

src/purescala/PrettyPrinter.scala

-package funcheck.purescala
+package purescala
 
 
 /** This pretty-printer uses Unicode for some operators, to make sure we

src/purescala/Trees.scala

-package funcheck.purescala
-
+package purescala
 
 /** AST definitions for Pure Scala. */
 object Trees {

src/purescala/TypeTrees.scala

-package funcheck.purescala
+package purescala
 
 object TypeTrees {
   import Common._