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

csv: faster, only use make when field contains quotes or newlines.

db4
John Benediktsson 2012-07-15 09:50:51 -07:00
parent 3bd6610a9d
commit e607cfb6ce
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
basis/csv/csv.factor
View File

@ -24,19 +24,6 @@ DEFER: quoted-field
MEMO: (quoted-field) ( delimiter -- delimiter' ) MEMO: (quoted-field) ( delimiter -- delimiter' )
"\"\n" swap suffix ; inline "\"\n" swap suffix ; inline
: not-quoted-field ( -- endchar )
delimiter> (quoted-field) read-until
dup CHAR: " =
[ 2drop quoted-field ]
[
swap dup {
[ ?first blank? ]
[ ?last blank? ]
} 1||
[ [ blank? ] trim ] when %
]
if ;
: maybe-escaped-quote ( -- endchar ) : maybe-escaped-quote ( -- endchar )
read1 dup { read1 dup {
{ CHAR: " [ , quoted-field ] } { CHAR: " [ , quoted-field ] }
@ -50,7 +37,18 @@ MEMO: (quoted-field) ( delimiter -- delimiter' )
drop % maybe-escaped-quote ; drop % maybe-escaped-quote ;
: field ( -- sep string ) : field ( -- sep string )
[ not-quoted-field ] "" make ; delimiter> (quoted-field) read-until
dup CHAR: " = [
2drop [ quoted-field ] "" make
] [
swap [ "" ] [
dup {
[ ?first blank? ]
[ ?last blank? ]
} 1||
[ [ blank? ] trim ] when
] if-empty
] if ;
: (row) ( -- sep ) : (row) ( -- sep )
f delimiter> '[ dup _ = ] f delimiter> '[ dup _ = ]