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

Merge git://factorcode.org/git/erg

db4
Doug Coleman 2008-02-07 17:35:15 -06:00
parent 07e7f3bcce 7ff6d501f7
commit 3a989db973
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
extra/calendar/calendar.factor
View File

@ -349,17 +349,23 @@ M: timestamp year. ( timestamp -- )
: timestamp>string ( timestamp -- str ) : timestamp>string ( timestamp -- str )
[ (timestamp>string) ] string-out ; [ (timestamp>string) ] string-out ;
: (write-gmt-offset) ( ratio -- )
1 /mod swap write-00 60 * write-00 ;
: write-gmt-offset ( gmt-offset -- )
{
{ [ dup zero? ] [ drop "GMT" write ] }
{ [ dup 0 < ] [ "-" write neg (write-gmt-offset) ] }
{ [ dup 0 > ] [ "+" write (write-gmt-offset) ] }
} cond ;
: timestamp>rfc822-string ( timestamp -- str ) : timestamp>rfc822-string ( timestamp -- str )
#! RFC822 timestamp format #! RFC822 timestamp format
#! Example: Tue, 15 Nov 1994 08:12:31 +0200 #! Example: Tue, 15 Nov 1994 08:12:31 +0200
[ [
dup (timestamp>string) dup (timestamp>string)
" " write " " write
timestamp-gmt-offset { timestamp-gmt-offset write-gmt-offset
{ [ dup zero? ] [ drop "GMT" write ] }
{ [ dup 0 < ] [ "-" write neg write-00 "00" write ] }
{ [ dup 0 > ] [ "+" write write-00 "00" write ] }
} cond
] string-out ; ] string-out ;
: timestamp>http-string ( timestamp -- str ) : timestamp>http-string ( timestamp -- str )

8
extra/calendar/windows/windows.factor
View File

@ -6,8 +6,10 @@ TUPLE: windows-calendar ;
T{ windows-calendar } calendar-backend set-global T{ windows-calendar } calendar-backend set-global
: TIME_ZONE_ID_INVALID HEX: ffffffff ; inline
M: windows-calendar gmt-offset ( -- float ) M: windows-calendar gmt-offset ( -- float )
"TIME_ZONE_INFORMATION" <c-object> "TIME_ZONE_INFORMATION" <c-object>
[ GetTimeZoneInformation win32-error=0/f ] keep dup GetTimeZoneInformation
[ TIME_ZONE_INFORMATION-Bias ] keep TIME_ZONE_ID_INVALID = [ win32-error ] when
TIME_ZONE_INFORMATION-DaylightBias + 60 /f neg ; TIME_ZONE_INFORMATION-Bias 60 / neg ;