pcre2: fix un-named capture groups

mrjbq7 · May 5, 2024 · 4decce4 · 4decce4
1 parent 160559f
commit 4decce4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/extra/pcre2/pcre2-tests.factor b/extra/pcre2/pcre2-tests.factor
@@ -10,3 +10,13 @@ USING: pcre2 sequences tools.test ;
     "1999-01-12" "(?P<year>\\d{4})-(?P<month>\\d{2})-(?P<day>\\d{2})"
     findall first
 ] unit-test
+
+{
+    {
+        { { f "h" } }
+        { { f "e" } }
+        { { f "l" } }
+        { { f "l" } }
+        { { f "o" } }
+    }
+} [ "hello" "(.)" findall ] unit-test
diff --git a/extra/pcre2/pcre2.factor b/extra/pcre2/pcre2.factor
@@ -134,7 +134,6 @@ M:: pcre2 findall ( subject obj -- matches )
                 [ throw ]
             } case
         ] [
-            rc name_count 1 + assert=
             match_data pcre2_get_ovector_pointer
             rc assert-positive 2 * PCRE2_SIZE <c-direct-array> :> ovector
 
@@ -212,7 +211,6 @@ M:: pcre2 findall ( subject obj -- matches )
 
                             f
                         ] [
-                            rc name_count 1 + assert=
                             [
                                 f ovector first2 subject subseq 2array ,
                                 name_table [