gettextpo 0.1.3 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2eb5f08e68980571ccd30f9bb661e776084f6f87766e9180567b4501b038c3d
-  data.tar.gz: b22296f8b7d74673c8328c556acb0cdf59e369c19ec281ca0914b5cbec50817c
+  metadata.gz: 9b3af64548353c078af5052c1b203ab5d7ae1ae359b2f47728f10de68127098b
+  data.tar.gz: d62fa55845eaf75754b13e05d06e1006933ee1b20444a6de1d8a7fe765d6a876
 SHA512:
-  metadata.gz: d0d2f86a241e358acd074ed86460072382cc7331afdaedae52f711e050b3442cb65e0bdee28d3cdd7967039bd4119f4d4713788dbd9feb8db390ec5ca5956e05
-  data.tar.gz: 5aca003840bf9bba6f601c8faea83a3c16dcbbb9eaec1d6baf27bba2f25c4f8d80f265d36e7fd4caeaf20c9ea9ed802ae7c4fbf0ac44ca6d85a899c0405f1c69
+  metadata.gz: 876211285e1120372703d8379b1dbeeed7cf0c636688e0e5eef785611bfe890b8d3a1aea6d89e3785b2c8c6e06f94b61b0dc4e4ab04ecbf3a2d00ae68bf98f5b
+  data.tar.gz: ef90df9cf0e3aed603936bf1c902339cb48a97b43d6738d22e7ef57dfd0c667e00abbaf63cb62616ba23e5de65400384d188901a9975bdb49733f8abacdb0b0e

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 ## Unreleased
 
+## CRuby version 0.2.1 - 2026-03-16
+
+- CRuby: Fix to work with gettext 0.23.
+
+## CRuby and mruby version 0.2.0 - 2026-03-15
+
+- CRuby and mruby: Add `GettextPO::Message#file_positions`,
+  `GettextPO::Message#workflow_flag?`,
+  `GettextPO::Message#update_workflow_flag`,
+  `GettextPO::Message#workflow_flag_iterator`,
+  `GettextPO::Message#sticky_flag?`,
+  `GettextPO::Message#update_sticky_flag`, and
+  `GettextPO::Message#sticky_flag_iterator` method.
+- CRuby and mruby: Add `GettextPO::FlagIterator#next` method (and the
+  class, which is `Enumerable`).
+- mruby: Requires GNU gettext 1.0 or later.
+
 ## CRuby version 0.1.3
 
 - CRuby: Fix file not found case.

data/Gemfile

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gemspec
+
+gem "irb"
+gem "rake", "~> 13.0"
+gem "rake-compiler"
+gem "test-unit", "~> 3.0"

data/README.md

@@ -8,10 +8,10 @@ Currently this supports both CRuby and mruby.
 
 ## Installation
 
