calendar.format: change to use formatting instead of math.parser.private.

db4
John Benediktsson 2014-08-05 11:39:03 -07:00
parent 6e037ee256
commit 3cfac7916a
1 changed files with 3 additions and 4 deletions

View File

@ -1,9 +1,8 @@
! Copyright (C) 2008, 2010 Slava Pestov, Doug Coleman. ! Copyright (C) 2008, 2010 Slava Pestov, Doug Coleman.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors arrays calendar calendar.format.macros USING: accessors arrays calendar calendar.format.macros
combinators io io.streams.string kernel math math.functions combinators formatting io io.streams.string kernel math
math.order math.parser math.parser.private present sequences math.functions math.order math.parser present sequences typed ;
typed ;
IN: calendar.format IN: calendar.format
: pad-00 ( n -- str ) number>string 2 CHAR: 0 pad-head ; : pad-00 ( n -- str ) number>string 2 CHAR: 0 pad-head ;
@ -138,7 +137,7 @@ M: timestamp year. ( timestamp -- )
! algorithm to detect infinite decimals (e.g 1/3) ! algorithm to detect infinite decimals (e.g 1/3)
: write-rfc3339-seconds ( timestamp -- ) : write-rfc3339-seconds ( timestamp -- )
second>> 1 mod [ second>> 1 mod [
>float "%.6f" format-float [ CHAR: 0 = ] trim "%.6f" sprintf [ CHAR: 0 = ] trim
dup length 1 > [ write ] [ drop ] if dup length 1 > [ write ] [ drop ] if
] unless-zero ; ] unless-zero ;