re2 2.23.0 → 2.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 940bde937a78abda3052eb0957885f3f190310fcd16fd6408cab7796994bd008
-  data.tar.gz: a1847bd0e009e2e4a63395e9452b3ecf39d938922549cc2d8477a9398c1661b6
+  metadata.gz: ac8a9eeb58a93e3f4241d2677a51a15016d543fd55a003e358f1d8442717c517
+  data.tar.gz: d505664cefe09a08d4c14f174791bc3f213cec515897943f12adc2867a91df6f
 SHA512:
-  metadata.gz: 360dc102ebb6ee640bc4c45c8e17f0d22a5b2288c37c40e1288384275214b2c2d72c14ba490ee06472b2ecb9790fbfb5a9a3f7afc35df27aac516b3d4416e302
-  data.tar.gz: 02f43ce9a57cee1b1c3c068f3f66c12c029a0bc22b5af00d837fc1bb2fa5fb90e120dc9bf3287adb3f99302fd0f0dd32af5303fd0e7780f41961f2f7a8429ff5
+  metadata.gz: 31affec3aeee1a47021d3e96360b52c7dc5065d2abcbd748c35d305e6fffdd3b7a521f92bb6c97aaca67b265bb9df34867f18c5e00edf647bd8e609e093c29aa
+  data.tar.gz: 76654d86eea56b7e66102fc6780d16f94eaba95f0d2c605a46a1eece51c2158414d26edfdcfc3732b2301fe35a6fdbe8860336ce8efc1bd416d0830ee0a64e93

data/README.md

