Fixed rename to work with chisel3 stuff

3 files changed, 7 insertions, 8 deletions

diff --git a/src/main/stanza/compilers.stanza b/src/main/stanza/compilers.stanza
index 2402d747..d65e7718 100644
--- a/src/main/stanza/compilers.stanza
+++ b/src/main/stanza/compilers.stanza
@@ -78,6 +78,7 @@ public defn run-passes (c:Circuit,ls:List<Pass>) :
    if PRINT-CIRCUITS : print(c)
    val start-time = current-time-us()
    var t = start-time
+   val tables = Vector<HashTable<Symbol,HashTable<Symbol,Symbol>>>()
    for p in ls do : 
       if PRINT-CIRCUITS : println(name(p))
       c* = pass(p)(c*)
diff --git a/src/main/stanza/firrtl-ir.stanza b/src/main/stanza/firrtl-ir.stanza
index b37e974f..e57c5f74 100644
--- a/src/main/stanza/firrtl-ir.stanza
+++ b/src/main/stanza/firrtl-ir.stanza
@@ -5,8 +5,8 @@ defpackage firrtl/ir2 :
 public defmulti info! (x:?) -> FileInfo
 public defmethod info! (x:?) : FileInfo()
 
-public val vector-expand-delin = `_
-public val bundle-expand-delin = `_
+public val vector-expand-delin = `$
+public val bundle-expand-delin = `$
 public val scope-delin = `%
 public val temp-delin = `!
 public val inline-delin = `^
diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza
index c4d6a58f..c03e2194 100644
--- a/src/main/stanza/passes.stanza
+++ b/src/main/stanza/passes.stanza
@@ -285,23 +285,21 @@ defmethod map (f: Type -> Type, e: WIndex) :
 ; Returns a new Circuit where all names have all special characters 
 ;    removed, except _.
 
-public defstruct RemoveSpecialChars <: Pass
-public defmethod pass (b:RemoveSpecialChars) -> (Circuit -> Circuit) : 
-   remove-special-chars
+public defstruct RemoveSpecialChars <: Pass 
+public defmethod pass (b:RemoveSpecialChars) -> (Circuit -> Circuit) : remove-special-chars
 public defmethod name (b:RemoveSpecialChars) -> String : "Remove Special Characters"
 public defmethod short-name (b:RemoveSpecialChars) -> String : "rem-spec-chars"
-public defmulti 
 
 ;------------ Helper Functions -------------
 
 defn get-new-string (n:Char) -> String :
    switch {n == _} :
-      '_' : "__"
+      ;'_' : "__"
       '~' : "_A"
       '!' : "_B"
       '@' : "_C"
       '#' : "_D"
-      '$' : "_E"
+      ;'$' : "_E"
       '%' : "_F"
       '^' : "_G"
       '*' : "_H"