Annotations as Options Replacement, Immutable Option Parsing

build.sbt

@@ -62,7 +62,7 @@ libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"
 
 libraryDependencies += "org.scalacheck" %% "scalacheck" % "1.13.4" % "test"
 
-libraryDependencies += "com.github.scopt" %% "scopt" % "3.6.0"
+libraryDependencies += "com.github.scopt" %% "scopt" % "3.7.0"
 
 libraryDependencies += "net.jcazevedo" %% "moultingyaml" % "0.4.0"
 

src/main/resources/META-INF/services/firrtl.options.RegisteredLibrary

@@ -0,0 +1 @@
+firrtl.passes.memlib.MemLibOptions

src/main/resources/META-INF/services/firrtl.options.RegisteredTransform

@@ -0,0 +1,4 @@
+firrtl.transforms.DeadCodeElimination
+firrtl.transforms.CheckCombLoops
+firrtl.passes.InlineInstances
+firrtl.passes.clocklist.ClockListTransform

src/main/scala/firrtl/Compiler.scala

@@ -6,6 +6,7 @@ import logger._
 import java.io.Writer
 import annotations._
 import scala.collection.mutable
+import scopt.OptionParser
 
 import firrtl.annotations._  // Note that wildcard imports are not great....
 import firrtl.ir.Circuit
@@ -451,7 +452,7 @@ trait Compiler extends LazyLogging {
     */
   def compileAndEmit(state: CircuitState,
                      customTransforms: Seq[Transform] = Seq.empty): CircuitState = {
-    val emitAnno = EmitCircuitAnnotation(emitter.getClass)
+    val emitAnno = EmitterAnnotation(emitter.getClass)
     compile(state.copy(annotations = emitAnno +: state.annotations), customTransforms)
   }
 
@@ -477,4 +478,3 @@ trait Compiler extends LazyLogging {
   }
 
 }
-