Addresses #459. Rewords transform annotations API.

Now, any annotation not propagated by a transform is considered deleted.
A new DeletedAnnotation is added in place of it.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/scala/firrtl/passes/wiring/WiringTransform.scala b/src/main/scala/firrtl/passes/wiring/WiringTransform.scala
index a4f7245b..5a35d85c 100644
--- a/src/main/scala/firrtl/passes/wiring/WiringTransform.scala
+++ b/src/main/scala/firrtl/passes/wiring/WiringTransform.scala
@@ -69,7 +69,7 @@ class WiringTransform extends Transform with SimpleRun {
         ResolveKinds,
         ResolveGenders)
   def execute(state: CircuitState): CircuitState = getMyAnnotations(state) match {
-    case Nil => CircuitState(state.circuit, state.form)
+    case Nil => state
     case p => 
       val sinks = mutable.HashMap[String, Set[String]]()
       val sources = mutable.HashMap[String, String]()
@@ -84,12 +84,12 @@ class WiringTransform extends Transform with SimpleRun {
         case TopAnnotation(m, pin) => tops(pin) = m.name
       }
       (sources.size, tops.size, sinks.size, comp.size) match {
-        case (0, 0, p, 0) => state.copy(annotations = None)
+        case (0, 0, p, 0) => state
         case (s, t, p, c) if (p > 0) & (s == t) & (t == c) =>
           val wis = tops.foldLeft(Seq[WiringInfo]()) { case (seq, (pin, top)) =>
             seq :+ WiringInfo(sources(pin), comp(pin), sinks("pin:" + pin), pin, top)
           }
-          state.copy(circuit = runPasses(state.circuit, passSeq(wis)), annotations = None)
+          state.copy(circuit = runPasses(state.circuit, passSeq(wis)))
         case _ => error("Wrong number of sources, tops, or sinks!")
       }
   }