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

more cleanup

db4
Doug Coleman 2009-04-01 11:48:44 -05:00
parent fdb8c9da1a
commit d82b8ba4eb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
USING: accessors arrays hashtables html.parser.state USING: accessors arrays hashtables html.parser.state
html.parser.utils kernel namespaces sequences html.parser.utils kernel namespaces sequences
unicode.case unicode.categories combinators.short-circuit unicode.case unicode.categories combinators.short-circuit
quoting ; quoting fry ;
IN: html.parser IN: html.parser
@ -19,7 +19,7 @@ SYMBOL: tagstack
: closing-tag? ( string -- ? ) : closing-tag? ( string -- ? )
[ f ] [ f ]
[ [ first ] [ peek ] bi [ CHAR: / = ] bi@ or ] if-empty ; [ { [ first CHAR: / = ] [ peek CHAR: / = ] } 1|| ] if-empty ;
: <tag> ( name attributes closing? -- tag ) : <tag> ( name attributes closing? -- tag )
tag new tag new
@ -35,11 +35,14 @@ SYMBOL: tagstack
swap >>name swap >>name
swap >>text ; inline swap >>text ; inline
: (read-quote) ( state-parser ch -- string )
'[ [ current _ = ] take-until ] [ next drop ] bi ;
: read-single-quote ( state-parser -- string ) : read-single-quote ( state-parser -- string )
[ [ current CHAR: ' = ] take-until ] [ next drop ] bi ; CHAR: ' (read-quote) ;
: read-double-quote ( state-parser -- string ) : read-double-quote ( state-parser -- string )
[ [ current CHAR: " = ] take-until ] [ next drop ] bi ; CHAR: " (read-quote) ;
: read-quote ( state-parser -- string ) : read-quote ( state-parser -- string )
dup get+increment CHAR: ' = dup get+increment CHAR: ' =