From d82b8ba4ebdeb3c948691ca4d7c1954da1086bd6 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Wed, 1 Apr 2009 11:48:44 -0500 Subject: [PATCH] more cleanup --- extra/html/parser/parser.factor | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/extra/html/parser/parser.factor b/extra/html/parser/parser.factor index 63efa3fdb2..6d2e02cf1d 100644 --- a/extra/html/parser/parser.factor +++ b/extra/html/parser/parser.factor @@ -3,7 +3,7 @@ USING: accessors arrays hashtables html.parser.state html.parser.utils kernel namespaces sequences unicode.case unicode.categories combinators.short-circuit -quoting ; +quoting fry ; IN: html.parser @@ -19,7 +19,7 @@ SYMBOL: tagstack : closing-tag? ( string -- ? ) [ f ] - [ [ first ] [ peek ] bi [ CHAR: / = ] bi@ or ] if-empty ; + [ { [ first CHAR: / = ] [ peek CHAR: / = ] } 1|| ] if-empty ; : ( name attributes closing? -- tag ) tag new @@ -35,11 +35,14 @@ SYMBOL: tagstack swap >>name swap >>text ; inline +: (read-quote) ( state-parser ch -- string ) + '[ [ current _ = ] take-until ] [ next drop ] bi ; + : read-single-quote ( state-parser -- string ) - [ [ current CHAR: ' = ] take-until ] [ next drop ] bi ; + CHAR: ' (read-quote) ; : read-double-quote ( state-parser -- string ) - [ [ current CHAR: " = ] take-until ] [ next drop ] bi ; + CHAR: " (read-quote) ; : read-quote ( state-parser -- string ) dup get+increment CHAR: ' =