From b0baf118af8aab707dc31953a90cb10690f0737c Mon Sep 17 00:00:00 2001 From: otoburb Date: Tue, 15 Mar 2011 01:51:27 +0000 Subject: [PATCH] holidays.factor: Replaced use of deprecated 'spin' word with locals. --- extra/calendar/holidays/holidays.factor | 7 ++++--- extra/calendar/holidays/us/us.factor | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/extra/calendar/holidays/holidays.factor b/extra/calendar/holidays/holidays.factor index 0b8a1bb781..7a87a1df45 100644 --- a/extra/calendar/holidays/holidays.factor +++ b/extra/calendar/holidays/holidays.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2009 Doug Coleman. ! See http://factorcode.org/license.txt for BSD license. -USING: accessors assocs calendar fry kernel parser sequences -shuffle vocabs words memoize ; +USING: accessors assocs calendar fry kernel locals parser +sequences vocabs words memoize ; IN: calendar.holidays SINGLETONS: all world commonwealth-of-nations ; @@ -15,7 +15,8 @@ SYNTAX: HOLIDAY: parse-definition (( timestamp/n -- timestamp )) define-declared ; SYNTAX: HOLIDAY-NAME: - scan-word "holiday" word-prop scan-word scan-object spin set-at ; + [let scan-word "holiday" word-prop :> holidays scan-word :> name scan-object :> value + value name holidays set-at ] ; >> GENERIC: holidays ( n singleton -- seq ) diff --git a/extra/calendar/holidays/us/us.factor b/extra/calendar/holidays/us/us.factor index 538836952f..87c367f941 100644 --- a/extra/calendar/holidays/us/us.factor +++ b/extra/calendar/holidays/us/us.factor @@ -2,7 +2,7 @@ ! See http://factorcode.org/license.txt for BSD license. USING: accessors assocs calendar calendar.holidays calendar.holidays.private combinators combinators.short-circuit -fry kernel lexer math namespaces parser sequences shuffle +fry kernel lexer math namespaces parser sequences vocabs words ; IN: calendar.holidays.us