Rename from-now to hence

diff --git a/extra/alarms/alarms-docs.factor b/extra/alarms/alarms-docs.factor
index b25df236c98f6968f4cdba56411c853a796d5dc9..f07a8b9a2d925399591f4286d2a02edf70ce4c33 100755 (executable)
--- a/extra/alarms/alarms-docs.factor
+++ b/extra/alarms/alarms-docs.factor
@@ -10,7 +10,7 @@ HELP: add-alarm
 \r
 HELP: later\r
 { $values { "quot" quotation } { "dt" duration } { "alarm" alarm } }\r
-{ $description "Creates and registers an alarm which calls the quotation once at " { $snippet "time" } { $link from-now } "." } ;\r
+{ $description "Creates and registers an alarm which calls the quotation once at " { $snippet "time" } " from now." } ;\r
 \r
 HELP: cancel-alarm\r
 { $values { "alarm" alarm } }\r

diff --git a/extra/alarms/alarms.factor b/extra/alarms/alarms.factor
index ddc1d34121f72ab83b0eca24a676949069df0cde..a72960f20fcd56dd83c40efc55539e57f413701a 100755 (executable)
--- a/extra/alarms/alarms.factor
+++ b/extra/alarms/alarms.factor
@@ -82,10 +82,10 @@ PRIVATE>
     <alarm> [ register-alarm ] keep ;
 
 : later ( quot dt -- alarm )
-    from-now f add-alarm ;
+    hence f add-alarm ;
 
 : every ( quot dt -- alarm )
-    [ from-now ] keep add-alarm ;
+    [ hence ] keep add-alarm ;
 
 : cancel-alarm ( alarm -- )
     alarm-entry [ alarms get-global heap-delete ] if-box? ;

diff --git a/extra/calendar/calendar.factor b/extra/calendar/calendar.factor
index e7b0b6f43ada0dbf1a26d8683fcd4f8f20d3ed18..0abc00b4a44561ae3dffedeb5cca2ae3e8dcf619 100755 (executable)
--- a/extra/calendar/calendar.factor
+++ b/extra/calendar/calendar.factor
@@ -284,7 +284,7 @@ MEMO: unix-1970 ( -- timestamp )
 
 : now ( -- timestamp ) gmt >local-time ;
 
-: from-now ( dt -- timestamp ) now swap time+ ;
+: hence ( dt -- timestamp ) now swap time+ ;
 : ago ( dt -- timestamp ) now swap time- ;
 
 : day-counts { 0 31 28 31 30 31 30 31 31 30 31 30 31 } ; inline
@@ -357,7 +357,7 @@ M: timestamp days-in-year ( timestamp -- n ) year>> days-in-year ;
 
 M: timestamp sleep-until timestamp>millis sleep-until ;
 
-M: duration sleep from-now sleep-until ;
+M: duration sleep hence sleep-until ;
 
 {
     { [ os unix? ] [ "calendar.unix" ] }

diff --git a/extra/furnace/auth/login/login.factor b/extra/furnace/auth/login/login.factor
index 68161382c1bd76b2b1b0fe697790fae6aa51b81f..ce533bce644036491a977c7f54b52f5e0b059fb8 100755 (executable)
--- a/extra/furnace/auth/login/login.factor
+++ b/extra/furnace/auth/login/login.factor
@@ -40,10 +40,9 @@ M: login-realm modify-form ( responder -- )
     permit-id get realm get name>> permit-id-key <cookie>\r
         "$login-realm" resolve-base-path >>path\r
         realm get\r
-        [ timeout>> from-now >>expires ]\r
         [ domain>> >>domain ]\r
         [ secure>> >>secure ]\r
-        tri ;\r
+        bi ;\r
 \r
 : put-permit-cookie ( response -- response' )\r
     <permit-cookie> put-cookie ;\r

diff --git a/extra/furnace/cache/cache.factor b/extra/furnace/cache/cache.factor
index a614a525488926821067924927ad7bb4d67d0d75..68786a55ab7f0c3eb21ff187a11c7e4a85707f33 100644 (file)
--- a/extra/furnace/cache/cache.factor
+++ b/extra/furnace/cache/cache.factor
@@ -31,6 +31,6 @@ TUPLE: server-state-manager < filter-responder timeout ;
     new
         swap >>responder
         20 minutes >>timeout ; inline
-    
+
 : touch-state ( state manager -- )
-    timeout>> from-now >>expires drop ;
+    timeout>> hence >>expires drop ;

diff --git a/extra/furnace/sessions/sessions.factor b/extra/furnace/sessions/sessions.factor
index 0ec9648a67c25a95ec39e1869effbb05eeff464d..5590a9e55e874e30af4114896c57b514bb23381e 100755 (executable)
--- a/extra/furnace/sessions/sessions.factor
+++ b/extra/furnace/sessions/sessions.factor
@@ -116,7 +116,6 @@ M: session-saver dispose
 : <session-cookie> ( -- cookie )
     session get id>> session-id-key <cookie>
         "$sessions" resolve-base-path >>path
-        sessions get timeout>> from-now >>expires
         sessions get domain>> >>domain ;
 
 : put-session-cookie ( response -- response' )

diff --git a/extra/tetris/tetris.factor b/extra/tetris/tetris.factor
index 02f8f240d28d71afacc0c6c5d4c03e138ef7ef5f..c2f874598c2666edd52802da3e13f3a6e2a0601f 100644 (file)
--- a/extra/tetris/tetris.factor
+++ b/extra/tetris/tetris.factor
@@ -45,7 +45,7 @@ tetris-gadget H{
     dup tetris-gadget-tetris maybe-update relayout-1 ;
 
 M: tetris-gadget graft* ( gadget -- )
-    dup [ tick ] curry 100 milliseconds from-now 100 milliseconds add-alarm
+    dup [ tick ] curry 100 milliseconds every
     swap set-tetris-gadget-alarm ;
 
 M: tetris-gadget ungraft* ( gadget -- )

diff --git a/extra/ui/gestures/gestures.factor b/extra/ui/gestures/gestures.factor
index 88bc2bcee73d22c9f56a9bf13890e4d72dc10df5..5c00fbfdb0b6a50db1d4a8d1f85f91705448e5d2 100755 (executable)
--- a/extra/ui/gestures/gestures.factor
+++ b/extra/ui/gestures/gestures.factor
@@ -121,7 +121,7 @@ SYMBOL: drag-timer
 : start-drag-timer ( -- )
     hand-buttons get-global empty? [
         [ drag-gesture ]
-        300 milliseconds from-now
+        300 milliseconds hence
         100 milliseconds
         add-alarm drag-timer get-global >box
     ] when ;