Fix annotations (#366)

getMyAnnotations now returns Seq[Annotation]
Changed test to check number of annotations is the same

1 files changed, 3 insertions, 7 deletions

diff --git a/src/main/scala/firrtl/passes/memlib/InferReadWrite.scala b/src/main/scala/firrtl/passes/memlib/InferReadWrite.scala
index 16175e2c..6b56c5e8 100644
--- a/src/main/scala/firrtl/passes/memlib/InferReadWrite.scala
+++ b/src/main/scala/firrtl/passes/memlib/InferReadWrite.scala
@@ -153,12 +153,8 @@ class InferReadWrite extends Transform with PassBased {
     ResolveKinds,
     ResolveGenders
   )
-  def execute(state: CircuitState): CircuitState = {
-    val result = for {
-      myAnnotations <- getMyAnnotations(state)
-      InferReadWriteAnnotation(_) <- myAnnotations get CircuitName(state.circuit.main)
-      resCircuit = runPasses(state.circuit)
-    } yield state.copy(circuit = resCircuit)
-    result getOrElse state // Return state if nothing to do
+  def execute(state: CircuitState): CircuitState = getMyAnnotations(state) match {
+    case Nil => CircuitState(state.circuit, state.form)
+    case Seq(InferReadWriteAnnotation(_)) => CircuitState(runPasses(state.circuit), state.form)
   }
 }