Add ShellOption, DeletedWrapper

Abstracts away option writing such that users no longer have to
understand scopt semantics. This adds a ShellOption class and a
HasShellOptions trait for something which provides one or more
ShellOptions. This refactors the FIRRTL codebase to use this style of
option specification.

Adds and uses DeletedWrapper to automatically generate
DeletedAnnotations.

Signed-off-by: Schuyler Eldridge <schuyler.eldridge@ibm.com>

1 files changed, 10 insertions, 9 deletions

diff --git a/src/main/scala/firrtl/Driver.scala b/src/main/scala/firrtl/Driver.scala
index c8713e09..66e09e86 100644
--- a/src/main/scala/firrtl/Driver.scala
+++ b/src/main/scala/firrtl/Driver.scala
@@ -18,8 +18,8 @@ import firrtl.transforms._
 import firrtl.Utils.throwInternalError
 import firrtl.stage.{FirrtlExecutionResultView, FirrtlStage}
 import firrtl.stage.phases.DriverCompatibility
-import firrtl.options.{StageUtils, Phase}
-import firrtl.options.Viewer
+import firrtl.options.{StageUtils, Phase, Viewer}
+import firrtl.options.phases.DeletedWrapper
 
 
 /**
@@ -216,15 +216,16 @@ object Driver {
 
     val annos = optionsManager.firrtlOptions.toAnnotations ++ optionsManager.commonOptions.toAnnotations
 
-    val phases: Seq[Phase] = Seq(
-      new DriverCompatibility.AddImplicitAnnotationFile,
-      new DriverCompatibility.AddImplicitFirrtlFile,
-      new DriverCompatibility.AddImplicitOutputFile,
-      new DriverCompatibility.AddImplicitEmitter,
-      new FirrtlStage )
+    val phases: Seq[Phase] =
+      Seq( new DriverCompatibility.AddImplicitAnnotationFile,
+           new DriverCompatibility.AddImplicitFirrtlFile,
+           new DriverCompatibility.AddImplicitOutputFile,
+           new DriverCompatibility.AddImplicitEmitter,
+           new FirrtlStage )
+        .map(DeletedWrapper(_))
 
     val annosx = try {
-      phases.foldLeft(annos)( (a, p) => p.runTransform(a) )
+      phases.foldLeft(annos)( (a, p) => p.transform(a) )
     } catch {
       case e: firrtl.options.OptionsException => return FirrtlExecutionFailure(e.message)
     }