From 86dfd891ee40a9ff367984ec285013cc8e5b37c3 Mon Sep 17 00:00:00 2001
From: azidar
Date: Tue, 21 Jul 2015 12:16:08 -0700
Subject: Fixed bug in fix :P

---
 src/main/stanza/compilers.stanza | 4 ++--
 src/main/stanza/passes.stanza    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main')

diff --git a/src/main/stanza/compilers.stanza b/src/main/stanza/compilers.stanza
index 8ec3adfa..063feb6f 100644
--- a/src/main/stanza/compilers.stanza
+++ b/src/main/stanza/compilers.stanza
@@ -82,12 +82,12 @@ public defn run-passes (c:Circuit,ls:List<Pass>) :
    var t = start-time
    val time-table = Vector<[String,Int]>()
    for p in ls do : 
-      println-all(STANDARD-ERROR,["Starting " name(p)])
+      println-all(STANDARD-OUTPUT,["Starting " name(p)])
       if PRINT-CIRCUITS : println(name(p))
       c* = pass(p)(c*)
       if PRINT-CIRCUITS : print(c*)
       val current-time = to-int(to-string(current-time-us() / to-long(1000)))
-      println-all(STANDARD-ERROR,["Finished " name(p)])
+      println-all(STANDARD-OUTPUT,["Finished " name(p)])
       println-all(STANDARD-ERROR,["Milliseconds since start: " current-time - start-time])
       println-all(STANDARD-ERROR,["Milliseconds for this pass: " current-time - t])
       println-all(STANDARD-ERROR,["\n"])
diff --git a/src/main/stanza/passes.stanza b/src/main/stanza/passes.stanza
index 1280e379..33ef666c 100644
--- a/src/main/stanza/passes.stanza
+++ b/src/main/stanza/passes.stanza
@@ -1619,7 +1619,8 @@ public defn expand-whens (c:Circuit) -> Circuit :
             val referenced? = HashTable<Symbol,True>(symbol-hash)
             for x in table do :
                mark-referenced(referenced?,value(x))
-               referenced?[key(x)] = true
+               if value(x) != SVNul() :
+                  referenced?[key(x)] = true
             for x in decs do :
                mark-referenced(referenced?,x)
             val decs* = Vector<Stmt>()
-- 
cgit v1.2.3