factor: trim using lists

[factor.git] / extra / time / time.factor

diff --git a/extra/time/time.factor b/extra/time/time.factor
index d0411bd5bf9e72b6caaf9fad399071737d159c19..cd076e50d90a6c518b00b8f9f6f66b1f90f954a4 100644 (file)
--- a/extra/time/time.factor
+++ b/extra/time/time.factor
@@ -1,72 +1,13 @@
-! Copyright (C) 2008 John Benediktsson
-! See http://factorcode.org/license.txt for BSD license
-
-USING: accessors arrays calendar io kernel fry macros math
-math.functions math.parser peg.ebnf sequences strings vectors ;
-
+! Copyright (C) 2010 Doug Coleman.
+! See http://factorcode.org/license.txt for BSD license.
+USING: combinators system vocabs ;
 IN: time
 
-: >timestring ( timestamp -- string ) 
-    [ hour>> ] keep [ minute>> ] keep second>> 3array
-    [ number>string 2 CHAR: 0 pad-left ] map ":" join ; inline
-
-: >datestring ( timestamp -- string )
-    [ month>> ] keep [ day>> ] keep year>> 3array
-    [ number>string 2 CHAR: 0 pad-left ] map "/" join ; inline
-
-: week-of-year-sunday ( timestamp -- n )
-    dup clone 1 >>month 1 >>day day-of-week dup 0 > [ 7 swap - ] when 
-    [ day-of-year ] dip 2dup < [ 0 2nip ] [ - 7 / 1+ >fixnum ] if ;
-
-: week-of-year-monday ( timestamp -- n )
-    dup clone 1 >>month 1 >>day day-of-week dup 1 > [ 7 swap - ] when 
-    [ day-of-year ] dip 2dup < [ 0 2nip ] [ - 7 / 1+ >fixnum ] if ;
-
-
-<PRIVATE
-
-EBNF: parse-format-string
-
-fmt-%     = "%"                  => [[ [ "%" ] ]]
-fmt-a     = "a"                  => [[ [ dup day-of-week day-abbreviation3 ] ]]
-fmt-A     = "A"                  => [[ [ dup day-of-week day-name ] ]] 
-fmt-b     = "b"                  => [[ [ dup month>> month-abbreviation ] ]]
-fmt-B     = "B"                  => [[ [ dup month>> month-name ] ]] 
-fmt-c     = "c"                  => [[ [ "Not yet implemented" throw ] ]]
-fmt-d     = "d"                  => [[ [ dup day>> number>string 2 CHAR: 0 pad-left ] ]] 
-fmt-H     = "H"                  => [[ [ dup hour>> number>string 2 CHAR: 0 pad-left ] ]]
-fmt-I     = "I"                  => [[ [ dup hour>> 12 > [ 12 - ] when number>string 2 CHAR: 0 pad-left ] ]] 
-fmt-j     = "j"                  => [[ [ dup day-of-year number>string ] ]] 
-fmt-m     = "m"                  => [[ [ dup month>> number>string 2 CHAR: 0 pad-left ] ]] 
-fmt-M     = "M"                  => [[ [ dup minute>> number>string 2 CHAR: 0 pad-left ] ]] 
-fmt-p     = "p"                  => [[ [ dup hour>> 12 < [ "AM" ] [ "PM" ] ? ] ]] 
-fmt-S     = "S"                  => [[ [ dup second>> round number>string 2 CHAR: 0 pad-left ] ]] 
-fmt-U     = "U"                  => [[ [ "Not yet implemented" throw ] ]] 
-fmt-w     = "w"                  => [[ [ dup day-of-week number>string ] ]] 
-fmt-W     = "W"                  => [[ [ "Not yet implemented" throw ] ]] 
-fmt-x     = "x"                  => [[ [ dup >datestring ] ]] 
-fmt-X     = "X"                  => [[ [ dup >timestring ] ]] 
-fmt-y     = "y"                  => [[ [ dup year>> 100 mod number>string ] ]] 
-fmt-Y     = "Y"                  => [[ [ dup year>> number>string ] ]] 
-fmt-Z     = "Z"                  => [[ [ "Not yet implemented" throw ] ]] 
-unknown   = (.)*                 => [[ "Unknown directive" throw ]]
-
-formats_  = fmt-%|fmt-a|fmt-A|fmt-b|fmt-B|fmt-c|fmt-d|fmt-H|fmt-I|
-            fmt-j|fmt-m|fmt-M|fmt-p|fmt-S|fmt-U|fmt-w|fmt-W|fmt-x|
-            fmt-X|fmt-y|fmt-Y|fmt-Z|unknown
-
-formats   = "%" (formats_)       => [[ second '[ _ dip ] ]]
-
-plain-text = (!("%").)+          => [[ >string '[ _ swap ] ]]
-
-text      = (formats|plain-text)* => [[ reverse [ [ [ push ] keep ] append ] map ]]
-
-;EBNF
-
-PRIVATE>
-
-MACRO: strftime ( format-string -- )
-    parse-format-string [ length ] keep [ ] join 
-    '[ _ <vector> @ reverse concat nip ] ;
-
+HOOK: set-system-time os ( timestamp -- )
+HOOK: adjust-time-monotonic os ( timestamp -- seconds )
 
+{
+    { [ os windows? ] [ "time.windows" ] }
+    { [ os macosx? ] [ "time.macosx" ] }
+    { [ os unix? ] [ "time.unix" ] }
+} cond require