glib2 4.3.6 → 4.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c8949cf46b34ae921ab43a60165c8f0d887106fa6c51683756abba836dee8c7
-  data.tar.gz: 228cc639dad9178cf9addeb8b4b39f52abc38cdea38cafda2c49765057d44e83
+  metadata.gz: 13603eaf69a3a85c8762ccfeacba4711fc02db8e82d3dc838d335137519c1390
+  data.tar.gz: 26feb4d19dc061daedffff8a4bf30a2a7b4056515b721c7b7a015181c9ed1d47
 SHA512:
-  metadata.gz: 767513877daa200b92dee690e0f32e19cb1d72832894a0328a37406df3f963edbebfa113caaa911ee687a19d06ed257152f49e075ec6f4cbf1247544b6b58f22
-  data.tar.gz: 78378d1881f14171228ffef6d6b3470eecac9b7bf05f490f943c1d296f96e4a7dfc944baf4687d511c238f7fe040ec8073f2cf8f906573d5913d60726db0a008
+  metadata.gz: cbd6bd0e6eef38055625b2986bc1c7c46ec32deb4c730ae3ebfb6d28b6461483e2b509598a430bdbcf694d2edebfc9e510854d0c9f6651d25e369762e965c74b
+  data.tar.gz: 3a19333522e6448596eab0d93bf8689b14b5c99adf78e12459310a7f9c113c06eb13771940b9067e5a4233a177e9d89bd43b350b58396739d757a9f60401eba7

data/ext/glib2/rbglib.h

@@ -33,7 +33,7 @@ G_BEGIN_DECLS
 
 #define RBGLIB_MAJOR_VERSION 4
 #define RBGLIB_MINOR_VERSION 3
-#define RBGLIB_MICRO_VERSION 6
+#define RBGLIB_MICRO_VERSION 7
 
 /* For Ruby < 3.0 */
 #ifndef RB_LL2NUM

data/ext/glib2/rbglib_regex.c

@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2015-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2015-2026  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -19,24 +19,6 @@
 
 #include "rbgprivate.h"
 
-/* They MRI are internal definitions. Using them reduces
- * maintainability. We should reconsider about using them when they
- * are changed in MRI. */
-/* from vm_core.h */
-#define RUBY_TAG_BREAK 0x2
-
-/* from internal.h */
-struct vm_throw_data {
-    VALUE flags;
-    VALUE reserved;
-    const VALUE throw_obj;
-    /* const struct rb_control_frame_struct *catch_frame; */
-    /* VALUE throw_state; */
-};
-/* from vm_insnhelper.h */
-#define THROW_DATA_VAL(obj) (((struct vm_throw_data *)(obj))->throw_obj)
-
-
 #define RG_TARGET_NAMESPACE cRegex
 #define _SELF(s) ((GRegex*)RVAL2BOXED(s, G_TYPE_REGEX))
 
@@ -301,26 +283,28 @@ rg_regex_eval_callback(const GMatchInfo *match_info,
 {
     VALUE returned_data;
     RGRegexEvalCallbackData *data = user_data;
+    gboolean stop = FALSE;
 
     data->match_info = match_info;
     returned_data = rb_protect(rg_regex_eval_callback_body,
                                (VALUE)data,
                                &(data->status));
 
-    if (data->status == RUBY_TAG_BREAK) {
-        returned_data = THROW_DATA_VAL(rb_errinfo());
-    }
-
-    if (NIL_P(returned_data)) {
-        gchar *matched;
-        matched = g_match_info_fetch(match_info, 0);
-        g_string_append(result, matched);
-        g_free(matched);
+    if (data->status == 0) {
+        if (RB_TEST(returned_data)) {
+            g_string_append(result, RVAL2CSTR(returned_data));
+        } else {
+            gchar *matched;
+            matched = g_match_info_fetch(match_info, 0);
+            g_string_append(result, matched);
+            g_free(matched);
+            stop = (returned_data == RUBY_Qfalse);
+        }
     } else {
-        g_string_append(result, RVAL2CSTR(returned_data));
+        stop = TRUE;
     }
 
-    return data->status != 0;
+    return stop;
 }
 
 static VALUE
@@ -369,7 +353,7 @@ rg_replace(gint argc, VALUE *argv, VALUE self)
                                                rg_regex_eval_callback,
                                                &data,
                                                &error);
-        if (!(data.status == 0 || data.status == RUBY_TAG_BREAK)) {
+        if (data.status != 0) {
             if (error)
                 g_error_free(error);
             g_free(modified_string);

data/ext/glib2/rbgobj_param.c

@@ -136,7 +136,7 @@ rg_inspect(VALUE self)
 {
     GParamSpec *pspec = rbgobj_get_param_spec(self);
 
-    return rb_sprintf("#<%" PRIsVALUE "%" PRIsVALUE "#%s",
+    return rb_sprintf("#<%" PRIsVALUE "%" PRIsVALUE "#%s>",
                       CLASS_OF(self),
                       GTYPE2CLASS(pspec->owner_type),
                       g_param_spec_get_name(pspec));

data/test/test-regex.rb

@@ -280,10 +280,26 @@ class TestRegex < Test::Unit::TestCase
         assert_equal(" to to to to", modified_string)
       end
 
-      test "break" do
+      test "nil" do
         regex = GLib::Regex.new("1|2|3|4")
         modified_string = regex.replace(" 4 3 2 1") do |match_info|
-          break "to"
+          if match_info.fetch(0) == "4"
+            "to"
+          else
+            nil
+          end
+        end
+        assert_equal(" to 3 2 1", modified_string)
+      end
+
+      test "false" do
+        regex = GLib::Regex.new("1|2|3|4")
+        modified_string = regex.replace(" 4 3 2 1") do |match_info|
+          if match_info.fetch(0) == "4"
+            "to"
+          else
+            false
+          end
         end
         assert_equal(" to 3 2 1", modified_string)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glib2
 version: !ruby/object:Gem::Version
-  version: 4.3.6
+  version: 4.3.7
 platform: ruby
 authors:
 - The Ruby-GNOME Project Team
@@ -226,7 +226,7 @@ requirements:
 - 'system: gobject-2.0>=2.56.0: macports: glib2'
 - 'system: gobject-2.0>=2.56.0: msys2: glib2'
 - 'system: gobject-2.0>=2.56.0: rhel: pkgconfig(gobject-2.0)'
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Ruby/GLib2 is a Ruby binding of GLib-2.x.
 test_files: []