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

xml.name: simpler parse-name makes benchmark 12% faster.

db4
John Benediktsson 2012-08-23 18:07:25 -07:00
parent 4ade5ce82f
commit 2fef140e79
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
basis/xml/name/name.factor
View File

@ -53,10 +53,15 @@ SYMBOL: ns-stack
} 2&& } 2&&
] if-empty ; ] if-empty ;
<PRIVATE
: valid-name-start? ( str -- ? )
[ f ] [ version-1.0? swap first name-start? ] if-empty ;
: maybe-name ( space main -- name/f ) : maybe-name ( space main -- name/f )
2dup { 2dup {
[ drop valid-name? ] [ drop valid-name-start? ]
[ nip valid-name? ] [ nip valid-name-start? ]
} 2&& [ f <name> ] [ 2drop f ] if ; } 2&& [ f <name> ] [ 2drop f ] if ;
: prefixed-name ( str -- name/f ) : prefixed-name ( str -- name/f )
@ -68,10 +73,9 @@ SYMBOL: ns-stack
] [ drop f ] if* ; ] [ drop f ] if* ;
: interpret-name ( str -- name ) : interpret-name ( str -- name )
dup prefixed-name [ ] [ dup prefixed-name [ ] [ <simple-name> ] ?if ;
dup valid-name?
[ <simple-name> ] [ bad-name ] if PRIVATE>
] ?if ;
: take-name ( -- string ) : take-name ( -- string )
version-1.0? '[ _ swap name-char? not ] take-until ; version-1.0? '[ _ swap name-char? not ] take-until ;