From: chris.double <chris.double@double.co.nz>
Date: Fri, 6 Oct 2006 02:46:02 +0000 (+0000)
Subject: parser-combinators: refactor <:&> and <&:>
X-Git-Tag: 0.85~81
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=080430a386c04628440edab6dd69ec51411161d8

parser-combinators: refactor <:&> and <&:>
---

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: <*>