xmode.marker: more correct 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..a93283e29020935417bdf1faae8991ee2e4832f8 100644 (file)
--- a/basis/xmode/marker/marker.factor
+++ b/basis/xmode/marker/marker.factor
@@ -110,8 +110,12 @@ 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{ } [ CHAR: 1 + CHAR: $ swap "" 2sequence ] cache :> x
+    x str subseq-range :> ( from to )
+    from [
+        to str snip-slice match regexp n nth-match glue
+    ] [ str ] if* ;
 
 : update-match-groups ( str match regexp -- str' )
     [ >string ] dip