peg: reuse code in compile-parsers-quots.

diff --git a/basis/peg/peg.factor b/basis/peg/peg.factor
index 5bbb3825e0a5936a7978037c95a88d48618dcc78..aedb38b3a4b63b14f0dbc615291f4b9c848b2dd2 100644 (file)
--- a/basis/peg/peg.factor
+++ b/basis/peg/peg.factor
@@ -50,6 +50,9 @@ SYMBOL: error-stack
 
 SYMBOL: ignore
 
+: ignore? ( obj -- ? )
+    ignore = ;
+
 : packrat ( id -- cache )
     ! The packrat cache is a mapping of parser-id->cache.
     ! For each parser it maps to a cache holding a mapping
@@ -268,6 +271,7 @@ GENERIC: (compile) ( peg -- quot )
 : define-parser-word ( parser word -- )
     ! Return the body of the word that is the compiled version
     ! of the parser.
+
     2dup swap peg>> (compile) ( -- result ) define-declared
     swap id>> "peg-id" set-word-prop ;
 
@@ -285,7 +289,11 @@ GENERIC: (compile) ( peg -- quot )
     ] if* ;
 
 : compile-parser-quot ( parser -- quot )
-    compile-parser [ execute-parser ] curry ;
+    compile-parser '[ _ execute-parser ] ;
+
+: compile-parsers-quots ( parsers -- quots )
+    [ compile-parser-quot ] map dup rest-slice
+    [ '[ @ merge-errors ] ] map! drop ;
 
 SYMBOL: delayed
 
@@ -373,12 +381,8 @@ TUPLE: seq-parser parsers ;
 
 : calc-seq-result ( prev-result current-result -- next-result )
     [
-        [ remaining>> swap remaining<< ] 2keep
-        ast>> dup ignore = [
-            drop
-        ] [
-            swap [ ast>> push ] keep
-        ] if
+        [ remaining>> >>remaining ] [ ast>> ] bi
+        dup ignore? [ drop ] [ over ast>> push ] if
     ] [
         drop f
     ] if* ;
@@ -387,31 +391,21 @@ TUPLE: seq-parser parsers ;
     '[ @ calc-seq-result ] [ f ] if* ; inline
 
 M: seq-parser (compile)
-    [
-        [ input-slice V{ } clone <parse-result> ] %
-        [
-            parsers>> unclip compile-parser-quot [ parse-seq-element ] curry ,
-            [ compile-parser-quot [ merge-errors ] compose [ parse-seq-element ] curry , ] each
-        ] { } make , \ 1&& ,
-    ] [ ] make ;
+    parsers>> compile-parsers-quots
+    [ '[ _ parse-seq-element ] ] map
+    '[ input-slice V{ } clone <parse-result> _ 1&& ] ;
 
 TUPLE: choice-parser parsers ;
 
 M: choice-parser (compile)
-    [
-        [
-            parsers>> [ compile-parser-quot ] map
-            unclip , [ [ merge-errors ] compose , ] each
-        ] { } make , \ 0|| ,
-    ] [ ] make ;
+    parsers>> compile-parsers-quots '[ _ 0|| ] ;
 
 TUPLE: repeat0-parser parser ;
 
 : (repeat) ( quot: ( -- result ) result -- result )
     over call [
-        [ remaining>> swap remaining<< ] 2keep
-        ast>> swap [ ast>> push ] keep
-        (repeat)
+        [ remaining>> >>remaining ] [ ast>> ] bi
+        over ast>> push (repeat)
     ] [
         nip
     ] if* ; inline recursive