From 9ccc22304dc4f5abe337358da3a5b42936a44b42 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Thu, 12 Nov 2009 14:48:55 -0600 Subject: [PATCH] better factoring for us-federal-holiday? --- extra/calendar/holidays/us/us.factor | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/extra/calendar/holidays/us/us.factor b/extra/calendar/holidays/us/us.factor index 2122487866..47590e3b16 100644 --- a/extra/calendar/holidays/us/us.factor +++ b/extra/calendar/holidays/us/us.factor @@ -37,9 +37,15 @@ SYNTAX: HOLIDAY-NAME: : us-federal-holidays ( timestamp/n -- seq ) us-federal find-holidays [ adjust-federal-holiday ] map ; +: us-federal-holiday? ( timestamp/n -- ? ) + dup us-federal-holidays [ same-day? ] with any? ; + : canadian-holidays ( timestamp/n -- seq ) canada find-holidays ; +: post-office-open? ( timestamp -- ? ) + { [ sunday? not ] [ us-federal-holiday? not ] } 1&& ; + HOLIDAY: new-year's-day january 1 >>day ; HOLIDAY-NAME: new-year's-day world "New Year's Day" HOLIDAY-NAME: new-year's-day us-federal "New Year's Day" @@ -135,9 +141,3 @@ HOLIDAY: black-friday thanksgiving-day 1 days time+ ; HOLIDAY: pearl-harbor-remembrance-day december 7 >>day ; HOLIDAY: new-year's-eve december 31 >>day ; - -: post-office-open? ( timestamp -- ? ) - { - [ sunday? not ] - [ dup us-federal-holidays [ same-day? ] with any? not ] - } 1&& ;