xmode.marker: faster update-match-group

[factor.git] / basis / xmode / marker / marker.factor

diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor
index 32fae3c3245f06b1b39eddd9a2e12a10fd6cf45a..2b09ffdd5536b4bb1aa2dc3a26eeb839378a9697 100644 (file)
--- a/basis/xmode/marker/marker.factor
+++ b/basis/xmode/marker/marker.factor
@@ -110,11 +110,13 @@ M: regexp text-matches?
 : nth-match ( match regexp n -- slice/f )
     match-group-regexp [ skip-first-match ] [ first-match ] bi* ;
 
-: update-match-group ( str match regexp n -- str' )
-    [ nth-match ] [ CHAR: 1 + "$%c" sprintf ] bi swap replace ;
+:: update-match-group ( str match regexp n -- str' )
+    n H{ } [ 1 + CHAR: $ swap "" 2sequence ] cache :> x
+    x str subseq? [
+        x match "" like regexp n nth-match str replace
+    ] [ str ] if ;
 
 : update-match-groups ( str match regexp -- str' )
-    [ >string ] dip
     dup #match-groups [ update-match-group ] 2with each-integer ;
 
 GENERIC: fixup-end ( match regexp end -- end' )