From 4bedafce30b1efc2c2f22235fcf572ce4337205a Mon Sep 17 00:00:00 2001
From: Albert Magyar
Date: Thu, 14 May 2020 22:38:16 -0700
Subject: Make Utils.expandRef properly return intermediate expressions

* Switch to more idiomatic flatMap for Utils.expandRef
---
 src/main/scala/firrtl/Utils.scala | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/firrtl/Utils.scala b/src/main/scala/firrtl/Utils.scala
index c4f282bf..2264a0e4 100644
--- a/src/main/scala/firrtl/Utils.scala
+++ b/src/main/scala/firrtl/Utils.scala
@@ -280,10 +280,10 @@ object Utils extends LazyLogging {
     case ex: ValidIf => expandRef(ex.value) map (e1 => ValidIf(ex.cond, e1, e1.tpe))
     case ex => ex.tpe match {
       case (_: GroundType) => Seq(ex)
-      case (t: BundleType) => (t.fields foldLeft Seq[Expression](ex))((exps, f) =>
-        exps ++ create_exps(WSubField(ex, f.name, f.tpe,times(flow(ex), f.flip))))
-      case (t: VectorType) => (0 until t.size foldLeft Seq[Expression](ex))((exps, i) =>
-        exps ++ create_exps(WSubIndex(ex, i, t.tpe,flow(ex))))
+      case (t: BundleType) =>
+        ex +: t.fields.flatMap(f => expandRef(WSubField(ex, f.name, f.tpe, times(flow(ex), f.flip))))
+      case (t: VectorType) =>
+        ex +: (0 until t.size).flatMap(i => expandRef(WSubIndex(ex, i, t.tpe, flow(ex))))
     }
   }
   def toTarget(main: String, module: String)(expression: Expression): ReferenceTarget = {
-- 
cgit v1.2.3