aboutsummaryrefslogtreecommitdiff
path: root/src/main/scala/firrtl/Visitor.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/scala/firrtl/Visitor.scala')
-rw-r--r--src/main/scala/firrtl/Visitor.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/firrtl/Visitor.scala b/src/main/scala/firrtl/Visitor.scala
index f47d7ee3..7b965bff 100644
--- a/src/main/scala/firrtl/Visitor.scala
+++ b/src/main/scala/firrtl/Visitor.scala
@@ -144,10 +144,10 @@ class Visitor(infoMode: InfoMode) extends FIRRTLBaseVisitor[FirrtlNode] {
}
private def visitBlock[FirrtlNode](ctx: FIRRTLParser.ModuleBlockContext): Statement =
- Block(ctx.simple_stmt().asScala.map(_.stmt).filter(_ != null).map(visitStmt))
+ Block(ctx.simple_stmt().asScala.flatMap(x => Option(x.stmt).map(visitStmt)))
private def visitSuite[FirrtlNode](ctx: FIRRTLParser.SuiteContext): Statement =
- Block(ctx.simple_stmt().asScala.map(_.stmt).filter(_ != null).map(visitStmt))
+ Block(ctx.simple_stmt().asScala.flatMap(x => Option(x.stmt).map(visitStmt)))
// Memories are fairly complicated to translate thus have a dedicated method