steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

calendar: Add yesterday, tomorrow, o'clock, am, pm.

db4
Doug Coleman 2012-10-25 09:46:11 -07:00
parent 99db5b68d7
commit 33ae7abb23
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
basis/calendar/calendar.factor
View File

@ -447,6 +447,12 @@ M: timestamp day-name day-of-week day-names nth ;
: today ( -- timestamp ) : today ( -- timestamp )
now midnight ; inline now midnight ; inline
: tomorrow ( -- timestamp )
1 days hence midnight ; inline
: yesterday ( -- timestamp )
1 days ago midnight ; inline
: beginning-of-month ( timestamp -- new-timestamp ) : beginning-of-month ( timestamp -- new-timestamp )
midnight 1 >>day ; inline midnight 1 >>day ; inline
@ -545,6 +551,20 @@ M: timestamp december clone 12 >>month ;
: beginning-of-week ( timestamp -- new-timestamp ) : beginning-of-week ( timestamp -- new-timestamp )
midnight sunday ; midnight sunday ;
: o'clock ( timestamp n -- new-timestamp )
[ midnight ] dip >>hour ;
ERROR: twelve-hour-expected n ;
: check-twelve-hour ( n -- n )
dup 0 12 between? [ twelve-hour-expected ] unless ;
: am ( timestamp n -- new-timestamp )
check-twelve-hour o'clock ;
: pm ( timestamp n -- new-timestamp )
check-twelve-hour 12 + o'clock ;
GENERIC: beginning-of-year ( object -- new-timestamp ) GENERIC: beginning-of-year ( object -- new-timestamp )
M: timestamp beginning-of-year beginning-of-month 1 >>month ; M: timestamp beginning-of-year beginning-of-month 1 >>month ;
M: integer beginning-of-year <year> ; M: integer beginning-of-year <year> ;