From fa40cabbf361b717023183b57eed3bb72919a080 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 18 Nov 2019 18:45:52 -0400
Subject: Minor adjustments.

---
 stdlib/source/test/lux/target/jvm.lux | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'stdlib/source/test')

diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux
index 2617eeacf..7b2283cb8 100644
--- a/stdlib/source/test/lux/target/jvm.lux
+++ b/stdlib/source/test/lux/target/jvm.lux
@@ -53,10 +53,7 @@
      ["#." signed]
      ["#." unsigned]]
     ["#" bytecode (#+ Label Bytecode)
-     ["#." instruction]
-     [environment
-      [limit
-       [registry (#+ Register)]]]]
+     ["#." instruction]]
     ["#." type (#+ Type)
      ["." category (#+ Value Object Class)]]]})
 
@@ -993,13 +990,13 @@
                                    *wrap)))))
         store-and-load (: (All [a]
                             (-> (Random a) (-> a (Bytecode Any)) (Bytecode Any)
-                                [(-> Register (Bytecode Any)) (-> Register (Bytecode Any))]
+                                [(-> Nat (Bytecode Any)) (-> Nat (Bytecode Any))]
                                 (-> a (-> Any Bit))
                                 (Random Bit)))
                           (function (_ random-value literal *wrap [store load] test)
                             (do random.monad
                               [expected random-value
-                               register (:: @ map (|>> (n.% 128) /unsigned.u1 try.assume) random.nat)]
+                               register (:: @ map (n.% 128) random.nat)]
                               (<| (..bytecode (test expected))
                                   (do /.monad
                                     [_ (literal expected)
@@ -1033,8 +1030,7 @@
                                         (do /.monad
                                           [_ (..$Byte::literal base)
                                            _ /.istore-0
-                                           @0 (/.register 0)
-                                           _ (/.iinc @0 increment)
+                                           _ (/.iinc 0 increment)
                                            _ /.iload-0
                                            _ /.i2l]
                                           ..$Long::wrap)))))))
-- 
cgit v1.2.3