248

I've been using raw locations to make tests easy to read (test checks
the same locations that code modifies). But this means I have to manage
them myself, and I've been shoving variables into the storage for
compounds like tagged-value. Doesn't matter in this case since we don't
look at the contents of the tagged-value, but still unhygienic.

Maybe we need syntax for ignoring some output values?

1 files changed, 8 insertions, 8 deletions

diff --git a/mu.arc.t b/mu.arc.t
index 29132a80..1da8ac6d 100644
--- a/mu.arc.t
+++ b/mu.arc.t
@@ -1856,17 +1856,17 @@
       ((3 tagged-value-address) <- new-tagged-value (integer-address literal) (2 integer-address))
       ((1 channel-address deref) <- write (1 channel-address deref) (3 tagged-value-address deref))
       ((4 tagged-value) (1 channel-address deref) <- read (1 channel-address deref))
-      ((5 integer-address) <- maybe-coerce (4 tagged-value) (integer-address literal))
-      ((6 integer) <- get (1 channel-address deref) (first-full offset))
-      ((7 integer) <- get (1 channel-address deref) (first-free offset)))))
+      ((6 integer-address) <- maybe-coerce (4 tagged-value) (integer-address literal))
+      ((7 integer) <- get (1 channel-address deref) (first-full offset))
+      ((8 integer) <- get (1 channel-address deref) (first-free offset)))))
 ;? (set dump-trace*)
 ;? (= dump-trace* (obj blacklist '("sz" "m" "setm" "addr" "array-len" "cvt0" "cvt1")))
 (run 'main)
 ;? (prn int-canon.memory*)
-(if (~is memory*.5 memory*.2)
+(if (~is memory*.6 memory*.2)
   (prn "F - 'read' returns written value"))
-(if (or (~is 1 memory*.6)
-        (~is 1 memory*.7))
+(if (or (~is 1 memory*.7)
+        (~is 1 memory*.8))
   (prn "F - 'read' dequeues item from channel"))
 
 (reset)
@@ -1896,10 +1896,10 @@
       ((1 channel-address deref) <- write (1 channel-address deref) (3 tagged-value-address deref))
       ((4 boolean) <- get (1 channel-address deref) (read-watch offset))
       ((5 tagged-value) (1 channel-address deref) <- read (1 channel-address deref))
-      ((6 integer) <- get (1 channel-address deref) (read-watch offset)))))
+      ((7 integer) <- get (1 channel-address deref) (read-watch offset)))))
 (run 'main)
 (if (or (~is nil memory*.4)
-        (~is t memory*.6))
+        (~is t memory*.7))
   (prn "F - 'read' sets channel watch"))
 
 (reset)  ; end file with this to persist the trace for the final test