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

rename get-next to peek-next, get-char to current

db4
Doug Coleman 2009-04-01 02:32:48 -05:00
parent 474e74a232
commit aa37871ff9
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,30 +12,30 @@ TUPLE: state-parser sequence n ;
swap >>sequence swap >>sequence
0 >>n ; 0 >>n ;
: (get-char) ( n state -- char/f ) : state-parser-nth ( n state -- char/f )
sequence>> ?nth ; inline sequence>> ?nth ; inline
: get-char ( state -- char/f ) : current ( state -- char/f )
[ n>> ] keep (get-char) ; inline [ n>> ] keep state-parser-nth ; inline
: get-next ( state -- char/f ) : peek-next ( state -- char/f )
[ n>> 1 + ] keep (get-char) ; inline [ n>> 1 + ] keep state-parser-nth ; inline
: next ( state -- state ) : next ( state -- state )
[ 1 + ] change-n ; inline [ 1 + ] change-n ; inline
: get+increment ( state -- char/f ) : get+increment ( state -- char/f )
[ get-char ] [ next drop ] bi ; inline [ current ] [ next drop ] bi ; inline
: state-parse ( sequence quot -- ) : state-parse ( sequence quot -- )
[ <state-parser> ] dip call ; inline [ <state-parser> ] dip call ; inline
:: skip-until ( state quot: ( obj -- ? ) -- ) :: skip-until ( state quot: ( obj -- ? ) -- )
state get-char [ state current [
quot call [ state next quot skip-until ] unless quot call [ state next quot skip-until ] unless
] when* ; inline recursive ] when* ; inline recursive
: state-parse-end? ( state -- ? ) get-next not ; : state-parse-end? ( state -- ? ) peek-next not ;
: take-until ( state quot: ( obj -- ? ) -- sequence/f ) : take-until ( state quot: ( obj -- ? ) -- sequence/f )
over state-parse-end? [ over state-parse-end? [
@ -65,3 +65,7 @@ TUPLE: state-parser sequence n ;
: take-until-object ( state obj -- sequence ) : take-until-object ( state obj -- sequence )
'[ _ = ] take-until ; '[ _ = ] take-until ;
: take-stuff ( state delimiter -- sequence )
;