@@ -6,7 +6,7 @@ Python".
 
 [![Build Status](https://github.com/mudge/re2/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/mudge/re2/actions)
 
-**Current version:** 2.23.0  
+**Current version:** 2.27.0  
 **Bundled RE2 version:** libre2.11 (2025-11-05)  
 
 ```ruby
@@ -27,6 +27,8 @@ RE2('(\w+):(\d+)').full_match("ruby:1234")
     * [Submatch extraction](#submatch-extraction)
     * [Scanning text incrementally](#scanning-text-incrementally)
     * [Searching simultaneously](#searching-simultaneously)
+    * [Replacing and extracting](#replacing-and-extracting)
+    * [Escaping](#escaping)
     * [Encoding](#encoding)
 * [Requirements](#requirements)
     * [Native gems](#native-gems)
@@ -165,7 +167,72 @@ m["word"]   #=> "ruby"
 m["number"] #=> "1234"
 ```
 
-They can also be used with Ruby's [pattern matching](https://docs.ruby-lang.org/en/3.2/syntax/pattern_matching_rdoc.html):
+Multiple submatches can be retrieved at the same time by numeric index or name with [`values_at`](https://mudge.name/re2/RE2/MatchData.html#values_at-instance_method):
+
+```ruby
+m = RE2('(?P<word>\w+):(?P<number>\d+):(\d+)').full_match("ruby:1234:5678")
+#=> #<RE2::MatchData "ruby:1234:5678" 1:"ruby" 2:"1234" 3:"5678">
+
+m.values_at("word", :number, 3)
+#=> ["ruby", "1234", "5678"]
+```
+
+All captures can be returned as an array with [`captures`](https://mudge.name/re2/RE2/MatchData.html#captures-instance_method):
+
+```ruby
+m = RE2('(?P<word>\w+):(?P<number>\d+):(\d+)').full_match("ruby:1234:5678")
+#=> #<RE2::MatchData "ruby:1234:5678" 1:"ruby" 2:"1234" 3:"5678">
+
+m.captures #=> ["ruby", "1234", "5678"]
+```
+
+Capturing group names are available on both `RE2::Regexp` and `RE2::MatchData`:
+
+```ruby
+re = RE2('(?P<word>\w+):(?P<number>\d+):(\d+)')
+re.names           #=> ["number", "word"]
+
+m = re.full_match("ruby:1234:5678")
+m.names            #=> ["number", "word"]
+```
+
+Named captures can be returned as a hash with [`named_captures`](https://mudge.name/re2/RE2/MatchData.html#named_captures-instance_method):
+
+```ruby
+m = RE2('(?P<word>\w+):(?P<number>\d+):(\d+)').full_match("ruby:1234:5678")
+#=> #<RE2::MatchData "ruby:1234:5678" 1:"ruby" 2:"1234" 3:"5678">
+
+m.named_captures
+#=> {"number" => "1234", "word" => "ruby"}
+m.named_captures(symbolize_names: true)
+#=> {number: "1234", word: "ruby"}
+```
+
+This is [also available](https://mudge.name/re2/RE2/Regexp.html#named_captures-instance_method) on the original `RE2::Regexp` but will return the corresponding numerical index for each group:
+
+```ruby
+re = RE2('(?P<word>\w+):(?P<number>\d+):(\d+)')
+re.named_captures
+#=> {"number" => 2, "word" => 1}
+```
+
+The strings before and after a match can be returned with [`pre_match`](https://mudge.name/re2/RE2/MatchData.html#pre_match-instance_method) and [`post_match`](https://mudge.name/re2/RE2/MatchData.html#post_match-instance_method):
+
+```ruby
+m = RE2::Regexp.new('(\d+)').partial_match("bob 123 456")
+m.pre_match  #=> "bob "
+m.post_match #=> " 456"
+```
+
+The [`offset`](https://mudge.name/re2/RE2/MatchData.html#offset-instance_method) and [`match_length`](https://mudge.name/re2/RE2/MatchData.html#match_length-instance_method) of a match can be retrieved by index or name:
+
+```ruby
+m = RE2::Regexp.new('(\d+)').partial_match("bob 123 456")
+m.offset(1)       #=> [4, 7]
+m.match_length(1) #=> 3
+```
+
+`RE2::MatchData` objects can also be used with Ruby's [pattern matching](https://docs.ruby-lang.org/en/3.2/syntax/pattern_matching_rdoc.html):
 
 ```ruby
 case RE2('(\w+):(\d+)').full_match("ruby:1234")
@@ -238,6 +305,42 @@ set.match("abcdefghi") #=> [0, 1, 2]
 set.match("ghidefabc") #=> [2, 1, 0]
 ```
 
+### Replacing and extracting
+
+[`RE2.replace`](https://mudge.name/re2/RE2.html#replace-class_method) returns a copy of a given string with the first occurrence of a pattern replaced with a given rewrite string:
+
+```ruby
+RE2.replace("hello there", "hello", "howdy") #=> "howdy there"
+```
+
+The pattern can be given as either a string or an `RE2::Regexp`:
+
+```ruby
+re = RE2('hel+o')
+RE2.replace("hello there", re, "yo") #=> "yo there"
+```
+
+To replace _all_ matches and not just the first, use [`RE2.global_replace`](https://mudge.name/re2/RE2.html#global_replace-class_method):
+
+```ruby
+RE2.global_replace("hallo thare", "a", "e")  #=> "hello there"
+```
+
+To extract matches with a given rewrite string including substitutions, use [`RE2.extract`](https://mudge.name/re2/RE2.html#extract-class_method):
+
+```ruby
+RE2.extract("alice@example.com", '(\w+)@(\w+)', '\2-\1')
+#=> "example-alice"
+```
+
+### Escaping
+
+To escape all potentially meaningful regexp characters in a string, use [`RE2.escape`](https://mudge.name/re2/RE2.html#escape-class_method):
+
+```ruby
+RE2.escape("1.5-2.0?") #=> "1\\.5\\-2\\.0\\?"
+```
+
 ### Encoding
 
 > [!WARNING]
@@ -250,10 +353,10 @@ the right encoding so this is the responsibility of the caller, e.g.
 
 ```ruby
 # By default, RE2 will process patterns and text as UTF-8
-RE2(non_utf8_pattern.encode("UTF-8")).match(non_utf8_text.encode("UTF-8"))
+RE2(non_utf8_pattern.encode("UTF-8")).partial_match(non_utf8_text.encode("UTF-8"))
 
 # If the :utf8 option is false, RE2 will process patterns and text as ISO-8859-1
-RE2(non_latin1_pattern.encode("ISO-8859-1"), utf8: false).match(non_latin1_text.encode("ISO-8859-1"))
+RE2(non_latin1_pattern.encode("ISO-8859-1"), utf8: false).partial_match(non_latin1_text.encode("ISO-8859-1"))
 ```
 
 ## Requirements

data/Rakefile

@@ -24,10 +24,6 @@ cross_platforms = %w[
   arm-linux-musl
   arm64-darwin
   x64-mingw-ucrt
-  x64-mingw32
-  x86-linux-gnu
-  x86-linux-musl
-  x86-mingw32
   x86_64-darwin
   x86_64-linux-gnu
   x86_64-linux-musl

data/dependencies.yml

@@ -3,5 +3,5 @@ libre2:
   version: '2025-11-05'
   sha256: 87f6029d2f6de8aa023654240a03ada90e876ce9a4676e258dd01ea4c26ffd67
 abseil:
-  version: '20250814.1'
-  sha256: 1692f77d1739bacf3f94337188b78583cf09bab7e420d2dc6c5605a4f86785a1
+  version: '20260107.1'
+  sha256: 4314e2a7cbac89cac25a2f2322870f343d81579756ceff7f431803c2c9090195

data/ext/re2/extconf.rb

@@ -110,7 +110,7 @@ module RE2
       process_recipe(abseil_recipe) do |recipe|
         recipe.configure_options << '-DABSL_PROPAGATE_CXX_STD=ON'
         # Workaround for https://github.com/abseil/abseil-cpp/issues/1510
-        recipe.configure_options << '-DCMAKE_CXX_FLAGS=-DABSL_FORCE_WAITER_MODE=4' if MiniPortile.windows?
+        recipe.configure_options << '-DCMAKE_CXX_FLAGS=-DABSL_FORCE_WAITER_MODE=4 -D_WIN32_WINNT=0x0601' if MiniPortile.windows?
       end
 
       process_recipe(re2_recipe) do |recipe|
@@ -139,7 +139,6 @@ module RE2
       compile_options = +"-x c++"
 
       have_library("stdc++")
-      have_header("stdint.h")
 
       minimal_program = <<~SRC
         #include <re2/re2.h>
@@ -153,7 +152,7 @@ module RE2
       if re2_requires_version_flag
         # Recent versions of RE2 depend directly on Abseil, which requires a
         # compiler with C++17 support.
-        abort "Cannot compile re2 with your compiler: recent versions require C++17 support." unless %w[c++20 c++17 c++11 c++0x].any? do |std|
+        abort "Cannot compile re2 with your compiler: recent versions require C++17 support." unless %w[c++20 c++17 c++11].any? do |std|
           checking_for("re2 that compiles with #{std} standard") do
             if try_compile(minimal_program, compile_options + " -std=#{std}")
               compile_options << " -std=#{std}"
@@ -268,8 +267,8 @@ module RE2
       message "Cross build is #{cross_build_p ? "enabled" : "disabled"}.\n"
 
       recipe.host = target_host
-      # Ensure x64-mingw-ucrt and x64-mingw32 use different library paths since the host
-      # is the same (x86_64-w64-mingw32).
+      # Ensure x64-mingw-ucrt uses different library paths since the host is
+      # the same (x86_64-w64-mingw32).
       recipe.target = File.join(recipe.target, target_arch) if cross_build_p
 
       yield recipe