From 8935105537c7f9a8e41e2169f5c55899e4c53052 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Fri, 21 May 2010 20:48:33 -0500 Subject: [PATCH] Remove alarms from using list, minor refactoring --- basis/furnace/cache/cache.factor | 2 +- basis/models/delay/delay.factor | 5 +++-- basis/models/models.factor | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/basis/furnace/cache/cache.factor b/basis/furnace/cache/cache.factor index 51de8c0be6..676e41d3bc 100644 --- a/basis/furnace/cache/cache.factor +++ b/basis/furnace/cache/cache.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: kernel accessors math.intervals -system calendar alarms fry +system calendar fry random db db.tuples db.types http.server.filters ; IN: furnace.cache diff --git a/basis/models/delay/delay.factor b/basis/models/delay/delay.factor index b71a29e4ef..8292bb9c04 100644 --- a/basis/models/delay/delay.factor +++ b/basis/models/delay/delay.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors kernel models alarms ; +USING: accessors alarms fry kernel models ; IN: models.delay TUPLE: delay < model model timeout alarm ; @@ -19,7 +19,8 @@ TUPLE: delay < model model timeout alarm ; : start-delay ( delay -- ) dup - [ [ f >>alarm update-delay-model ] curry ] [ timeout>> ] bi later + [ '[ _ f >>alarm update-delay-model ] ] [ timeout>> ] bi + later >>alarm drop ; M: delay model-changed nip dup stop-delay start-delay ; diff --git a/basis/models/models.factor b/basis/models/models.factor index 1b6f0f30c2..efe9bac88d 100644 --- a/basis/models/models.factor +++ b/basis/models/models.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2006, 2008 Slava Pestov. ! See http://factorcode.org/license.txt for BSD license. USING: accessors generic kernel math sequences arrays assocs -alarms calendar math.order continuations fry ; +calendar math.order continuations fry ; IN: models TUPLE: model < identity-tuple