Build ArrayBuffers in Block.mapStmt (#1669)

* Build ArrayBuffers in Block.mapStmt

* Have empty Block serialize as "skip"

The FIRRTL parser requires at least one indented line in each module.
Sometimes tests emit and parse modules with no contents; this ensures
there's always at least a "skip" in empty modules.

Also fix tests that expected certain skips

* Use var List as stack in Block.mapStmt impl

This replaces Iterator concatenation. In Scala 2.11, RHS recursion on
Iterators is not stack safe. This seems to have been fixed in 2.12 by
Scala PR 5033.

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

1 files changed, 0 insertions, 4 deletions

diff --git a/src/test/scala/firrtlTests/annotationTests/EliminateTargetPathsSpec.scala b/src/test/scala/firrtlTests/annotationTests/EliminateTargetPathsSpec.scala
index e1cadf32..73f36cf0 100644
--- a/src/test/scala/firrtlTests/annotationTests/EliminateTargetPathsSpec.scala
+++ b/src/test/scala/firrtlTests/annotationTests/EliminateTargetPathsSpec.scala
@@ -386,7 +386,6 @@ class EliminateTargetPathsSpec extends FirrtlPropSpec with FirrtlMatchers {
       """|circuit Foo:
          |  module Bar:
          |    node x = UInt<1>(0)
-         |    skip
          |  module Foo:
          |    inst bar of Bar
          |    inst baz of Bar""".stripMargin
@@ -394,10 +393,8 @@ class EliminateTargetPathsSpec extends FirrtlPropSpec with FirrtlMatchers {
       """|circuit Foo:
          |  module Bar___Foo_bar:
          |    node x = UInt<1>(0)
-         |    skip
          |  module Bar:
          |    node x = UInt<1>(0)
-         |    skip
          |  module Foo:
          |    inst bar of Bar___Foo_bar
          |    inst baz of Bar""".stripMargin
@@ -427,7 +424,6 @@ class EliminateTargetPathsSpec extends FirrtlPropSpec with FirrtlMatchers {
          |  module Bar:
          |    node foo = UInt<1>(0)
          |    inst baz of Baz
-         |    skip
          |  module Foo:
          |    node foo = UInt<1>(0)
          |    inst bar of Bar