re2 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2151621115d04b197403c0f67276347c205928136405c05aac1fc70bf3a00dec
-  data.tar.gz: 8ba805a95c535ab7d30296a830448dea51da4f5f699a6aa3f858296b2590d188
+  metadata.gz: ddba6fe8bb8c7e51bcb0b8f4346b39ca903978ff6697a4c14d06702baae10598
+  data.tar.gz: f8905eeeeff7e4bebc532d23fa19b29f1c3e2a88ea303a5aa879bafb4af4e1ed
 SHA512:
-  metadata.gz: 010e20dae629df302c35c6d5cc412c5a0add1cc3f0b6357114ce64c5d77e6c3bbca7401e57c0b86be5fe87acae17162cd7c860c079dc2c57898761f9fd8d4ce4
-  data.tar.gz: 6bfa2db432e91b87ab5d6fa21babd07a675df3b22904e20f1491322b1d34c8fe1c5814783049c33f84ab8f22e0b3c2ef9c2308161f8694dd6bcbd8ec4da278a4
+  metadata.gz: 44184ad41a55746903fcd350fbf473d26266c710e324eaac879b46ff45e3b77120d5100a25f5188e2d938cafbc48caf909506d79cf07c31522ccfb9e789c2ce0
+  data.tar.gz: eb282abd472e00ebcbb10e38f84c62bbac785bd139c69140647a29a157475600b6845472edb41ed42234caf5729188052cc1459b1ac2775c544ed0e905c6039d

data/README.md

