From 7e983e5ee07f0409d28e68f3ebf05461cc1df6da Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Mon, 22 Sep 2008 20:13:24 -0500 Subject: [PATCH] remove code duplication --- basis/farkup/farkup.factor | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/basis/farkup/farkup.factor b/basis/farkup/farkup.factor index acd52f3cf8..d3c982ebf2 100644 --- a/basis/farkup/farkup.factor +++ b/basis/farkup/farkup.factor @@ -20,9 +20,8 @@ TUPLE: superscript child ; TUPLE: subscript child ; TUPLE: inline-code child ; TUPLE: paragraph child ; -TUPLE: unordered-list-item child ; +TUPLE: list-item child ; TUPLE: unordered-list child ; -TUPLE: ordered-list-item child ; TUPLE: ordered-list child ; TUPLE: table child ; TUPLE: table-row child ; @@ -113,12 +112,12 @@ paragraph = ((paragraph-item nl => [[ first ]])+ nl+ => [[ first ]] list-item = (cell | inline-tag)* ordered-list-item = '#' list-item - => [[ second ordered-list-item boa ]] + => [[ second list-item boa ]] ordered-list = ((ordered-list-item nl)+ ordered-list-item? | ordered-list-item) => [[ ordered-list boa ]] unordered-list-item = '-' list-item - => [[ second unordered-list-item boa ]] + => [[ second list-item boa ]] unordered-list = ((unordered-list-item nl)+ unordered-list-item? | unordered-list-item) => [[ unordered-list boa ]] @@ -187,9 +186,8 @@ M: emphasis (write-farkup) [ child>> (write-farkup) ] "em" in-tag. ; M: superscript (write-farkup) [ child>> (write-farkup) ] "sup" in-tag. ; M: subscript (write-farkup) [ child>> (write-farkup) ] "sub" in-tag. ; M: inline-code (write-farkup) [ child>> (write-farkup) ] "code" in-tag. ; -M: unordered-list-item (write-farkup) [ child>> (write-farkup) ] "li" in-tag. ; +M: list-item (write-farkup) [ child>> (write-farkup) ] "li" in-tag. ; M: unordered-list (write-farkup) [ child>> (write-farkup) ] "ul" in-tag. ; -M: ordered-list-item (write-farkup) [ child>> (write-farkup) ] "li" in-tag. ; M: ordered-list (write-farkup) [ child>> (write-farkup) ] "ol" in-tag. ; M: paragraph (write-farkup) [ child>> (write-farkup) ] "p" in-tag. ; M: link (write-farkup) [ href>> ] [ text>> ] bi write-link ;