From beba4398edeb67624ad010b7ee13f8b863f8478f Mon Sep 17 00:00:00 2001 From: Albert Magyar Date: Mon, 26 Nov 2018 16:19:44 -0800 Subject: Make return types of util functions more specific (#949) --- src/main/scala/firrtl/Utils.scala | 2 +- src/main/scala/firrtl/passes/memlib/MemUtils.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/scala/firrtl/Utils.scala b/src/main/scala/firrtl/Utils.scala index 44b16bf8..f60d68b1 100644 --- a/src/main/scala/firrtl/Utils.scala +++ b/src/main/scala/firrtl/Utils.scala @@ -419,7 +419,7 @@ object Utils extends LazyLogging { } } - def module_type(m: DefModule): Type = BundleType(m.ports map { + def module_type(m: DefModule): BundleType = BundleType(m.ports map { case Port(_, name, dir, tpe) => Field(name, to_flip(dir), tpe) }) def sub_type(v: Type): Type = v match { diff --git a/src/main/scala/firrtl/passes/memlib/MemUtils.scala b/src/main/scala/firrtl/passes/memlib/MemUtils.scala index 709e57af..9328dfe4 100644 --- a/src/main/scala/firrtl/passes/memlib/MemUtils.scala +++ b/src/main/scala/firrtl/passes/memlib/MemUtils.scala @@ -63,7 +63,7 @@ object MemPortUtils { ) // Todo: merge it with memToBundle - def memType(mem: DefMemory): Type = { + def memType(mem: DefMemory): BundleType = { val rType = BundleType(defaultPortSeq(mem) :+ Field("data", Flip, mem.dataType)) val wType = BundleType(defaultPortSeq(mem) ++ Seq( -- cgit v1.2.3