Merge branch 'master' of git://github.com/mrjbq7/factor

db4
Slava Pestov 2008-12-15 18:44:12 -06:00
commit 5d2b5286b8
2 changed files with 13 additions and 7 deletions

View File

@ -49,27 +49,27 @@ HELP: printf
} }
{ $examples { $examples
{ $example { $example
"USING: printf ;" "USING: formatting ;"
"123 \"%05d\" printf" "123 \"%05d\" printf"
"00123" } "00123" }
{ $example { $example
"USING: printf ;" "USING: formatting ;"
"HEX: ff \"%04X\" printf" "HEX: ff \"%04X\" printf"
"00FF" } "00FF" }
{ $example { $example
"USING: printf ;" "USING: formatting ;"
"1.23456789 \"%.3f\" printf" "1.23456789 \"%.3f\" printf"
"1.235" } "1.235" }
{ $example { $example
"USING: printf ;" "USING: formatting ;"
"1234567890 \"%.5e\" printf" "1234567890 \"%.5e\" printf"
"1.23457e+09" } "1.23457e+09" }
{ $example { $example
"USING: printf ;" "USING: formatting ;"
"12 \"%'#4d\" printf" "12 \"%'#4d\" printf"
"##12" } "##12" }
{ $example { $example
"USING: printf ;" "USING: formatting ;"
"1234 \"%+d\" printf" "1234 \"%+d\" printf"
"+1234" } "+1234" }
} ; } ;
@ -109,6 +109,12 @@ HELP: strftime
{ "%Z" "Time zone name (no characters if no time zone exists)." } { "%Z" "Time zone name (no characters if no time zone exists)." }
{ "%%" "A literal '%' character." } { "%%" "A literal '%' character." }
} }
}
{ $examples
{ $example
"USING: calendar formatting ;"
"now \"%c\" strftime"
"Mon Dec 15 14:40:43 2008" }
} ; } ;
ARTICLE: "formatting" "Formatted printing" ARTICLE: "formatting" "Formatted printing"

View File

@ -1,7 +1,7 @@
! Copyright (C) 2008 Doug Coleman. ! Copyright (C) 2008 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: calendar kernel http.server.dispatchers prettyprint USING: calendar kernel http.server.dispatchers prettyprint
sequences printf furnace.actions html.forms accessors sequences formatting furnace.actions html.forms accessors
furnace.redirection ; furnace.redirection ;
IN: webapps.irc-log IN: webapps.irc-log