re2 2.4.0-x86-linux → 2.4.1-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661769805b725cb6fc19a7dd9fbd55b1facf2fbbaef2243bfa9cbb4777632385
-  data.tar.gz: e3df5fcc398e9474a9da6461e8ccdcdc7c2df677c1f148a0ed0c9e0eddf28aa9
+  metadata.gz: 4238a5d5a760801c983db581366971cfaaea15ca314ec83da3f214f9f90584d0
+  data.tar.gz: ebce6fa954f8c2a01f550b7f7bf7123bb1cbec5df6dba01b75f346c17a58648b
 SHA512:
-  metadata.gz: 380edc22a19acce1933edcc9429f8a3ee0908782de8ac17f8927eaf13b19108054c0bbe6e53288028d4310d92c59261ab8662089a230b789d1c8af6f0918ad9a
-  data.tar.gz: 267e3214af3f1b2e8dcacc5342914dd368554c93c622498baf100389b40b87831c7475e092f485bbb15589950e6837c7e71498679befdc979fdb21b90329068c
+  metadata.gz: c694d73e6452646420fe268691ad6966f2fd016780d30b9a1be96119bd711868b8fc1315e6b91d1703974a0d1ef98049f0588c233f70ae6d84eaf07c96491c5f
+  data.tar.gz: 448b389edfb3eb2195255341dd98c3c2a56436a79e6e9900a76e322e7c023a9d30b5acae5f898b45db66831e6d84ac01856497c5a97b1ad63f5b427dfd9c83c5

data/README.md

@@ -5,7 +5,7 @@ Ruby bindings to [RE2][], a "fast, safe, thread-friendly alternative to
 backtracking regular expression engines like those used in PCRE, Perl, and
 Python".
 
-**Current version:** 2.4.0  
+**Current version:** 2.4.1  
 **Supported Ruby versions:** 2.6, 2.7, 3.0, 3.1, 3.2  
 **Bundled RE2 version:** libre2.11 (2023-11-01)  
 **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)

data/ext/re2/re2.cc

