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

calendar: o'clock to oclock

locals-and-roots
Doug Coleman 2016-06-25 12:04:54 -07:00
parent 3dba6e3607
commit c7fd049780
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/calendar/calendar.factor
View File

@ -588,7 +588,7 @@ ERROR: not-a-day-abbreviation string ;
: beginning-of-week ( timestamp -- new-timestamp ) : beginning-of-week ( timestamp -- new-timestamp )
midnight sunday ; midnight sunday ;
: o'clock ( timestamp n -- new-timestamp ) : oclock ( timestamp n -- new-timestamp )
[ midnight ] dip >>hour ; [ midnight ] dip >>hour ;
ERROR: twelve-hour-expected n ; ERROR: twelve-hour-expected n ;
@ -597,10 +597,10 @@ ERROR: twelve-hour-expected n ;
dup 0 12 between? [ twelve-hour-expected ] unless ; dup 0 12 between? [ twelve-hour-expected ] unless ;
: am ( timestamp n -- new-timestamp ) : am ( timestamp n -- new-timestamp )
check-twelve-hour o'clock ; check-twelve-hour oclock ;
: pm ( timestamp n -- new-timestamp ) : pm ( timestamp n -- new-timestamp )
check-twelve-hour 12 + o'clock ; check-twelve-hour 12 + oclock ;
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 ;