xmode.marker: ignore non-capturing groups

diff --git a/basis/xmode/marker/marker.factor b/basis/xmode/marker/marker.factor
index a93283e29020935417bdf1faae8991ee2e4832f8..204e108f3f59a4ddbe89a399ffc7b8b190abf4b6 100644 (file)
--- a/basis/xmode/marker/marker.factor
+++ b/basis/xmode/marker/marker.factor
@@ -93,33 +93,33 @@ M: regexp text-matches?
 
 ! XXX: Terrible inefficient regexp match group support
 
 
 ! XXX: Terrible inefficient regexp match group support
 

-: #match-groups ( regexp -- n/f )
-    raw>> [ CHAR: ( = ] count [ f ] when-zero ;
+! XXX: support named-capturing groups?

 
 

-: nth-index ( n obj seq -- i )
-    [ = dup [ drop 1 - dup 0 < ] when ] with find drop nip ;
+: group-start ( i raw -- n/f )
+    [ CHAR: ( -rot index-from ] keep 2dup
+    { [ drop ] [ [ 1 + ] dip ?nth CHAR: ? = ] } 2&&
+    [ [ 1 + ] dip group-start ] [ drop ] if ;
+
+: nth-group-start ( n raw -- n )
+    [ -1 ] 2dip '[ dup [ 1 + _ group-start ] when ] times ;
+
+: nth-group ( n raw -- before nth )
+    [ nth-group-start ] keep swap cut CHAR: ) over index 1 + head ;

 
 : match-group-regexp ( regexp n -- skip-regexp match-regexp )
 
 : match-group-regexp ( regexp n -- skip-regexp match-regexp )

-    [ [ options>> options>string ] [ raw>> ] bi ] dip
-    CHAR: ( pick nth-index cut CHAR: ) over index 1 + head
-    rot '[ _ H{ } [ <optioned-regexp> ] 2cache ] bi@ ;
+    [ [ options>> options>string ] [ raw>> ] bi ] dip swap
+    nth-group rot '[ _ H{ } [ <optioned-regexp> ] 2cache ] bi@ ;

 
 : skip-first-match ( match regexp -- tailseq )
 
 : skip-first-match ( match regexp -- tailseq )

-    first-match [ seq>> ] [ to>> ] bi tail ;
+    [ >string ] dip first-match [ seq>> ] [ to>> ] bi tail ;

 
 : nth-match ( match regexp n -- slice/f )
 
 : 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{ } [ 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* ;
+    match-group-regexp [ skip-first-match ] [ match-start ] bi* ;

 
 : update-match-groups ( str match regexp -- str' )
 
 : update-match-groups ( str match regexp -- str' )

-    [ >string ] dip
-    dup #match-groups [ update-match-group ] 2with each-integer ;
+    pick CHAR: $ swap index [
+        R/ [$]\d/ [ second CHAR: 0 - nth-match ] 2with re-replace-with
+    ] [ 2drop ] if ;

 
 GENERIC: fixup-end ( match regexp end -- end' )
 
 
 GENERIC: fixup-end ( match regexp end -- end' )
 


@@ -137,7 +137,7 @@ M: regexp fixup-end
     [ options>> options>string ] bi <fixup-regexp> ;
 
 : fixup-end? ( text -- ? )
     [ options>> options>string ] bi <fixup-regexp> ;
 
 : fixup-end? ( text -- ? )

-    { [ regexp? ] [ #match-groups ] } 1&& ;
+    { [ regexp? ] [ 0 swap raw>> group-start ] } 1&& ;

 
 : fixup-end/text-matches? ( string regexp rule -- match-count/f )
     [ >string ] 2dip [ [ match-start dup ] keep ] dip pick [
 
 : fixup-end/text-matches? ( string regexp rule -- match-count/f )
     [ >string ] 2dip [ [ match-start dup ] keep ] dip pick [