From 080430a386c04628440edab6dd69ec51411161d8 Mon Sep 17 00:00:00 2001 From: "chris.double" Date: Fri, 6 Oct 2006 02:46:02 +0000 Subject: [PATCH] parser-combinators: refactor <:&> and <&:> --- .../parser-combinators/parser-combinators.factor | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/contrib/parser-combinators/parser-combinators.factor b/contrib/parser-combinators/parser-combinators.factor index d28ac0461c..14c7b8c0ae 100644 --- a/contrib/parser-combinators/parser-combinators.factor +++ b/contrib/parser-combinators/parser-combinators.factor @@ -178,21 +178,13 @@ M: some-parser (parse) ( input parser -- result ) #! Same as <&> except discard the results of the first parser. <&> [ second ] <@ ; -: <:&>-parser ( input parser1 parser2 -- result ) +: <:&> ( parser1 parser2 -- result ) #! Same as <&> except flatten the result. - <&> [ dup second swap first [ % , ] { } make ] <@ call ; + <&> [ dup second swap first [ % , ] { } make ] <@ ; -: <:&> ( parser1 parser2 -- parser ) +: <&:> ( parser1 parser2 -- result ) #! Same as <&> except flatten the result. - [ <:&>-parser ] curry curry ; - -: <&:>-parser ( input parser1 parser2 -- result ) - #! Same as <&> except flatten the result. - <&> [ dup second swap first [ , % ] { } make ] <@ call ; - -: <&:> ( parser1 parser2 -- parser ) - #! Same as <&> except flatten the result. - [ <&:>-parser ] curry curry ; + <&> [ dup second swap first [ , % ] { } make ] <@ ; DEFER: <*> -- 2.34.1