peg.search: rename search/replace to peg-search/peg-replace

diff --git a/basis/peg/ebnf/ebnf.factor b/basis/peg/ebnf/ebnf.factor
index 415c7f857e3213abb07f0f4ca88a19ba8eedc37d..eefa9a600651023d0d9f0ec6beb0402a62bb3ad5 100644 (file)
--- a/basis/peg/ebnf/ebnf.factor
+++ b/basis/peg/ebnf/ebnf.factor
@@ -3,12 +3,9 @@
 
 USING: accessors assocs combinators combinators.short-circuit
 effects kernel make math.parser multiline namespaces parser peg
-peg.private peg.parsers quotations sequences sequences.deep
-splitting stack-checker strings strings.parser summary unicode
-vocabs.parser words ;
-
-FROM: vocabs.parser => search ;
-FROM: peg.search => replace ;
+peg.private peg.parsers peg.search quotations sequences
+sequences.deep splitting stack-checker strings strings.parser
+summary unicode vocabs.parser words ;
 
 IN: peg.ebnf
 
@@ -107,7 +104,7 @@ C: <ebnf> ebnf
         "\t" token [ drop "\\t" ] action ,
         "\n" token [ drop "\\n" ] action ,
         "\r" token [ drop "\\r" ] action ,
-    ] choice* replace ;
+    ] choice* peg-replace ;
 
 : identifier-parser ( -- parser )
     ! Return a parser that parses an identifier delimited by

diff --git a/basis/peg/parsers/parsers.factor b/basis/peg/parsers/parsers.factor
index 6688befd5b8930e68c04a0d3bbac053c6a497643..fa07432dcb28ab569331607ed96fb9cccac233c5 100644 (file)
--- a/basis/peg/parsers/parsers.factor
+++ b/basis/peg/parsers/parsers.factor
@@ -1,9 +1,8 @@
 ! Copyright (C) 2007, 2008 Chris Double, Doug Coleman.
 ! See https://factorcode.org/license.txt for BSD license.
 USING: accessors fry kernel literals make math math.parser
-ranges peg peg.private sequences splitting strings unicode
-vectors ;
-FROM: peg.search => replace ;
+ranges peg peg.private peg.search sequences splitting strings
+unicode vectors ;
 IN: peg.parsers
 
 <PRIVATE
@@ -92,7 +91,7 @@ PRIVATE>
         any-char ,
     ] seq* [
         first2 [a..b] >string
-    ] action replace ;
+    ] action peg-replace ;
 
 : range-pattern ( pattern -- parser )
     ! 'pattern' is a set of characters describing the

diff --git a/basis/peg/search/search-docs.factor b/basis/peg/search/search-docs.factor
index 1a92b94604faf511183254546ffdffe37ff546d0..c719ac21bef99ad9ed01ff8d884b39fffdd02a1c 100644 (file)
--- a/basis/peg/search/search-docs.factor
+++ b/basis/peg/search/search-docs.factor
@@ -12,7 +12,7 @@ HELP: tree-write
     "writing each object to the stream." }
 { $example "USE: peg.search" "{ 65 \"bc\" { 68 \"ef\" } } tree-write" "AbcDef" } ;
 
-HELP: search
+HELP: peg-search
 { $values
   { "string" string }
   { "parser" "a peg based parser" }
@@ -24,11 +24,18 @@ HELP: search
     "parser."
 }
 
-{ $example "USING: peg.parsers peg.search prettyprint ;" "\"one 123 two 456\" integer-parser search ." "V{ 123 456 }" }
-{ $example "USING: peg peg.parsers peg.search prettyprint ;" "\"one 123 \\\"hello\\\" two 456\" integer-parser string-parser 2choice search ." "V{ 123 \"hello\" 456 }" }
-{ $see-also replace } ;
+{ $example
+    "USING: peg.parsers peg.search prettyprint ;"
+    "\"one 123 two 456\" integer-parser peg-search ."
+    "V{ 123 456 }"
+}
+{ $example
+    "USING: peg peg.parsers peg.search prettyprint ;"
+    "\"one 123 \\\"hello\\\" two 456\" integer-parser string-parser 2choice peg-search ."
+    "V{ 123 \"hello\" 456 }"
+} ;
 
-HELP: replace
+HELP: peg-replace
 { $values
   { "string" string }
   { "parser" "a peg based parser" }
@@ -39,5 +46,10 @@ HELP: replace
     "successfully parse with the given parser replaced with "
     "the result of that parser."
 }
-{ $example "USING: math math.parser peg peg.parsers peg.search prettyprint ;" "\"one 123 two 456\" integer-parser [ 2 * number>string ] action replace ." "\"one 246 two 912\"" }
-{ $see-also search } ;
+{ $example
+    "USING: math math.parser peg peg.parsers peg.search prettyprint ;"
+    "\"one 123 two 456\" integer-parser [ 2 * number>string ] action peg-replace ."
+    "\"one 246 two 912\""
+} ;
+
+{ peg-search peg-replace } related-words

diff --git a/basis/peg/search/search.factor b/basis/peg/search/search.factor
index 99a4b0acde8a91956cb9e209b44f6c89c2ebf854..50c9672025c7794fcfe79589bc656a1bcffe82d4 100644 (file)
--- a/basis/peg/search/search.factor
+++ b/basis/peg/search/search.factor
@@ -21,11 +21,11 @@ CONSTANT: any-char-parser $[ [ drop t ] satisfy ]
 
 PRIVATE>
 
-: search ( string parser -- seq )
+: peg-search ( string parser -- seq )
     any-char-parser [ drop f ] action 2choice repeat0
     [ parse sift ] [ 3drop { } ] recover ;
 
-: replace ( string parser -- result )
+: peg-replace ( string parser -- result )
     [
         any-char-parser 2choice repeat0
         parse sift tree-write