! Copyright (C) 2008 John Benediktsson
! See http://factorcode.org/license.txt for BSD license
-USING: accessors arrays assocs calendar calendar.english combinators
-combinators.smart fry generalizations io io.streams.string
-kernel macros math math.functions math.parser namespaces
+USING: accessors arrays assocs calendar calendar.english
+calendar.private combinators combinators.smart generalizations
+io io.streams.string kernel math math.functions
+math.functions.integer-logs math.parser multiline namespaces
peg.ebnf present prettyprint quotations sequences
-sequences.generalizations strings unicode vectors
-math.functions.integer-logs splitting ;
+sequences.generalizations splitting strings unicode ;
FROM: math.parser.private => format-float ;
IN: formatting
+ERROR: unknown-format-directive value ;
+
<PRIVATE
: compose-all ( seq -- quot )
[ abs ] dip
[ 10^ * round-to-even >integer number>string ]
[ 1 + CHAR: 0 pad-head ]
- [ cut* ] tri "." glue
- ] curry keep neg? [ CHAR: - prefix ] when ;
-
-: format-scientific-mantissa ( x log10x digits -- string )
- swap - 10^ * round-to-even >integer
- number>string 1 cut "." glue ;
-
-: format-scientific-exponent ( log10x -- string )
- number>string 2 CHAR: 0 pad-head
+ [ cut* ] tri [ "." glue ] unless-empty
+ ] keepd neg? [ CHAR: - prefix ] when ;
+
+: format-scientific-mantissa ( x log10x digits -- string rounded-up? )
+ [ swap - 10^ * round-to-even >integer number>string ] keep
+ over length 1 - < [
+ [ but-last >string ] when ! 9.9 rounded to 1e+01
+ 1 cut [ "." glue ] unless-empty
+ ] keep ;
+
+: format-scientific-exponent ( rounded-up? log10x -- string )
+ swap [ 1 + ] when number>string 2 CHAR: 0 pad-head
dup CHAR: - swap index "e" "e+" ? prepend ;
: format-scientific-simple ( x digits -- string )
[ abs dup integer-log10 ] dip
[ format-scientific-mantissa ]
[ drop nip format-scientific-exponent ] 3bi append
- ] curry keep neg? [ CHAR: - prefix ] when ;
+ ] keepd neg? [ CHAR: - prefix ] when ;
: format-float-fast ( x digits string -- string )
[ "" -1 ] 2dip "C" format-float ;
: format-fast-scientific? ( x digits -- x' digits ? )
over float? [ t ]
[ 2dup
- [ abs integer-log10 abs 308 < ]
+ [ [ t ] [ abs integer-log10 abs 308 < ] if-zero ]
[ 15 < ] bi* and
[ [ [ >float ] dip ] when ] keep
] if ;
-: ?fix-nonsignificant-zero ( string digits -- string )
- [ ".0" "." replace ] [ drop ] if-zero ;
-
: format-scientific ( x digits -- string )
format-fast-scientific? [
[ "e" format-float-fast ]
- [ ?fix-nonsignificant-zero ] bi
+ [ [ ".0e" "e" replace ] [ drop ] if-zero ] bi
] [ format-scientific-simple ] if ;
: format-fast-decimal? ( x digits -- x' digits ? )
: format-decimal ( x digits -- string )
format-fast-decimal? [
[ "f" format-float-fast ]
- [ ?fix-nonsignificant-zero ] bi
+ [ [ ".0" ?tail drop ] [ drop ] if-zero ] bi
] [ format-decimal-simple ] if ;
-ERROR: unknown-printf-directive ;
-
-EBNF: parse-printf
+EBNF: parse-printf [=[
zero = "0" => [[ CHAR: 0 ]]
char = "'" (.) => [[ second ]]
sign_ = [+ ] => [[ '[ dup first CHAR: - = [ _ prefix ] unless ] ]]
sign = (sign_)? => [[ [ ] or ]]
-width_ = "." ([0-9])* => [[ second >digits '[ _ short head ] ]]
+width_ = "." ([0-9])* => [[ second >digits '[ _ index-or-length head ] ]]
width = (width_)? => [[ [ ] or ]]
digits_ = "." ([0-9])* => [[ second >digits ]]
fmt-s = "s" => [[ [ present ] ]]
fmt-S = "S" => [[ [ present >upper ] ]]
fmt-u = "u" => [[ [ unparse ] ]]
-fmt-d = "d" => [[ [ number>string ] ]]
-fmt-o = "o" => [[ [ >oct ] ]]
-fmt-O = "O" => [[ [ >oct >upper ] ]]
-fmt-b = "b" => [[ [ >bin ] ]]
-fmt-B = "B" => [[ [ >bin >upper ] ]]
+fmt-d = "d" => [[ [ >integer number>string ] ]]
+fmt-o = "o" => [[ [ >integer >oct ] ]]
+fmt-b = "b" => [[ [ >integer >bin ] ]]
fmt-e = digits "e" => [[ first '[ _ format-scientific ] ]]
fmt-E = digits "E" => [[ first '[ _ format-scientific >upper ] ]]
fmt-f = digits "f" => [[ first '[ _ format-decimal ] ]]
-fmt-x = "x" => [[ [ >hex ] ]]
-fmt-X = "X" => [[ [ >hex >upper ] ]]
-unknown = (.)* => [[ unknown-printf-directive ]]
+fmt-x = "x" => [[ [ >integer >hex ] ]]
+fmt-X = "X" => [[ [ >integer >hex >upper ] ]]
+unknown = (.)* => [[ "" like unknown-format-directive ]]
strings_ = fmt-c|fmt-C|fmt-s|fmt-S|fmt-u
strings = pad width strings_ => [[ <reversed> compose-all ]]
-numbers_ = fmt-d|fmt-o|fmt-O|fmt-b|fmt-B|fmt-e|fmt-E|fmt-f|fmt-x|fmt-X
+numbers_ = fmt-d|fmt-o|fmt-b|fmt-e|fmt-E|fmt-f|fmt-x|fmt-X
numbers = sign pad numbers_ => [[ unclip-last prefix compose-all [ fix-sign ] append ]]
types = strings|numbers
-lists = "[%" types ", %]" => [[ second '[ _ map ", " join "{ " prepend " }" append ] ]]
+lists = "[%" types ", %]" => [[ second '[ _ { } map-as ", " join "{ " " }" surround ] ]]
-assocs = "[%" types ": %" types " %]" => [[ [ second ] [ fourth ] bi '[ unzip [ _ map ] dip _ map zip [ ":" join ] map ", " join "{ " prepend " }" append ] ]]
+assocs = "[%" types ": %" types " %]" => [[ [ second ] [ fourth ] bi '[ [ _ _ bi* ":" glue ] { } assoc>map ", " join "{ " " }" surround ] ]]
formats = "%" (types|fmt-%|lists|assocs|unknown) => [[ second ]]
-plain-text = (!("%").)+ => [[ >string ]]
+plain-text = [^%]+ => [[ >string ]]
-text = (formats|plain-text)* => [[ ]]
+text = (formats|plain-text)*
-;EBNF
+]=]
: printf-quot ( format-string -- format-quot n )
parse-printf [ [ callable? ] count ] keep [
[ >time ]
[ year>> number>string ]
} cleave
- ] output>array " " join ; inline
+ ] output>array join-words ; inline
: week-of-year ( timestamp day -- n )
- [ dup clone 1 >>month 1 >>day day-of-week dup ] dip > [ 7 swap - ] when
- [ day-of-year ] dip 2dup < [ 0 2nip ] [ - 7 / 1 + >fixnum ] if ;
+ [ dup clone first-day-of-year dup clone ]
+ [ day-this-week ] bi* swap '[ _ time- duration>days ] bi@
+ dup 0 < [ 7 + - ] [ drop ] if 7 + 7 /i ;
: week-of-year-sunday ( timestamp -- n ) 0 week-of-year ; inline
: week-of-year-monday ( timestamp -- n ) 1 week-of-year ; inline
-EBNF: parse-strftime
+EBNF: parse-strftime [=[
fmt-% = "%" => [[ "%" ]]
fmt-a = "a" => [[ [ day-of-week day-abbreviation3 ] ]]
fmt-y = "y" => [[ [ year>> 100 mod pad-00 ] ]]
fmt-Y = "Y" => [[ [ year>> number>string ] ]]
fmt-Z = "Z" => [[ [ "Not yet implemented" throw ] ]]
-unknown = (.)* => [[ "Unknown directive" throw ]]
+unknown = (.)* => [[ "" like unknown-format-directive ]]
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|
formats = "%" (formats_) => [[ second ]]
-plain-text = (!("%").)+ => [[ >string ]]
+plain-text = [^%]+ => [[ >string ]]
-text = (formats|plain-text)* => [[ ]]
+text = (formats|plain-text)*
-;EBNF
+]=]
PRIVATE>
MACRO: strftime ( format-string -- quot )
parse-strftime [
dup string? [
- '[ _ swap push-all ]
+ '[ _ append! ]
] [
- '[ over @ swap push-all ]
+ '[ over @ append! ]
] if
- ] map '[
- SBUF" " clone [ _ cleave drop ] keep "" like
- ] ;
+ ] map concat '[ SBUF" " clone @ nip "" like ] ;
projects / factor.git / blobdiff