Fixed final bug. All tests pass. Accessors are a go.

2 files changed, 14 insertions, 12 deletions

diff --git a/test/passes/expand-accessors/accessor-mem.fir b/test/passes/expand-accessors/accessor-mem.fir
index 1c055b48..6f8b63e3 100644
--- a/test/passes/expand-accessors/accessor-mem.fir
+++ b/test/passes/expand-accessors/accessor-mem.fir
@@ -8,16 +8,17 @@ circuit top :
       wire i : UInt<4>
       i := UInt(1)
       infer accessor a = m[i] ;CHECK: read accessor a = m[i]
-      infer accessor b = a[i] ;CHECK: b := (a[0] a[1])[i]
-      infer accessor c = b[i] ;CHECK: c := (b[0] b[1])[i]
+      infer accessor b = a[i] ;CHECK: indexer b = (a[0] a[1])[i] : UInt<32>[2]
+      infer accessor c = b[i] ;CHECK: indexer c = (b[0] b[1])[i] : UInt<32>
       wire j : UInt<32>
       j := c
 
       infer accessor x = m[i] ;CHECK: write accessor x = m[i]
-      infer accessor y = x[i] ;CHECK: (x[0] x[1])[i] := y
+      infer accessor y = x[i] ;CHECK: indexer (x[0] x[1])[i] = y : UInt<32>[2]
       y[0] := UInt(1)
       y[1] := UInt(1)
-      infer accessor z = y[i] ;CHECK: (y[0] y[1])[i] := z
+      infer accessor z = y[i] ;CHECK: indexer (y[0] y[1])[i] = z : UInt<32>
       z := j
 
 ; CHECK: Finished Expand Accessors
+; CHECK: Done!
diff --git a/test/passes/expand-accessors/accessor-vec.fir b/test/passes/expand-accessors/accessor-vec.fir
index c505fbaf..96a5c74c 100644
--- a/test/passes/expand-accessors/accessor-vec.fir
+++ b/test/passes/expand-accessors/accessor-vec.fir
@@ -14,19 +14,19 @@ circuit top :
       m[1][1][1] := UInt(1)
       wire i : UInt
       i := UInt(1)
-      infer accessor a = m[i] ;CHECK: a := (m[0] m[1])[i]
-      infer accessor b = a[i] ;CHECK: b := (a[0] a[1])[i]
-      infer accessor c = b[i] ;CHECK: c := (b[0] b[1])[i]
+      infer accessor a = m[i] ;CHECK: indexer a = (m[0] m[1])[i] : UInt<32>[2][2]
+      infer accessor b = a[i] ;CHECK: indexer b = (a[0] a[1])[i] : UInt<32>[2]
+      infer accessor c = b[i] ;CHECK: indexer c = (b[0] b[1])[i] : UInt<32>
       wire j : UInt
       j := c
 
-      infer accessor x = m[i] ;CHECK: (m[0] m[1])[i] := x
+      infer accessor x = m[i] ;CHECK: indexer (m[0] m[1])[i] = x : UInt<32>[2][2]
       x[0][0] := UInt(1)
       x[1][0] := UInt(1)
       x[0][1] := UInt(1)
       x[1][1] := UInt(1)
-      infer accessor y = x[i] ;CHECK: (x[0] x[1])[i] := y
-      infer accessor z = y[i] ;CHECK: (y[0] y[1])[i] := z
+      infer accessor y = x[i] ;CHECK: indexer (x[0] x[1])[i] = y : UInt<32>[2]
+      infer accessor z = y[i] ;CHECK: indexer (y[0] y[1])[i] = z : UInt<32>
       y[0] := UInt(1)
       y[1] := UInt(1)
       z := j
@@ -34,13 +34,14 @@ circuit top :
       wire p : {n : UInt<32>[2]}
       p.n[0] := UInt(1)
       p.n[1] := UInt(1)
-      infer accessor q = p.n[i] ;CHECK: (p.n[0] p.n[1])[i] := q
+      infer accessor q = p.n[i] ;CHECK: indexer (p.n[0] p.n[1])[i] = q : UInt<32>
       q := j
 
       wire r : {m : UInt<32>}[2]
       r[0].m := UInt(1)
       r[1].m := UInt(1)
-      infer accessor s = r[i] ;CHECK: s := (r[0] r[1])[i]
+      infer accessor s = r[i] ;CHECK: indexer s = (r[0] r[1])[i] : { m : UInt<32>}
       j := s.m
 
 ; CHECK: Finished Expand Accessors
+; CHECK: Done!