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

fix bug in take-sequence

db4
Doug Coleman 2009-04-03 12:40:45 -05:00
parent 4f3e8be3f6
commit a42b872a23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extra/html/parser/state/state-tests.factor
View File

@ -99,3 +99,6 @@ IN: html.parser.state.tests
[ "" ]
[ "abc" <state-parser> dup "abc" take-sequence drop take-rest ] unit-test
[ f ]
[ "abc" <state-parser> "abcdefg" take-sequence ] unit-test

11
extra/html/parser/state/state.factor
View File

@ -51,9 +51,16 @@ TUPLE: state-parser sequence n ;
: take-while ( state-parser quot: ( obj -- ? ) -- sequence/f )
[ not ] compose take-until ; inline
: <safe-slice> ( from to seq -- slice/f )
3dup {
[ 2drop 0 < ]
[ [ drop ] 2dip length > ]
[ drop > ]
} 3|| [ 3drop f ] [ slice boa ] if ; inline
:: take-sequence ( state-parser sequence -- obj/f )
state-parser [ n>> dup sequence length + ] [ sequence>> ] bi <slice>
sequence sequence= [
state-parser [ n>> dup sequence length + ] [ sequence>> ] bi
<safe-slice> sequence sequence= [
sequence
state-parser [ sequence length + ] change-n drop
] [