From dede3cc1c2f0d47f58a418449bdf8347157c7e42 Mon Sep 17 00:00:00 2001
From: Philippe Suter <philippe.suter@gmail.com>
Date: Thu, 29 Apr 2010 15:12:32 +0000
Subject: [PATCH] purescala is now independent from the plugin... good for us
 if we ever want another front-end

---
 src/funcheck/AnalysisComponent.scala |  1 -
 src/funcheck/CodeExtraction.scala    |  6 +++---
 src/funcheck/NameAnalyzer.scala      | 20 --------------------
 src/purescala/Common.scala           |  2 +-
 src/purescala/Definitions.scala      |  2 +-
 src/purescala/PrettyPrinter.scala    |  2 +-
 src/purescala/Trees.scala            |  3 +--
 src/purescala/TypeTrees.scala        |  2 +-
 8 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 src/funcheck/NameAnalyzer.scala

diff --git a/src/funcheck/AnalysisComponent.scala b/src/funcheck/AnalysisComponent.scala
index 3670c40d3..d09ff681a 100644
--- a/src/funcheck/AnalysisComponent.scala
+++ b/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.
 {
diff --git a/src/funcheck/CodeExtraction.scala b/src/funcheck/CodeExtraction.scala
index cd63fc299..32e75bf1f 100644
--- a/src/funcheck/CodeExtraction.scala
+++ b/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
diff --git a/src/funcheck/NameAnalyzer.scala b/src/funcheck/NameAnalyzer.scala
deleted file mode 100644
index 2421ed7f3..000000000
--- a/src/funcheck/NameAnalyzer.scala
+++ /dev/null
@@ -1,20 +0,0 @@
-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 = {
-
-  }
-}
diff --git a/src/purescala/Common.scala b/src/purescala/Common.scala
index a4a8273e9..cfbe10b3a 100644
--- a/src/purescala/Common.scala
+++ b/src/purescala/Common.scala
@@ -1,4 +1,4 @@
-package funcheck.purescala
+package purescala
 
 object Common {
   type Identifier = String
diff --git a/src/purescala/Definitions.scala b/src/purescala/Definitions.scala
index ae1ea6039..da78954e4 100644
--- a/src/purescala/Definitions.scala
+++ b/src/purescala/Definitions.scala
@@ -1,4 +1,4 @@
-package funcheck.purescala
+package purescala
 
 object Definitions {
   import Common._
diff --git a/src/purescala/PrettyPrinter.scala b/src/purescala/PrettyPrinter.scala
index 6de4afa00..e2205cd68 100644
--- a/src/purescala/PrettyPrinter.scala
+++ b/src/purescala/PrettyPrinter.scala
@@ -1,4 +1,4 @@
-package funcheck.purescala
+package purescala
 
 
 /** This pretty-printer uses Unicode for some operators, to make sure we
diff --git a/src/purescala/Trees.scala b/src/purescala/Trees.scala
index 1a14d5d4b..b158d2bab 100644
--- a/src/purescala/Trees.scala
+++ b/src/purescala/Trees.scala
@@ -1,5 +1,4 @@
-package funcheck.purescala
-
+package purescala
 
 /** AST definitions for Pure Scala. */
 object Trees {
diff --git a/src/purescala/TypeTrees.scala b/src/purescala/TypeTrees.scala
index 1ff91b436..f6f52a272 100644
--- a/src/purescala/TypeTrees.scala
+++ b/src/purescala/TypeTrees.scala
@@ -1,4 +1,4 @@
-package funcheck.purescala
+package purescala
 
 object TypeTrees {
   import Common._
-- 
GitLab