From 0cc0090d353570b1c6e1ee65d25be7626635bf0e Mon Sep 17 00:00:00 2001
From: Andrew Waterman
Date: Mon, 31 Aug 2015 10:34:48 -0700
Subject: Fix Namespace bug

A mangled name may itself conflict with another name.
---
 src/main/scala/Chisel/Builder.scala | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/Chisel/Builder.scala b/src/main/scala/Chisel/Builder.scala
index 6598959a..668a2bcd 100644
--- a/src/main/scala/Chisel/Builder.scala
+++ b/src/main/scala/Chisel/Builder.scala
@@ -14,9 +14,12 @@ private class Namespace(parent: Option[Namespace], keywords: Set[String]) {
   }
 
   def name(elem: String): String = {
-    val res = if(this contains elem) rename(elem) else elem
-    names += res
-    res
+    if (this contains elem) {
+      name(rename(elem))
+    } else {
+      names += elem
+      elem
+    }
   }
 
   def child(kws: Set[String]): Namespace = new Namespace(Some(this), kws)
-- 
cgit v1.2.3