diff options
| author | Andrew Waterman | 2016-04-20 15:56:31 -0700 |
|---|---|---|
| committer | Andrew Waterman | 2016-04-20 15:57:21 -0700 |
| commit | 735f5463932dda502b8ce7c843667d0d45faae93 (patch) | |
| tree | a5e52a4c3740b4dcd203b9611fceea68e2905d30 /src | |
| parent | 484262d6ce6979276853cbe202fc038b4700ce2d (diff) | |
Use a global namespace for VarWidth names
This matches the unstated assumption in InferWidths.
Closes #135
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scala/firrtl/passes/Passes.scala | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main/scala/firrtl/passes/Passes.scala b/src/main/scala/firrtl/passes/Passes.scala index 6829d48c..ccc02f24 100644 --- a/src/main/scala/firrtl/passes/Passes.scala +++ b/src/main/scala/firrtl/passes/Passes.scala @@ -208,10 +208,9 @@ object InferTypes extends Pass { def remove_unknowns (t:Type)(implicit n: Namespace): Type = mapr(remove_unknowns_w _,t) def run (c:Circuit): Circuit = { val module_types = LinkedHashMap[String,Type]() - val module_wnamespaces = HashMap[String, Namespace]() + implicit val wnamespace = Namespace() def infer_types (m:Module) : Module = { val types = LinkedHashMap[String,Type]() - implicit val wnamespace = module_wnamespaces(m.name) def infer_types_e (e:Expression) : Expression = { e map (infer_types_e) match { case e:ValidIf => ValidIf(e.cond,e.value,tpe(e.value)) @@ -275,8 +274,6 @@ object InferTypes extends Pass { val modulesx = c.modules.map { m => { mname = m.name - implicit val wnamespace = Namespace() - module_wnamespaces += (m.name -> wnamespace) val portsx = m.ports.map(p => Port(p.info,p.name,p.direction,remove_unknowns(p.tpe))) m match { case m:InModule => InModule(m.info,m.name,portsx,m.body) |