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

toml: some updates.

clean-linux-x86-32
John Benediktsson 2019-09-25 14:41:06 -07:00
parent cb854c0801
commit cc858f633f
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extra/toml/toml.factor
View File

@ -57,7 +57,7 @@ TUPLE: entry key value ;
"0b" token hide bindigit digits 2seq [ first bin> ] action ; "0b" token hide bindigit digits 2seq [ first bin> ] action ;
: integer-parser ( -- parser ) : integer-parser ( -- parser )
hex oct bin dec 4choice [ ] action ; hex oct bin dec 4choice ;
: float ( -- parser ) : float ( -- parser )
[ [
@ -68,7 +68,7 @@ TUPLE: entry key value ;
"e" token "E" token 2choice "e" token "E" token 2choice
sign optional sign optional
decdigit digits optional 3seq optional , decdigit digits optional 3seq optional ,
] seq* ; ] seq* [ unclip-last append "" concat-as string>number ] action ;
: +inf ( -- parser ) : +inf ( -- parser )
"+" token optional "inf" token 2seq [ drop 1/0. ] action ; "+" token optional "inf" token 2seq [ drop 1/0. ] action ;
@ -81,8 +81,7 @@ TUPLE: entry key value ;
[ drop NAN: 8000000000000 ] action ; [ drop NAN: 8000000000000 ] action ;
: float-parser ( -- parser ) : float-parser ( -- parser )
float +inf -inf nan 4choice float +inf -inf nan 4choice ;
[ unclip-last append "" concat-as string>number ] action ;
: escaped ( -- parser ) : escaped ( -- parser )
"\\" token hide [ "btnfr\"\\" member-eq? ] satisfy 2seq "\\" token hide [ "btnfr\"\\" member-eq? ] satisfy 2seq
@ -141,12 +140,11 @@ TUPLE: entry key value ;
] seq* [ "" concat-as ] action ; ] seq* [ "" concat-as ] action ;
: timezone-parser ( -- parser ) : timezone-parser ( -- parser )
[ "Z" token
"Z" token , "-" token
"-" token decdigit 2 exactly-n ":" token
decdigit 2 exactly-n ":" token decdigit 2 exactly-n 4seq [ "" concat-as ] action
decdigit 2 exactly-n 4seq [ "" concat-as ] action , 2choice ;
] choice* ;
: datetime-parser ( -- parser ) : datetime-parser ( -- parser )
[ [