From ccdef3594986d4ea888eb2b61c6e8e6620b14f33 Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 22 Mar 2009 19:25:55 -0500 Subject: [PATCH] inline everything so stuff compiles --- extra/html/parser/analyzer/analyzer.factor | 4 ++-- extra/html/parser/parser.factor | 2 +- extra/html/parser/state/state.factor | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/extra/html/parser/analyzer/analyzer.factor b/extra/html/parser/analyzer/analyzer.factor index abe830c3fa..b344ce160f 100755 --- a/extra/html/parser/analyzer/analyzer.factor +++ b/extra/html/parser/analyzer/analyzer.factor @@ -46,7 +46,7 @@ TUPLE: link attributes clickable ; : find-between-all ( vector quot -- seq ) dupd '[ _ [ closing?>> not ] bi and ] find-all - [ first2 find-between* ] with map ; + [ first2 find-between* ] with map ; inline : remove-blank-text ( vector -- vector' ) [ @@ -113,7 +113,7 @@ TUPLE: link attributes clickable ; [ clickable>> [ bl bl text>> print ] each nl ] bi ; : find-by-text ( seq quot -- tag ) - [ dup name>> text = ] prepose find drop ; + [ dup name>> text = ] prepose find drop ; inline : find-opening-tags-by-name ( name seq -- seq ) [ [ name>> = ] [ closing?>> not ] bi and ] with find-all ; diff --git a/extra/html/parser/parser.factor b/extra/html/parser/parser.factor index c445b708c5..60e5ddbf54 100644 --- a/extra/html/parser/parser.factor +++ b/extra/html/parser/parser.factor @@ -137,7 +137,7 @@ SYMBOL: tagstack ] when ; : tag-parse ( quot -- vector ) - V{ } clone tagstack [ string-parse ] with-variable ; + V{ } clone tagstack [ string-parse ] with-variable ; inline : parse-html ( string -- vector ) [ (parse-html) tagstack get ] tag-parse ; diff --git a/extra/html/parser/state/state.factor b/extra/html/parser/state/state.factor index cda601866e..1b3f188a78 100644 --- a/extra/html/parser/state/state.factor +++ b/extra/html/parser/state/state.factor @@ -5,22 +5,22 @@ IN: html.parser.state TUPLE: state string i ; -: get-i ( -- i ) state get i>> ; +: get-i ( -- i ) state get i>> ; inline : get-char ( -- char ) - state get [ i>> ] [ string>> ] bi ?nth ; + state get [ i>> ] [ string>> ] bi ?nth ; inline : get-next ( -- char ) - state get [ i>> 1+ ] [ string>> ] bi ?nth ; + state get [ i>> 1+ ] [ string>> ] bi ?nth ; inline : next ( -- ) - state get [ 1+ ] change-i drop ; + state get [ 1+ ] change-i drop ; inline : string-parse ( string quot -- ) - [ 0 state boa state ] dip with-variable ; + [ 0 state boa state ] dip with-variable ; inline : short* ( n seq -- n' seq ) - over [ nip dup length swap ] unless ; + over [ nip dup length swap ] unless ; inline : skip-until ( quot: ( -- ? ) -- ) get-char [ @@ -30,12 +30,12 @@ TUPLE: state string i ; : take-until ( quot: ( -- ? ) -- ) get-i [ skip-until ] dip get-i - state get string>> subseq ; + state get string>> subseq ; inline : string-matches? ( string circular -- ? ) - get-char over push-growing-circular sequence= ; + get-char over push-growing-circular sequence= ; inline : take-string ( match -- string ) dup length [ 2dup string-matches? ] take-until nip - dup length rot length 1- - head next ; + dup length rot length 1- - head next ; inline