X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=basis%2Fxmode%2Fmarker%2Fmarker.factor;h=2b09ffdd5536b4bb1aa2dc3a26eeb839378a9697;hp=32fae3c3245f06b1b39eddd9a2e12a10fd6cf45a;hb=c489cb3bd4056bf72c43052db578d52bdbc62d53;hpb=bf092cd5e508deda64ea3be3e21616a2bab04ba1 diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor index 32fae3c324..2b09ffdd55 100644 --- 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' )