From 497be591c8c68d44abe746a51f6cbd66f750b749 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 31 Oct 2007 14:37:29 -0500 Subject: [PATCH] Change timestamp-compare to <=> --- extra/calendar/calendar-tests.factor | 8 ++++---- extra/calendar/calendar.factor | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extra/calendar/calendar-tests.factor b/extra/calendar/calendar-tests.factor index b1456178df..fbb60b2d49 100644 --- a/extra/calendar/calendar-tests.factor +++ b/extra/calendar/calendar-tests.factor @@ -126,16 +126,16 @@ continuations system ; 2004 1 1 13 30 0 0 make-timestamp = ] unit-test [ 0 ] [ 2004 1 1 13 30 0 0 make-timestamp - 2004 1 1 12 30 0 -1 make-timestamp compare-timestamps ] unit-test + 2004 1 1 12 30 0 -1 make-timestamp <=> ] unit-test [ 1 ] [ 2004 1 1 13 30 0 0 make-timestamp - 2004 1 1 12 30 0 0 make-timestamp compare-timestamps ] unit-test + 2004 1 1 12 30 0 0 make-timestamp <=> ] unit-test [ -1 ] [ 2004 1 1 12 30 0 0 make-timestamp - 2004 1 1 13 30 0 0 make-timestamp compare-timestamps ] unit-test + 2004 1 1 13 30 0 0 make-timestamp <=> ] unit-test [ 1 ] [ 2005 1 1 12 30 0 0 make-timestamp - 2004 1 1 13 30 0 0 make-timestamp compare-timestamps ] unit-test + 2004 1 1 13 30 0 0 make-timestamp <=> ] unit-test [ t ] [ now timestamp>unix-time millis 1000 /f - 10 < ] unit-test [ t ] [ 0 unix-time>timestamp unix-1970 = ] unit-test diff --git a/extra/calendar/calendar.factor b/extra/calendar/calendar.factor index 59414a1142..c255e0a78e 100644 --- a/extra/calendar/calendar.factor +++ b/extra/calendar/calendar.factor @@ -205,7 +205,7 @@ M: number +second ( timestamp n -- timestamp ) : >gmt ( timestamp -- timestamp ) 0 convert-timezone ; -: compare-timestamps ( tuple tuple -- n ) +M: timestamp <=> ( ts1 ts2 -- n ) [ >gmt tuple-slots ] compare ; : timestamp- ( timestamp timestamp -- seconds )