From cbeafbafc0ab02d8c8335ccc106a90545d562985 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 25 Feb 2017 19:57:30 -0400
Subject: - Exiting the program and getting the current time (in milliseconds)
 is now done through procedures.

---
 stdlib/source/lux/test.lux | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'stdlib/source')

diff --git a/stdlib/source/lux/test.lux b/stdlib/source/lux/test.lux
index 82fcabed9..bab513cc4 100644
--- a/stdlib/source/lux/test.lux
+++ b/stdlib/source/lux/test.lux
@@ -17,12 +17,13 @@
        [host #- try]))
 
 ## [Host]
-(jvm-import java.lang.System
-  (#static exit [int] #io void)
-  (#static currentTimeMillis [] #io long))
+(def: now
+  (IO Int)
+  (io (_lux_proc ["io" "current-time"] [])))
 
 (do-template [<name> <signal>]
-  [(def: #hidden <name> (IO Unit) (System.exit <signal>))]
+  [(def: #hidden <name> (IO Bottom)
+     (io (_lux_proc ["io" "exit"] [<signal>])))]
 
   [exit 0]
   [die  1]
@@ -51,9 +52,9 @@
     [#let [test-runs (List/map (: (-> [Text (IO Test) Text] (Promise Nat))
                                   (lambda [[module test description]]
                                     (do @
-                                      [#let [pre (io;run (System.currentTimeMillis []))]
+                                      [#let [pre (io;run now)]
                                        outcome (io;run test)
-                                       #let [post (io;run (System.currentTimeMillis []))
+                                       #let [post (io;run now)
                                              description+ (:: text;Codec<Text,Text> encode description)]]
                                       (case outcome
                                         (#;Left error)
@@ -107,7 +108,7 @@
 
 (def: #hidden (repeat ?seed times random-test)
   (-> (Maybe Nat) Nat (R;Random Test) Test)
-  (repeat' (default (int-to-nat (io;run (System.currentTimeMillis [])))
+  (repeat' (default (int-to-nat (io;run now))
              ?seed)
            (case ?seed
              #;None times
-- 
cgit v1.2.3