From b826c77627962389eea7d0c44c01de491641af70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Br=C3=BCschweiler?= Date: Fri, 13 Aug 2010 22:53:37 +0200 Subject: [PATCH 1/2] html.parser.analyzer: find-between* didn't always return a sequence, which in turn broke find-hrefs (reported by randy7) --- extra/html/parser/analyzer/analyzer.factor | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extra/html/parser/analyzer/analyzer.factor b/extra/html/parser/analyzer/analyzer.factor index 760fd1e47b..8a0801e5ec 100644 --- a/extra/html/parser/analyzer/analyzer.factor +++ b/extra/html/parser/analyzer/analyzer.factor @@ -29,8 +29,7 @@ TUPLE: link attributes clickable ; : find-between* ( vector i/f tag/f -- vector ) over integer? [ [ tail-slice ] [ name>> ] bi* - dupd find-matching-close drop dup [ 1 + ] when - [ head ] [ first ] if* + dupd find-matching-close drop 0 or 1 + head ] [ 3drop V{ } clone ] if ; inline From 4e584356d9adf7f0383f1327072949537ad8b1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20Br=C3=BCschweiler?= Date: Fri, 13 Aug 2010 23:50:10 +0200 Subject: [PATCH 2/2] slots: the docs for writer used obsolete (>>slot) syntax --- core/slots/slots-docs.factor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/slots/slots-docs.factor b/core/slots/slots-docs.factor index 1fcf40aa20..e3a4eb5c6b 100644 --- a/core/slots/slots-docs.factor +++ b/core/slots/slots-docs.factor @@ -7,7 +7,7 @@ IN: slots ARTICLE: "accessors" "Slot accessors" "For every tuple slot, a " { $emphasis "reader" } " method is defined in the " { $vocab-link "accessors" } " vocabulary. The reader is named " { $snippet { $emphasis "slot" } ">>" } " and given a tuple, pushes the slot value on the stack." $nl -"Writable slots - that is, those not attributed " { $link read-only } " - also have a " { $emphasis "writer" } ". The writer is named " { $snippet "(>>" { $emphasis "slot" } ")" } " and stores a value into a slot. It has stack effect " { $snippet "( value object -- )" } ". If the slot is specialized to a specific class, the writer checks that the value being written into the slot is an instance of that class first. See " { $link "tuple-declarations" } " for details." +"Writable slots - that is, those not attributed " { $link read-only } " - also have a " { $emphasis "writer" } ". The writer is named " { $snippet { $emphasis "slot" } "<<" } " and stores a value into a slot. It has stack effect " { $snippet "( value object -- )" } ". If the slot is specialized to a specific class, the writer checks that the value being written into the slot is an instance of that class first. See " { $link "tuple-declarations" } " for details." $nl "In addition, two utility words are defined for each writable slot." $nl