@@ -130,33 +130,33 @@ static void parse_re2_options(RE2::Options* re2_options, const VALUE options) {
 #define re2_compact_callback(x)
 #endif
 
-static void re2_matchdata_mark(void *data) {
-  re2_matchdata *self = (re2_matchdata *)data;
-  rb_gc_mark_movable(self->regexp);
-  rb_gc_mark_movable(self->text);
+static void re2_matchdata_mark(void *ptr) {
+  re2_matchdata *m = reinterpret_cast<re2_matchdata *>(ptr);
+  rb_gc_mark_movable(m->regexp);
+  rb_gc_mark_movable(m->text);
 }
 
 #ifdef HAVE_RB_GC_MARK_MOVABLE
-static void re2_matchdata_update_references(void *data) {
-  re2_matchdata *self = (re2_matchdata *)data;
-  self->regexp = rb_gc_location(self->regexp);
-  self->text = rb_gc_location(self->text);
+static void re2_matchdata_compact(void *ptr) {
+  re2_matchdata *m = reinterpret_cast<re2_matchdata *>(ptr);
+  m->regexp = rb_gc_location(m->regexp);
+  m->text = rb_gc_location(m->text);
 }
 #endif
 
-static void re2_matchdata_free(void *data) {
-  re2_matchdata *self = (re2_matchdata *)data;
-  if (self->matches) {
-    delete[] self->matches;
+static void re2_matchdata_free(void *ptr) {
+  re2_matchdata *m = reinterpret_cast<re2_matchdata *>(ptr);
+  if (m->matches) {
+    delete[] m->matches;
   }
-  xfree(self);
+  xfree(m);
 }
 
-static size_t re2_matchdata_memsize(const void *data) {
-  const re2_matchdata *self = (const re2_matchdata *)data;
-  size_t size = sizeof(re2_matchdata);
-  if (self->matches) {
-    size += sizeof(self->matches) * self->number_of_matches;
+static size_t re2_matchdata_memsize(const void *ptr) {
+  const re2_matchdata *m = reinterpret_cast<const re2_matchdata *>(ptr);
+  size_t size = sizeof(*m);
+  if (m->matches) {
+    size += sizeof(*m->matches) * m->number_of_matches;
   }
 
   return size;
@@ -168,40 +168,40 @@ static const rb_data_type_t re2_matchdata_data_type = {
     .dmark = re2_matchdata_mark,
     .dfree = re2_matchdata_free,
     .dsize = re2_matchdata_memsize,
-    re2_compact_callback(re2_matchdata_update_references)
+    re2_compact_callback(re2_matchdata_compact)
   },
   // IMPORTANT: WB_PROTECTED objects must only use the RB_OBJ_WRITE()
   // macro to update VALUE references, as to trigger write barriers.
   .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
 };
 
-static void re2_scanner_mark(void *data) {
-  re2_scanner *self = (re2_scanner *)data;
-  rb_gc_mark_movable(self->regexp);
-  rb_gc_mark_movable(self->text);
+static void re2_scanner_mark(void *ptr) {
+  re2_scanner *s = reinterpret_cast<re2_scanner *>(ptr);
+  rb_gc_mark_movable(s->regexp);
+  rb_gc_mark_movable(s->text);
 }
 
 #ifdef HAVE_RB_GC_MARK_MOVABLE
-static void re2_scanner_update_references(void *data) {
-  re2_scanner *self = (re2_scanner *)data;
-  self->regexp = rb_gc_location(self->regexp);
-  self->text = rb_gc_location(self->text);
+static void re2_scanner_compact(void *ptr) {
+  re2_scanner *s = reinterpret_cast<re2_scanner *>(ptr);
+  s->regexp = rb_gc_location(s->regexp);
+  s->text = rb_gc_location(s->text);
 }
 #endif
 
-static void re2_scanner_free(void *data) {
-  re2_scanner *self = (re2_scanner *)data;
-  if (self->input) {
-    delete self->input;
+static void re2_scanner_free(void *ptr) {
+  re2_scanner *s = reinterpret_cast<re2_scanner *>(ptr);
+  if (s->input) {
+    delete s->input;
   }
-  xfree(self);
+  xfree(s);
 }
 
-static size_t re2_scanner_memsize(const void *data) {
-  const re2_scanner *self = (const re2_scanner *)data;
-  size_t size = sizeof(re2_scanner);
-  if (self->input) {
-    size += sizeof(self->input);
+static size_t re2_scanner_memsize(const void *ptr) {
+  const re2_scanner *s = reinterpret_cast<const re2_scanner *>(ptr);
+  size_t size = sizeof(*s);
+  if (s->input) {
+    size += sizeof(s->input);
   }
 
   return size;
@@ -213,26 +213,26 @@ static const rb_data_type_t re2_scanner_data_type = {
     .dmark = re2_scanner_mark,
     .dfree = re2_scanner_free,
     .dsize = re2_scanner_memsize,
-    re2_compact_callback(re2_scanner_update_references)
+    re2_compact_callback(re2_scanner_compact)
   },
   // IMPORTANT: WB_PROTECTED objects must only use the RB_OBJ_WRITE()
   // macro to update VALUE references, as to trigger write barriers.
   .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
 };
 
-static void re2_regexp_free(void *data) {
-  re2_pattern *self = (re2_pattern *)data;
-  if (self->pattern) {
-    delete self->pattern;
+static void re2_regexp_free(void *ptr) {
+  re2_pattern *p = reinterpret_cast<re2_pattern *>(ptr);
+  if (p->pattern) {
+    delete p->pattern;
   }
-  xfree(self);
+  xfree(p);
 }
 
-static size_t re2_regexp_memsize(const void *data) {
-  const re2_pattern *self = (const re2_pattern *)data;
-  size_t size = sizeof(re2_pattern);
-  if (self->pattern) {
-    size += sizeof(self->pattern);
+static size_t re2_regexp_memsize(const void *ptr) {
+  const re2_pattern *p = reinterpret_cast<const re2_pattern *>(ptr);
+  size_t size = sizeof(*p);
+  if (p->pattern) {
+    size += sizeof(p->pattern);
   }
 
   return size;
@@ -1579,19 +1579,19 @@ static VALUE re2_QuoteMeta(VALUE, VALUE unquoted) {
   return rb_str_new(quoted_string.data(), quoted_string.size());
 }
 
-static void re2_set_free(void *data) {
-  re2_set *self = (re2_set *)data;
-  if (self->set) {
-    delete self->set;
+static void re2_set_free(void *ptr) {
+  re2_set *s = reinterpret_cast<re2_set *>(ptr);
+  if (s->set) {
+    delete s->set;
   }
-  xfree(self);
+  xfree(s);
 }
 
-static size_t re2_set_memsize(const void *data) {
-  const re2_set *self = (const re2_set *)data;
-  size_t size = sizeof(re2_set);
-  if (self->set) {
-    size += sizeof(self->set);
+static size_t re2_set_memsize(const void *ptr) {
+  const re2_set *s = reinterpret_cast<const re2_set *>(ptr);
+  size_t size = sizeof(*s);
+  if (s->set) {
+    size += sizeof(s->set);
   }
 
   return size;
@@ -1877,12 +1877,14 @@ extern "C" void Init_re2(void) {
   re2_eSetUnsupportedError = rb_define_class_under(re2_cSet, "UnsupportedError",
       rb_const_get(rb_cObject, rb_intern("StandardError")));
 
-  rb_define_alloc_func(re2_cRegexp, (VALUE (*)(VALUE))re2_regexp_allocate);
+  rb_define_alloc_func(re2_cRegexp,
+      reinterpret_cast<VALUE (*)(VALUE)>(re2_regexp_allocate));
   rb_define_alloc_func(re2_cMatchData,
-      (VALUE (*)(VALUE))re2_matchdata_allocate);
+      reinterpret_cast<VALUE (*)(VALUE)>(re2_matchdata_allocate));
   rb_define_alloc_func(re2_cScanner,
-      (VALUE (*)(VALUE))re2_scanner_allocate);
-  rb_define_alloc_func(re2_cSet, (VALUE (*)(VALUE))re2_set_allocate);
+      reinterpret_cast<VALUE (*)(VALUE)>(re2_scanner_allocate));
+  rb_define_alloc_func(re2_cSet,
+      reinterpret_cast<VALUE (*)(VALUE)>(re2_set_allocate));
 
   rb_define_method(re2_cMatchData, "string",
       RUBY_METHOD_FUNC(re2_matchdata_string), 0);

data/lib/re2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RE2
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

data/spec/re2/match_data_spec.rb

@@ -1,5 +1,14 @@
 # encoding: utf-8
+require 'objspace'
+
 RSpec.describe RE2::MatchData do
+  it "reports a larger consuming memory size when it has more matches" do
+    matches1 = RE2::Regexp.new('w(o)').match('woo')
+    matches2 = RE2::Regexp.new('w(o)(o)').match('woo')
+
+    expect(ObjectSpace.memsize_of(matches1)).to be < ObjectSpace.memsize_of(matches2)
+  end
+
   describe "#to_a" do
     it "is populated with the match and capturing groups" do
       a = RE2::Regexp.new('w(o)(o)').match('woo').to_a

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: x86-linux
 authors:
 - Paul Mucur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-11 00:00:00.000000000 Z
+date: 2023-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler