From f90846f78e23f66d84266518b314a6a2dcc66f16 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 9 Aug 2022 21:19:24 -0700 Subject: [PATCH] Revert "xmode.marker: faster update-match-group" This reverts commit c489cb3bd4056bf72c43052db578d52bdbc62d53. --- basis/xmode/marker/marker.factor | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor index 2b09ffdd55..32fae3c324 100644 --- a/basis/xmode/marker/marker.factor +++ b/basis/xmode/marker/marker.factor @@ -110,13 +110,11 @@ 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' ) - n H{ } [ 1 + CHAR: $ swap "" 2sequence ] cache :> x - x str subseq? [ - x match "" like regexp n nth-match str replace - ] [ str ] if ; +: update-match-group ( str match regexp n -- str' ) + [ nth-match ] [ CHAR: 1 + "$%c" sprintf ] bi swap replace ; : 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' ) -- 2.34.1