lists: first pass at some cleanup.

[factor.git] / extra / parser-combinators / parser-combinators.factor

diff --git a/extra/parser-combinators/parser-combinators.factor b/extra/parser-combinators/parser-combinators.factor
index 39db45eb4a3254b0b1a7cc0bf68f907daeb04d4a..d44cb530f3f85c94338fc8abbcb93c6d76232a00 100644 (file)
--- a/extra/parser-combinators/parser-combinators.factor
+++ b/extra/parser-combinators/parser-combinators.factor
@@ -151,8 +151,8 @@ TUPLE: and-parser parsers ;
             [ parsed>> ] dip
             [ parsed>> 2array ] keep
             unparsed>> <parse-result>
-        ] with lazy-map
-    ] with lazy-map lconcat ;
+        ] with lmap-lazy
+    ] with lmap-lazy lconcat ;
 
 M: and-parser parse ( input parser -- list )
     ! Parse 'input' by sequentially combining the
@@ -175,7 +175,7 @@ M: or-parser parse ( input parser1 -- list )
     ! of parser1 and parser2 being applied to the same
     ! input. This implements the choice parsing operator.
     parsers>> sequence>list
-    [ parse ] with lazy-map lconcat ;
+    [ parse ] with lmap-lazy lconcat ;
 
 : trim-head-slice ( string -- string )
     ! Return a new string without any leading whitespace
@@ -220,7 +220,7 @@ M: apply-parser parse ( input parser -- result )
     -rot parse [
         [ parsed>> swap call ] keep
         unparsed>> <parse-result>
-    ] with lazy-map ;
+    ] with lmap-lazy ;
 
 TUPLE: some-parser p1 ;