Still partial commit, many tests pass. Many tests fail.

1 files changed, 12 insertions, 9 deletions

diff --git a/test/passes/expand-whens/two-when.fir b/test/passes/expand-whens/two-when.fir
index fb537303..b6c98263 100644
--- a/test/passes/expand-whens/two-when.fir
+++ b/test/passes/expand-whens/two-when.fir
@@ -5,31 +5,34 @@ circuit top :
    module top :
       cmem m :{ x : UInt<1>, y : UInt<1> }[2] 
       wire i : UInt<1>
+      i := UInt(1)
       wire p : UInt<1>
+      p := UInt(1)
       wire q : { x : UInt<1>, y : UInt<1> }
       when p :
         wire p2 : UInt<1>
-        reg r5 : UInt<1>
+        p2 := UInt(1)
         when p2 :
-          accessor a = m[i] 
+          infer accessor a = m[i] 
           q := a
-          accessor b = m[i]
+          infer accessor b = m[i]
           b := q
         else :
-          accessor c = m[i] 
+          infer accessor c = m[i] 
           q := c
-          accessor d = m[i]
+          infer accessor d = m[i]
           d := q
       else :
         wire p3 : UInt<1>
+        p3 := UInt(1)
         when p3 :
-          accessor w = m[i] 
+          infer accessor w = m[i] 
           q := w
-          accessor x = m[i]
+          infer accessor x = m[i]
           x := q
         else :
-          accessor y = m[i] 
+          infer accessor y = m[i] 
           q := y
-          accessor z = m[i]
+          infer accessor z = m[i]
           z := q
 ; CHECK: Finished Expand Whens