diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/scala/firrtl/annotations/JsonProtocol.scala | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/scala/firrtl/annotations/JsonProtocol.scala b/src/main/scala/firrtl/annotations/JsonProtocol.scala index 6908a3a1..24ebc781 100644 --- a/src/main/scala/firrtl/annotations/JsonProtocol.scala +++ b/src/main/scala/firrtl/annotations/JsonProtocol.scala @@ -315,12 +315,13 @@ object JsonProtocol extends LazyLogging { // this used on the first invocation to check all annotations do so def findTypeHints(classInst: Seq[JValue], requireClassField: Boolean = false): Seq[String] = classInst .flatMap({ - case JObject(("class", JString(name)) :: fields) => name +: findTypeHints(fields.map(_._2)) - case obj: JObject if requireClassField => - throw new InvalidAnnotationJSONException(s"Expected field 'class' not found! $obj") - case JObject(fields) => findTypeHints(fields.map(_._2)) - case JArray(arr) => findTypeHints(arr) - case _ => Seq() + case JObject(fields) => + val hint = fields.collectFirst { case ("class", JString(name)) => name } + if (requireClassField && hint.isEmpty) + throw new InvalidAnnotationJSONException(s"Expected field 'class' not found! $fields") + hint ++: findTypeHints(fields.map(_._2)) + case JArray(arr) => findTypeHints(arr) + case _ => Seq() }) .distinct |