@@ -4,9 +4,9 @@ re2 [![Build Status](https://github.com/mudge/re2/actions/workflows/tests.yml/ba
 A Ruby binding to [re2][], an "efficient, principled regular expression
 library".
 
-**Current version:** 1.6.0  
-**Supported Ruby versions:** 1.8.7, 1.9.3, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1  
-**Supported re2 versions:** libre2.0 (< 2020-03-02), libre2.1 (2020-03-02), libre2.6 (2020-03-03), libre2.7 (2020-05-01), libre2.8 (2020-07-06), libre2.9 (2020-11-01)
+**Current version:** 1.7.0  
+**Supported Ruby versions:** 1.8.7, 1.9.3, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1, 3.2  
+**Supported re2 versions:** libre2.0 (< 2020-03-02), libre2.1 (2020-03-02), libre2.6 (2020-03-03), libre2.7 (2020-05-01), libre2.8 (2020-07-06), libre2.9 (2020-11-01), libre2.10 (2022-12-01), libre2.11 (2023-07-01)
 
 Installation
 ------------
@@ -22,7 +22,7 @@ If you are using Debian, you can install the [libre2-dev][] package like so:
 
     $ sudo apt-get install libre2-dev
 
-Recent versions of re2 require a compiler with C++11 support such as [clang](http://clang.llvm.org/) 3.4 or [gcc](https://gcc.gnu.org/) 4.8.
+Recent versions of re2 require a compiler with C++14 support such as [clang](http://clang.llvm.org/) 3.4 or [gcc](https://gcc.gnu.org/) 5.
 
 If you are using a packaged Ruby distribution, make sure you also have the
 Ruby header files installed such as those provided by the [ruby-dev][] package
@@ -214,7 +214,7 @@ Contributions
 * Thanks to [Jason Woods](https://github.com/driskell) who contributed the
   original implementations of `RE2::MatchData#begin` and `RE2::MatchData#end`;
 * Thanks to [Stefano Rivera](https://github.com/stefanor) who first contributed C++11 support;
-* Thanks to [Stan Hu](https://github.com/stanhu) for reporting a bug with empty patterns and `RE2::Regexp#scan`;
+* Thanks to [Stan Hu](https://github.com/stanhu) for reporting a bug with empty patterns and `RE2::Regexp#scan` and for contributing support for libre2.11 (2023-07-01);
 * Thanks to [Sebastian Reitenbach](https://github.com/buzzdeee) for reporting
   the deprecation and removal of the `utf8` encoding option in re2;
 * Thanks to [Sergio Medina](https://github.com/serch) for reporting a bug when

data/ext/re2/extconf.rb

@@ -44,22 +44,30 @@ unless have_library("re2")
   abort "You must have re2 installed and specified with --with-re2-dir, please see https://github.com/google/re2/wiki/Install"
 end
 
-# Recent versions of re2 now require a compiler with C++11 support
-checking_for("re2 requires C++11 compiler") do
-  minimal_program = <<SRC
+minimal_program = <<SRC
 #include <re2/re2.h>
 int main() { return 0; }
 SRC
 
-  unless try_compile(minimal_program, compile_options)
-    if try_compile(minimal_program, compile_options + " -std=c++11")
-      compile_options << " -std=c++11"
-      $CPPFLAGS << " -std=c++11"
-    elsif try_compile(minimal_program, compile_options + " -std=c++0x")
-      compile_options << " -std=c++0x"
-      $CPPFLAGS << " -std=c++0x"
-    else
-      abort "Cannot compile re2 with your compiler: recent versions require C++11 support."
+re2_requires_version_flag = checking_for("re2 that requires explicit C++ version flag") do
+  !try_compile(minimal_program, compile_options)
+end
+
+if re2_requires_version_flag
+  # Recent versions of re2 depend directly on abseil, which requires a
+  # compiler with C++14 support (see
+  # https://github.com/abseil/abseil-cpp/issues/1127 and
+  # https://github.com/abseil/abseil-cpp/issues/1431). However, the
+  # `std=c++14` flag doesn't appear to suffice; we need at least
+  # `std=c++17`.
+  abort "Cannot compile re2 with your compiler: recent versions require C++14 support." unless %w[c++20 c++17 c++11 c++0x].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}"
+        $CPPFLAGS << " -std=#{std}"
+
+        true
+      end
     end
   end
 end

data/ext/re2/re2.cc

@@ -393,7 +393,7 @@ re2::StringPiece *re2_matchdata_find_match(VALUE idx, VALUE self) {
 /*
  * Returns the number of elements in the match array (including nils).
  *
- * @return [Fixnum] the number of elements
+ * @return [Integer] the number of elements
  * @example
  *   m = RE2::Regexp.new('(\d+)').match("bob 123")
  *   m.size      #=> 2
@@ -409,8 +409,8 @@ static VALUE re2_matchdata_size(VALUE self) {
 /*
  * Returns the offset of the start of the nth element of the matchdata.
  *
- * @param [Fixnum, String, Symbol] n the name or number of the match
- * @return [Fixnum] the offset of the start of the match
+ * @param [Integer, String, Symbol] n the name or number of the match
+ * @return [Integer] the offset of the start of the match
  * @example
  *   m = RE2::Regexp.new('ob (\d+)').match("bob 123")
  *   m.begin(0)  #=> 1
@@ -439,8 +439,8 @@ static VALUE re2_matchdata_begin(VALUE self, VALUE n) {
 /*
  * Returns the offset of the character following the end of the nth element of the matchdata.
  *
- * @param [Fixnum, String, Symbol] n the name or number of the match
- * @return [Fixnum] the offset of the character following the end of the match
+ * @param [Integer, String, Symbol] n the name or number of the match
+ * @return [Integer] the offset of the character following the end of the match
  * @example
  *   m = RE2::Regexp.new('ob (\d+) b').match("bob 123 bob")
  *   m.end(0)  #=> 9
@@ -584,7 +584,7 @@ static VALUE re2_matchdata_named_match(const char* name, VALUE self) {
  * @overload [](index)
  *   Access a particular match by index.
  *
- *   @param [Fixnum] index the index of the match to fetch
+ *   @param [Integer] index the index of the match to fetch
  *   @return [String, nil] the specified match
  *   @example
  *     m = RE2::Regexp.new('(\d+)').match("bob 123")
@@ -593,8 +593,8 @@ static VALUE re2_matchdata_named_match(const char* name, VALUE self) {
  * @overload [](start, length)
  *   Access a range of matches by starting index and length.
  *
- *   @param [Fixnum] start the index from which to start
- *   @param [Fixnum] length the number of elements to fetch
+ *   @param [Integer] start the index from which to start
+ *   @param [Integer] length the number of elements to fetch
  *   @return [Array<String, nil>] the specified matches
  *   @example
  *     m = RE2::Regexp.new('(\d+)').match("bob 123")
@@ -795,12 +795,9 @@ static VALUE re2_matchdata_deconstruct_keys(VALUE self, VALUE keys) {
 
 /*
  * Returns a new RE2 object with a compiled version of
- * +pattern+ stored inside. Equivalent to +RE2.new+.
+ * +pattern+ stored inside. Equivalent to +RE2::Regexp.new+.
  *
- * @return [RE2::Regexp] an RE2::Regexp with the specified pattern and options
- * @param [String] pattern the pattern to compile
- * @param [Hash] options the options to compile a regexp with
- * @see RE2::Regexp.new
+ * @see RE2::Regexp#initialize
  *
  */
 static VALUE re2_re2(int argc, VALUE *argv, VALUE self) {
@@ -833,7 +830,7 @@ static VALUE re2_re2(int argc, VALUE *argv, VALUE self) {
  *   @option options [Boolean] :posix_syntax (false) restrict regexps to POSIX egrep syntax
  *   @option options [Boolean] :longest_match (false) search for longest match, not first match
  *   @option options [Boolean] :log_errors (true) log syntax and execution errors to ERROR
- *   @option options [Fixnum] :max_mem approx. max memory footprint of RE2
+ *   @option options [Integer] :max_mem approx. max memory footprint of RE2
  *   @option options [Boolean] :literal (false) interpret string as literal, not regexp
  *   @option options [Boolean] :never_nl (false) never match \n, even if it is in regexp
  *   @option options [Boolean] :case_sensitive (true) match is case-sensitive (regexp can override with (?i) unless in posix_syntax mode)
@@ -984,7 +981,7 @@ static VALUE re2_regexp_log_errors(VALUE self) {
  * Returns the max_mem setting for the regular expression
  * +re2+.
  *
- * @return [Fixnum] the max_mem option
+ * @return [Integer] the max_mem option
  * @example
  *   re2 = RE2::Regexp.new("woo?", :max_mem => 1024)
  *   re2.max_mem    #=> 1024
@@ -1138,7 +1135,7 @@ static VALUE re2_regexp_error_arg(VALUE self) {
  * of a regexp's "cost". Larger numbers are more expensive
  * than smaller numbers.
  *
- * @return [Fixnum] the regexp "cost"
+ * @return [Integer] the regexp "cost"
  */
 static VALUE re2_regexp_program_size(VALUE self) {
   re2_pattern *p;
@@ -1203,7 +1200,7 @@ static VALUE re2_regexp_options(VALUE self) {
  * wasn't valid on construction. The overall match ($0) does not
  * count: if the regexp is "(a)(b)", returns 2.
  *
- * @return [Fixnum] the number of capturing subpatterns
+ * @return [Integer] the number of capturing subpatterns
  */
 static VALUE re2_regexp_number_of_capturing_groups(VALUE self) {
   re2_pattern *p;
@@ -1273,7 +1270,7 @@ static VALUE re2_regexp_named_capturing_groups(VALUE self) {
  *   matches returned (padded with nils if necessary).
  *
  *   @param [String] text the text to search
- *   @param [Fixnum] number_of_matches the number of matches to return
+ *   @param [Integer] number_of_matches the number of matches to return
  *   @return [RE2::MatchData] the matches
  *   @raise [ArgumentError] if given a negative number of matches
  *   @raise [NoMemoryError] if there was not enough memory to allocate the matches
@@ -1399,7 +1396,7 @@ static VALUE re2_regexp_scan(VALUE self, VALUE text) {
  * @return [String] the resulting string
  * @example
  *   RE2.Replace("hello there", "hello", "howdy") #=> "howdy there"
- *   re2 = RE2.new("hel+o")
+ *   re2 = RE2::Regexp.new("hel+o")
  *   RE2.Replace("hello there", re2, "yo")        #=> "yo there"
  */
 static VALUE re2_Replace(VALUE self, VALUE str, VALUE pattern,
@@ -1435,7 +1432,7 @@ static VALUE re2_Replace(VALUE self, VALUE str, VALUE pattern,
  * @param [String] rewrite the string to replace with
  * @return [String] the resulting string
  * @example
- *   re2 = RE2.new("oo?")
+ *   re2 = RE2::Regexp.new("oo?")
  *   RE2.GlobalReplace("whoops-doops", re2, "e")  #=> "wheps-deps"
  *   RE2.GlobalReplace("hello there", "e", "i")   #=> "hillo thiri"
  */
@@ -1522,7 +1519,7 @@ static VALUE re2_set_allocate(VALUE klass) {
  *   @option options [Boolean] :posix_syntax (false) restrict regexps to POSIX egrep syntax
  *   @option options [Boolean] :longest_match (false) search for longest match, not first match
  *   @option options [Boolean] :log_errors (true) log syntax and execution errors to ERROR
- *   @option options [Fixnum] :max_mem approx. max memory footprint of RE2
+ *   @option options [Integer] :max_mem approx. max memory footprint of RE2
  *   @option options [Boolean] :literal (false) interpret string as literal, not regexp
  *   @option options [Boolean] :never_nl (false) never match \n, even if it is in regexp
  *   @option options [Boolean] :case_sensitive (true) match is case-sensitive (regexp can override with (?i) unless in posix_syntax mode)
@@ -1889,9 +1886,4 @@ void Init_re2(void) {
   id_anchor_start = rb_intern("anchor_start");
   id_anchor_both = rb_intern("anchor_both");
   id_exception = rb_intern("exception");
-
-  #if 0
-    /* Fake so YARD generates the file. */
-    rb_mKernel = rb_define_module("Kernel");
-  #endif
 }

data/lib/re2/string.rb

@@ -12,30 +12,14 @@ module RE2
     # Replaces the first occurrence +pattern+ with +rewrite+ and returns a new
     # string.
     #
-    # @param [String, RE2::Regexp] pattern a regexp matching text to be replaced
-    # @param [String] rewrite the string to replace with
-    # @example
-    #   "hello there".re2_sub("hello", "howdy") #=> "howdy there"
-    #   re2 = RE2.new("hel+o")
-    #   "hello there".re2_sub(re2, "yo")        #=> "yo there"
-    #   text = "Good morning"
-    #   text.re2_sub("morn", "even")            #=> "Good evening"
-    #   text                                    #=> "Good morning"
+    # @see RE2.Replace
     def re2_sub(*args)
       RE2.Replace(self, *args)
     end
 
     # Replaces every occurrence of +pattern+ with +rewrite+ and return a new string.
     #
-    # @param [String, RE2::Regexp] pattern a regexp matching text to be replaced
-    # @param [String] rewrite the string to replace with
-    # @example
-    #   "hello there".re2_gsub("e", "i")   #=> "hillo thiri"
-    #   re2 = RE2.new("oo?")
-    #   "whoops-doops".re2_gsub(re2, "e")  #=> "wheps-deps"
-    #   text = "Good morning"
-    #   text.re2_gsub("o", "ee")           #=> "Geeeed meerning"
-    #   text                               #=> "Good morning"
+    # @see RE2.GlobalReplace
     def re2_gsub(*args)
       RE2.GlobalReplace(self, *args)
     end
@@ -74,7 +58,7 @@ module RE2
     #   matches returned (padded with nils if necessary).
     #
     #   @param [String, RE2::Regexp] pattern the regular expression to match
-    #   @param [Fixnum] number_of_matches the number of matches to return
+    #   @param [Integer] number_of_matches the number of matches to return
     #   @return [RE2::MatchData] the matches
     #   @raise [NoMemoryError] if there was not enough memory to allocate the matches
     #   @example

data/spec/re2/regexp_spec.rb

@@ -91,7 +91,8 @@ RSpec.describe RE2::Regexp do
   describe "#program_size" do
     it "returns a numeric value" do
       program_size = RE2::Regexp.new('w(o)(o)').program_size
-      expect(program_size).to be_a(Fixnum)
+
+      expect(program_size).to be_an(Integer)
     end
 
     it "returns -1 for an invalid pattern" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Paul Mucur
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2023-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby bindings to re2.