-Prerequisites: `libgettextpo` library.  On Linux and similar systems,
-you should be able to install it as a distribution package on most
-platforms.  For example, on Ubuntu it was as follows
-(2026-03-07T15:48:13+09:00):
+Prerequisites: `libgettextpo` library (mruby: version 1.0 or later).
+On Linux and similar systems, you should be able to install it as a
+distribution package on most platforms.  For example, on Ubuntu it was
+as follows (2026-03-07T15:48:13+09:00):
 
 ``` shell
 apt search libgettextpo

data/ext/gettextpo/extconf.rb

@@ -22,8 +22,11 @@ require "mkmf"
 # selectively, or entirely remove this flag.
 append_cflags("-fvisibility=hidden")
 
-have_header("gettext-po.h") or raise "gettext-po.h not found"
+GETTEXTPO = "gettext-po.h"
+have_header(GETTEXTPO) or raise "gettext-po.h not found"
 have_library("gettextpo") or raise "gettextpo library not found"
-# TODO: check library function
+
+# Indicates 1.0 or later.  <https://savannah.gnu.org/news/?id=10853>
+have_func('po_message_get_format', GETTEXTPO)
 
 create_makefile("gettextpo/gettextpo")

data/ext/gettextpo/gettextpo.c

@@ -26,7 +26,13 @@
 #include "gettextpo.h"
 #include <gettext-po.h>
 #include <ruby/internal/core/rdata.h>
-#include <ruby/internal/intern/variable.h>
+#include <ruby/internal/core/rstring.h>
+#include <ruby/internal/error.h>
+#include <ruby/internal/globals.h>
+#include <ruby/internal/intern/string.h>
+#include <ruby/internal/module.h>
+#include <ruby/internal/scan_args.h>
+#include <ruby/internal/special_consts.h>
 
 #define ERROR                                                                 \
   rb_const_get (rb_const_get (rb_cObject, rb_intern ("GettextPO")),           \
@@ -35,6 +41,7 @@
 VALUE rb_cMessage;
 VALUE rb_cMessageIterator;
 VALUE rb_cFilePos;
+VALUE rb_cFlagIterator;
 
 /* ********** error ********** */
 
@@ -163,6 +170,43 @@ static const struct po_xerror_handler gettextpo_xerror_handler = {
   .xerror2 = gettextpo_xerror2,
 };
 
+#ifdef HAVE_PO_MESSAGE_GET_FORMAT
+/**
+ * Document-class: GettextPO::FlagIterator
+ */
+
+void
+gettextpo_flag_iterator_free (void *iter)
+{
+  if (iter)
+    po_flag_iterator_free (iter);
+}
+
+static const rb_data_type_t gettextpo_po_flag_iterator_type = {
+  .wrap_struct_name = "gettextpo PO flag iterator",
+  .function = {
+    .dfree = gettextpo_flag_iterator_free,
+  },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY,
+};
+
+VALUE
+gettextpo_po_flag_iterator_alloc (VALUE self)
+{
+  return TypedData_Wrap_Struct (self, &gettextpo_po_flag_iterator_type, NULL);
+}
+
+static VALUE
+gettextpo_po_flag_iterator_m_next (VALUE self)
+{
+  const char *flag = po_flag_next (DATA_PTR (self));
+  if (flag)
+    return rb_str_new_cstr (flag);
+  else
+    rb_raise (rb_eStopIteration, "no more flag");
+}
+#endif
+
 /**
  * Document-class: GettextPO::Message
  */
@@ -394,11 +438,90 @@ BOOL_GETTER (fuzzy);
  */
 BOOL_SETTER (fuzzy);
 
+#ifdef HAVE_PO_MESSAGE_GET_FORMAT
+#define FLAG_Q(name)                                                          \
+  static VALUE gettextpo_po_message_m_##name##_flag_q (VALUE self,            \
+                                                       VALUE flag)            \
+  {                                                                           \
+    return po_message_has_##name##_flag (DATA_PTR (self),                     \
+                                         StringValueCStr (flag))              \
+               ? Qtrue                                                        \
+               : Qfalse;                                                      \
+  }
+#define UPDATE_FLAG(name)                                                     \
+  static VALUE gettextpo_po_message_m_update_##name##_flag (                  \
+      int argc, VALUE *argv, VALUE self)                                      \
+  {                                                                           \
+    VALUE flag, kwargs;                                                       \
+    rb_scan_args (argc, argv, "1:", &flag, &kwargs);                          \
+    ID kwargs_ids[] = { rb_intern ("set") };                                  \
+    VALUE kwargs_vals[] = { Qundef };                                         \
+    rb_get_kwargs (kwargs, kwargs_ids, 0,                                     \
+                   sizeof (kwargs_ids) / sizeof (kwargs_ids[0]),              \
+                   kwargs_vals);                                              \
+                                                                              \
+    po_message_set_##name##_flag (DATA_PTR (self), StringValueCStr (flag),    \
+                                  RB_UNDEF_P (kwargs_vals[0])                 \
+                                      && RB_TEST (kwargs_vals[0]));           \
+    return Qnil;                                                              \
+  }
+#define FLAG_ITER(name)                                                       \
+  static VALUE gettextpo_po_message_m_##name##_flags_iterator (VALUE self)    \
+  {                                                                           \
+    VALUE iter = rb_obj_alloc (rb_cFlagIterator);                             \
+    DATA_PTR (iter) = po_message_##name##_flags_iterator (DATA_PTR (self));   \
+    return iter;                                                              \
+  }
+
+/**
+ * Document-method: workflow_flag?
+ * call-seq: workflow_flag? (flag)
+ */
+FLAG_Q (workflow);
+
+/**
+ * Document-method: update_workflow_flag
+ * call-seq: update_workflow_flag (flag, set: true)
+ */
+UPDATE_FLAG (workflow);
+
+/**
+ * Document-method: workflow_flag_iterator
+ */
+FLAG_ITER (workflow);
+
+/**
+ * call-seq: format (type)
+ *
+ * Returns +true+, +false+ (opposite), or +nil+ (none).
+ */
+static VALUE
+gettextpo_po_message_m_format (VALUE self, VALUE format)
+{
+  int result
+      = po_message_get_format (DATA_PTR (self), StringValueCStr (format));
+  switch (result)
+    {
+    case 1:
+      return Qtrue;
+      break;
+    case 0:
+      return Qfalse;
+      break;
+    case -1:
+      return Qnil;
+      break;
+    default:
+      rb_raise (ERROR, "unreachable");
+    }
+}
+#endif
+
 /**
  * call-seq: format? (type)
  */
 VALUE
-gettextpo_po_message_m_format (VALUE self, VALUE format)
+gettextpo_po_message_m_format_q (VALUE self, VALUE format)
 {
   return po_message_is_format (DATA_PTR (self), StringValueCStr (format))
              ? Qtrue
@@ -427,6 +550,25 @@ gettextpo_po_message_m_format_set (int argc, VALUE *argv, VALUE self)
   return Qnil;
 }
 
+#ifdef HAVE_PO_MESSAGE_GET_FORMAT
+/**
+ * Document-method: sticky_flag?
+ * call-seq: sticky_flag? (flag)
+ */
+FLAG_Q (sticky);
+
+/**
+ * Document-method: update_sticky_flag
+ * call-seq: update_sticky_flag (flag, set: true)
+ */
+UPDATE_FLAG (sticky);
+
+/**
+ * Document-method: sticky_flag_iterator
+ */
+FLAG_ITER (sticky);
+#endif
+
 /**
  * call-seq: range? (range)
  */
@@ -952,9 +1094,33 @@ Init_gettextpo (void)
   rb_define_method (rb_cMessage, "fuzzy?", gettextpo_po_message_m_fuzzy, 0);
   rb_define_method (rb_cMessage, "fuzzy=", gettextpo_po_message_m_fuzzy_set,
                     1);
-  rb_define_method (rb_cMessage, "format?", gettextpo_po_message_m_format, 1);
+
+#ifdef HAVE_PO_MESSAGE_GET_FORMAT
+  rb_define_method (rb_cMessage, "workflow_flag?",
+                    gettextpo_po_message_m_workflow_flag_q, 1);
+  rb_define_method (rb_cMessage, "update_workflow_flag",
+                    gettextpo_po_message_m_update_workflow_flag, -1);
+  rb_define_method (rb_cMessage, "workflow_flag_iterator",
+                    gettextpo_po_message_m_workflow_flags_iterator, 0);
+#endif
+
+  rb_define_method (rb_cMessage, "format?", gettextpo_po_message_m_format_q,
+                    1);
+#ifdef HAVE_PO_MESSAGE_GET_FORMAT
+  rb_define_method (rb_cMessage, "format", gettextpo_po_message_m_format, 1);
+#endif
   rb_define_method (rb_cMessage, "update_format",
                     gettextpo_po_message_m_format_set, -1);
+
+#ifdef HAVE_PO_MESSAGE_GET_FORMAT
+  rb_define_method (rb_cMessage, "sticky_flag?",
+                    gettextpo_po_message_m_sticky_flag_q, 1);
+  rb_define_method (rb_cMessage, "update_sticky_flag",
+                    gettextpo_po_message_m_update_sticky_flag, -1);
+  rb_define_method (rb_cMessage, "sticky_flag_iterator",
+                    gettextpo_po_message_m_sticky_flags_iterator, 0);
+#endif
+
   rb_define_method (rb_cMessage, "range?", gettextpo_po_message_m_range, 1);
   rb_define_method (rb_cMessage, "range=", gettextpo_po_message_m_range_set,
                     1);
@@ -980,4 +1146,11 @@ Init_gettextpo (void)
   rb_define_method (rb_cFilePos, "file", gettextpo_po_filepos_m_file, 0);
   rb_define_method (rb_cFilePos, "start_line",
                     gettextpo_po_filepos_m_start_line, 0);
+#ifdef HAVE_PO_MESSAGE_GET_FORMAT
+  rb_cFlagIterator
+      = rb_define_class_under (rb_mGettextPO, "FlagIterator", rb_cObject);
+  rb_define_alloc_func (rb_cFlagIterator, gettextpo_po_flag_iterator_alloc);
+  rb_define_method (rb_cFlagIterator, "next",
+                    gettextpo_po_flag_iterator_m_next, 0);
+#endif
 }

data/lib/gettextpo/version.rb

@@ -19,5 +19,5 @@
 
 module GettextPO
   # Version of this gem.
-  VERSION = "0.1.3"
+  VERSION = "0.2.1"
 end

data/mrblib/mrb_gettextpo_common.rb

@@ -40,7 +40,7 @@ module GettextPO
   # This class doesn't provide the +new+ class method.  See also
   # GettextPO::File#message_iterator.
   class MessageIterator
-    def self.new
+    def self.new # :nodoc:
       raise NoMethodError,
             "please use other methods instead, such as GettextPO::File#message_iterator"
     end
@@ -58,22 +58,54 @@ module GettextPO
     include Enumerable
   end
 
-  # This class doesn't provide the +new+ class method.  Refre to
+  # This class doesn't provide the +new+ class method.  Refer to
   # GettextPO::MessageIterator#next or
   # GettextPO::MessageIterator#insert.
   class Message
-    def self.new
+    def self.new # :nodoc:
       raise NoMethodError,
             "please use other methods instead, such as GettextPO::MessageIterator#next"
     end
+
+    def file_positions
+      positions = []
+      index = 0
+      while (pos = filepos(index))
+        positions << pos
+        index += 1
+      end
+      positions
+    end
   end
 
   # This class doesn't provide the +new+ class method.  See also
   # GettextPO::Message#filepos.
   class FilePos
-    def self.new
+    def self.new # :nodoc:
       raise NoMethodError,
             "please use other methods instead, such as GettextPO::Message#filepos"
     end
   end
+
+  # This class doesn't provide the +new+ class method.  See also
+  # GettextPO::Message#workflow_flag_iterator and
+  # GettextPO::Message#sticky_flag_iterator.
+  class FlagIterator
+    def self.new # :nodoc:
+      raise NoMethodError,
+            "please use other methods instead, such as GettextPO::Message#workflow_flag_iterator"
+    end
+
+    def each # yields: flag
+      while true
+        begin
+          yield self.next
+        rescue StopIteration
+          return self
+        end
+      end
+    end
+
+    include Enumerable
+  end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gettextpo
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - gemmaro
+autorequire:
 bindir: bin
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies: []
 description: This gem is a Ruby library for the GNU gettext PO files.  This is a C
   binding of the libgettextpo library, which is part of the GNU gettext package.
@@ -18,36 +19,17 @@ extensions:
 - ext/gettextpo/extconf.rb
 extra_rdoc_files: []
 files:
-- ".clang-format"
-- ".dir-locals.el"
-- ".env.example"
-- ".envrc"
-- ".rdoc_options"
 - CHANGELOG.md
 - COPYING
+- Gemfile
 - README.md
 - Rakefile
-- build_config.rb
 - ext/gettextpo/extconf.rb
 - ext/gettextpo/gettextpo.c
 - ext/gettextpo/gettextpo.h
-- include/mrb_gettextpo.h
 - lib/gettextpo.rb
 - lib/gettextpo/version.rb
-- mrbgem.rake
-- mrblib/mrb_gettextpo.rb
 - mrblib/mrb_gettextpo_common.rb
-- mrblib/mrb_gettextpo_version.rb
-- sig/gettextpo.rbs
-- src/mrb_gettextpo.c
-- test.cruby/gettextpo_test.rb
-- test.cruby/resources/a.po
-- test.cruby/resources/bad.po
-- test.cruby/resources/filepos.po
-- test.cruby/resources/format.po
-- test.cruby/resources/ok.po
-- test.cruby/test_helper.rb
-- test.cruby/tmp/.keep
 homepage: https://git.disroot.org/gemmaro/ruby-gettextpo
 licenses:
 - GPL-3.0-or-later
@@ -59,6 +41,7 @@ metadata:
   homepage_uri: https://git.disroot.org/gemmaro/ruby-gettextpo
   source_code_uri: https://git.disroot.org/gemmaro/ruby-gettextpo
   wiki_uri: https://git.disroot.org/gemmaro/ruby-gettextpo/wiki
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,7 +57,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - libgettextpo
-rubygems_version: 3.6.9
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: GNU gettext PO file parser library
 test_files: []

data/.clang-format

@@ -1 +0,0 @@
-BasedOnStyle: GNU

data/.dir-locals.el

@@ -1,6 +0,0 @@
-;;; Directory Local Variables            -*- no-byte-compile: t -*-
-;;; For more information see (info "(emacs) Directory Variables")
-
-((nil . ((eval . (progn (require 'grep)
-                        (add-to-list 'grep-find-ignored-directories "tmp")
-                        (add-to-list 'grep-find-ignored-directories "doc"))))))

data/.env.example

@@ -1,2 +0,0 @@
-MRUBY_SRC=/path/to/mruby
-DEVELOP_MRUBY=no

data/.envrc

@@ -1,38 +0,0 @@
-# Copyright (C) 2026  gemmaro
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-use guix \
-    clang \
-    gcc-toolchain \
-    ruby \
-    ruby-rake-compiler \
-    make \
-    gettext \
-    gdb
-
-dotenv
-
-if [ "$DEVELOP_MRUBY" != 'yes' ]
-then
-    # CRuby
-    path_add C_INCLUDE_PATH "$(ruby -e "puts RbConfig::CONFIG['rubyhdrdir']")"
-    path_add C_INCLUDE_PATH "$(ruby -e "puts RbConfig::CONFIG['rubyarchhdrdir']")"
-else
-    # mruby
-    env_vars_required MRUBY_SRC
-    path_add C_INCLUDE_PATH include
-    path_add C_INCLUDE_PATH "$MRUBY_SRC/include"
-    path_add C_INCLUDE_PATH "$MRUBY_SRC/build/host/include"
-fi

data/.rdoc_options

@@ -1,12 +0,0 @@
-main_page: README.md
-exclude:
-  - tmp
-  - bin
-  - Rakefile
-  - Gemfile
-  - vendor
-  - test.cruby/**/*
-  - build_config.rb.lock
-  - mrbgem.rake
-  - mrblib/mrb_gettextpo.rb
-  - mrblib/mrb_gettextpo_version.rb

data/build_config.rb

@@ -1,27 +0,0 @@
-# Copyright (C) 2026  gemmaro
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-MRuby::Build.new do |conf|
-  toolchain :gcc
-  conf.gem File.expand_path(File.dirname(__FILE__))
-  conf.linker.libraries << 'gettextpo'
-  conf.enable_test
-  conf.gem core: 'hal-posix-io'
-  conf.gem core: 'mruby-bin-mruby'
-  conf.gem core: 'mruby-bin-mirb'
-  conf.cc do |cc|
-    cc.flags << '-O0'
-  end
-end

data/include/mrb_gettextpo.h

@@ -1,24 +0,0 @@
-/* Copyright (C) 2026  gemmaro
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef MRB_GETTEXTPO_H
-#define MRB_GETTEXTPO_H
-
-#include <mruby.h>
-
-void mrb_gettextpo_gem_init(mrb_state *mrb);
-
-#endif

data/mrbgem.rake

@@ -1,24 +0,0 @@
-# Copyright (C) 2026  gemmaro
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-MRuby::Gem::Specification.new('mruby-gettextpo') do |spec|
-  spec.license = 'GPL-3.0-or-later'
-  spec.authors = 'gemmaro'
-  spec.summary = 'GNU gettext PO parser for mruby'
-  spec.version = '0.1.0'
-  spec.homepage = 'https://git.disroot.org/gemmaro/ruby-gettextpo'
-  spec.linker.libraries << 'gettextpo'
-  spec.add_test_dependency 'mruby-io'
-end

data/mrblib/mrb_gettextpo.rb

@@ -1,58 +0,0 @@
-# Copyright (C) 2026  gemmaro
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-module GettextPO
-  Error = Class.new(StandardError)
-
-  class File
-    class << self
-      # It seems that calling Proc with keyword arguments is not yet
-      # supported.
-      alias original_read read
-      def read(filename, xerror: nil, xerror2: nil)
-        original_read(filename,
-                      xerror: xerror && Proc.new { |kwargs| xerror.(**kwargs) },
-                      xerror2: xerror2 && Proc.new { |kwargs| xerror2.(**kwargs) })
-      end
-    end
-
-    # It seems that calling Proc with keyword arguments is not yet
-    # supported.
-    alias original_check_all check_all
-    def check_all(xerror: nil, xerror2: nil)
-      original_check_all(xerror: xerror && Proc.new { |kwargs| xerror.(**kwargs) },
-                         xerror2: xerror2 && Proc.new { |kwargs| xerror2.(**kwargs) })
-    end
-  end
-
-  class Message
-    # It seems that calling Proc with keyword arguments is not yet
-    # supported.
-    alias original_check_all check_all
-    def check_all(iterator, xerror: nil, xerror2: nil)
-      original_check_all(iterator,
-                         xerror: xerror && Proc.new { |kwargs| xerror.(**kwargs) },
-                         xerror2: xerror2 && Proc.new { |kwargs| xerror2.(**kwargs) })
-    end
-
-    # It seems that calling Proc with keyword arguments is not yet
-    # supported.
-    alias original_check_format check_format
-    def check_format(xerror: nil, xerror2: nil)
-      original_check_format(xerror: xerror && Proc.new { |kwargs| xerror.(**kwargs) },
-                            xerror2: xerror2 && Proc.new { |kwargs| xerror2.(**kwargs) })
-    end
-  end
-end