Make toNamed invert serialize (#709)

Fixes #708

1 files changed, 2 insertions, 4 deletions

diff --git a/src/main/scala/firrtl/annotations/AnnotationUtils.scala b/src/main/scala/firrtl/annotations/AnnotationUtils.scala
index 1cdb7d18..ab580e88 100644
--- a/src/main/scala/firrtl/annotations/AnnotationUtils.scala
+++ b/src/main/scala/firrtl/annotations/AnnotationUtils.scala
@@ -43,9 +43,8 @@ object AnnotationUtils {
 
   def toNamed(s: String): Named = tokenize(s) match {
     case Seq(n) => CircuitName(n)
-    case Seq(c, m) => ModuleName(m, CircuitName(c))
-    case Seq(c, m) => ModuleName(m, CircuitName(c))
-    case Seq(c, m, x) => ComponentName(x, ModuleName(m, CircuitName(c)))
+    case Seq(c, ".", m) => ModuleName(m, CircuitName(c))
+    case Seq(c, ".", m, ".", x) => ComponentName(x, ModuleName(m, CircuitName(c)))
   }
 
   /** Given a serialized component/subcomponent reference, subindex, subaccess,
@@ -85,4 +84,3 @@ object AnnotationUtils {
     } else error(s"Cannot convert $s into an expression.")
   }
 }
-