API Cleanup - AST

trait AST -> abstract class FirrtlNode
Move all IR to new package ir
Add import of firrtl.ir._

11 files changed, 22 insertions, 11 deletions

diff --git a/src/test/scala/firrtlTests/AnnotationTests.scala b/src/test/scala/firrtlTests/AnnotationTests.scala
index 81a74b54..e04b4e14 100644
--- a/src/test/scala/firrtlTests/AnnotationTests.scala
+++ b/src/test/scala/firrtlTests/AnnotationTests.scala
@@ -6,8 +6,9 @@ import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 import org.scalatest.junit.JUnitRunner
 
-import firrtl.{Parser,Circuit}
+import firrtl.ir.Circuit
 import firrtl.{
+   Parser,
    Named,
    ModuleName,
    ComponentName,
diff --git a/src/test/scala/firrtlTests/CheckInitializationSpec.scala b/src/test/scala/firrtlTests/CheckInitializationSpec.scala
index 49d5bc08..515bbfc8 100644
--- a/src/test/scala/firrtlTests/CheckInitializationSpec.scala
+++ b/src/test/scala/firrtlTests/CheckInitializationSpec.scala
@@ -30,7 +30,8 @@ package firrtlTests
 import java.io._
 import org.scalatest._
 import org.scalatest.prop._
-import firrtl._
+import firrtl.Parser
+import firrtl.ir.Circuit
 import firrtl.Parser.IgnoreInfo
 import firrtl.passes._
 
diff --git a/src/test/scala/firrtlTests/CheckSpec.scala b/src/test/scala/firrtlTests/CheckSpec.scala
index 5c1b1a67..69645ddc 100644
--- a/src/test/scala/firrtlTests/CheckSpec.scala
+++ b/src/test/scala/firrtlTests/CheckSpec.scala
@@ -3,7 +3,8 @@ package firrtlTests
 import java.io._
 import org.scalatest._
 import org.scalatest.prop._
-import firrtl.{Parser,Circuit}
+import firrtl.Parser
+import firrtl.ir.Circuit
 import firrtl.passes.{Pass,ToWorkingIR,CheckHighForm,ResolveKinds,InferTypes,CheckTypes,PassExceptions}
 
 class CheckSpec extends FlatSpec with Matchers {
diff --git a/src/test/scala/firrtlTests/ChirrtlSpec.scala b/src/test/scala/firrtlTests/ChirrtlSpec.scala
index 858d43b6..d3e02ff1 100644
--- a/src/test/scala/firrtlTests/ChirrtlSpec.scala
+++ b/src/test/scala/firrtlTests/ChirrtlSpec.scala
@@ -30,7 +30,8 @@ package firrtlTests
 import java.io._
 import org.scalatest._
 import org.scalatest.prop._
-import firrtl.{Parser,Circuit}
+import firrtl.Parser
+import firrtl.ir.Circuit
 import firrtl.passes._
 
 class ChirrtlSpec extends FirrtlFlatSpec {
diff --git a/src/test/scala/firrtlTests/CompilerTests.scala b/src/test/scala/firrtlTests/CompilerTests.scala
index f66b39e6..ce70a992 100644
--- a/src/test/scala/firrtlTests/CompilerTests.scala
+++ b/src/test/scala/firrtlTests/CompilerTests.scala
@@ -6,12 +6,13 @@ import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 import org.scalatest.junit.JUnitRunner
 
-import firrtl.{Parser,Circuit}
+import firrtl.ir.Circuit
 import firrtl.{
    HighFirrtlCompiler,
    LowFirrtlCompiler,
    VerilogCompiler,
-   Compiler
+   Compiler,
+   Parser
 }
 
 /**
diff --git a/src/test/scala/firrtlTests/ConstantPropagationTests.scala b/src/test/scala/firrtlTests/ConstantPropagationTests.scala
index cfcb7f45..bfe58a2c 100644
--- a/src/test/scala/firrtlTests/ConstantPropagationTests.scala
+++ b/src/test/scala/firrtlTests/ConstantPropagationTests.scala
@@ -2,8 +2,9 @@ package firrtlTests
 
 import org.scalatest.Matchers
 import java.io.{StringWriter,Writer}
-import firrtl._
+import firrtl.ir.Circuit
 import firrtl.Parser.IgnoreInfo
+import firrtl.Parser
 import firrtl.passes._
 
 // Tests the following cases for constant propagation:
diff --git a/src/test/scala/firrtlTests/InlineInstancesTests.scala b/src/test/scala/firrtlTests/InlineInstancesTests.scala
index 52c01dc4..4a9f21bc 100644
--- a/src/test/scala/firrtlTests/InlineInstancesTests.scala
+++ b/src/test/scala/firrtlTests/InlineInstancesTests.scala
@@ -6,9 +6,10 @@ import org.scalatest.FlatSpec
 import org.scalatest.Matchers
 import org.scalatest.junit.JUnitRunner
 
-import firrtl.{Parser,Circuit}
+import firrtl.ir.Circuit
 import firrtl.passes.{PassExceptions,InlineCAKind}
 import firrtl.{
+   Parser,
    Named,
    ModuleName,
    ComponentName,
diff --git a/src/test/scala/firrtlTests/LowerTypesSpec.scala b/src/test/scala/firrtlTests/LowerTypesSpec.scala
index 736849f5..e9096139 100644
--- a/src/test/scala/firrtlTests/LowerTypesSpec.scala
+++ b/src/test/scala/firrtlTests/LowerTypesSpec.scala
@@ -4,7 +4,8 @@ package firrtlTests
 import java.io._
 import org.scalatest._
 import org.scalatest.prop._
-import firrtl.{Parser,Circuit}
+import firrtl.Parser
+import firrtl.ir.Circuit
 import firrtl.passes._
 
 class LowerTypesSpec extends FirrtlFlatSpec {
diff --git a/src/test/scala/firrtlTests/PassTests.scala b/src/test/scala/firrtlTests/PassTests.scala
index 38ecc7c3..efe7438c 100644
--- a/src/test/scala/firrtlTests/PassTests.scala
+++ b/src/test/scala/firrtlTests/PassTests.scala
@@ -4,7 +4,8 @@ import com.typesafe.scalalogging.LazyLogging
 import java.io.{StringWriter,Writer}
 import org.scalatest.{FlatSpec, Matchers}
 import org.scalatest.junit.JUnitRunner
-import firrtl.{Parser,Circuit,FIRRTLEmitter}
+import firrtl.{Parser,FIRRTLEmitter}
+import firrtl.ir.Circuit
 import firrtl.Parser.IgnoreInfo
 import firrtl.passes.{Pass, PassExceptions}
 import firrtl.{
diff --git a/src/test/scala/firrtlTests/UniquifySpec.scala b/src/test/scala/firrtlTests/UniquifySpec.scala
index 71f41074..6cc83c9c 100644
--- a/src/test/scala/firrtlTests/UniquifySpec.scala
+++ b/src/test/scala/firrtlTests/UniquifySpec.scala
@@ -30,7 +30,8 @@ package firrtlTests
 import java.io._
 import org.scalatest._
 import org.scalatest.prop._
-import firrtl.{Parser, Circuit}
+import firrtl.Parser
+import firrtl.ir.Circuit
 import firrtl.passes._
 
 class UniquifySpec extends FirrtlFlatSpec {
diff --git a/src/test/scala/firrtlTests/UnitTests.scala b/src/test/scala/firrtlTests/UnitTests.scala
index 98693c61..ead55755 100644
--- a/src/test/scala/firrtlTests/UnitTests.scala
+++ b/src/test/scala/firrtlTests/UnitTests.scala
@@ -31,6 +31,7 @@ import java.io._
 import org.scalatest._
 import org.scalatest.prop._
 import firrtl._
+import firrtl.ir.Circuit
 import firrtl.passes._
 import firrtl.Parser.IgnoreInfo