rcx 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67bf53ccbe670ee75a0faa064fed2c9cedb0f91042c52a61f75d2fa2948f36b7
-  data.tar.gz: cc83c45e03bd7cb72bf8856385c74c061e3995c50f409ff9fbc9beb9a62c12c2
+  metadata.gz: 4074c5868fd711ee67726acd364d4aa243c5aeaf9fad6232756e9c1fde7539e3
+  data.tar.gz: e38a49e450466554a5845189cf2ae51ba31665f18389bf9a8d1a052fe6858353
 SHA512:
-  metadata.gz: '08a0a98e5eade9330c4cd599b25264a3ea792ff5fc7067a122176bbf0a95e766cb6b7d0e6bc583e1bdb8535d49f5ac36624453bfa6455b381564b413e73ee5bb'
-  data.tar.gz: 19d7231302d29d691af29fd21696e43ed9f31be3b293f48c87fc7cd6b73e58e23307a558693cdb60da49d7d8a2a6c553c35bdbb6def1e0efd4ccf847cc07e2da
+  metadata.gz: cb13a7ca26f4caf50b3ad8038044f6abf7f932e612e1047df7c54bc543af07a4400a5f68fc64f37406eedff1234de7e99a58583a073c0cf4cbae916c0b03cdd8
+  data.tar.gz: 918833acbc1d6d1bc2b5c9678533ccd6a8bbdd8f5a6b2b87e18e0baf12443eb3887cb2b8b7ca5349f897e37eb9d0a2c06381e4501870db5e00c25317cc76a9f0

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## UNRELEASED
 
+## v0.3.1 (2025-09-02)
+- Now `extconf.rb`'s can only `require 'rcx/mkmf/c++20'` to enable RCX.
+
 ## v0.3.0 (2025-08-22)
 - Added `rcx::gvl::without_gvl`
 

data/README.md

@@ -6,9 +6,7 @@ Write Ruby extensions in C++20. Inspired by [rice](https://github.com/ruby-rice/
 ## Creating a new extension
 In your `extconf.rb` file, add the following:
 ```ruby
-require 'mkmf
-$CXXFLAGS += ' -std=c++20' # or newer
-require 'rcx/mkmf'
+require 'rcx/mkmf/c++20'
 
 create_header
 create_makefile('your_ext')

data/include/rcx/internal/rcx_impl.hpp

@@ -264,7 +264,7 @@ namespace rcx {
       return arg;
     }
 
-    inline ArgSplat::ResultType ArgSplat::parse(Ruby &, Value self, std::span<Value> &args) {
+    inline ArgSplat::ResultType ArgSplat::parse(Ruby &, Value, std::span<Value> &args) {
       auto result = Array::new_from(args);
       args = {};
       return result;

data/lib/rcx/mkmf/c++20.rb

@@ -0,0 +1,3 @@
+require_relative '../mkmf'
+include RCX::MakeMakefile
+setup_rcx(cxx_standard: 'c++20')

data/lib/rcx/mkmf.rb

@@ -1,56 +1,76 @@
 # SPDX-License-Identifier: BSL-1.0
 # SPDX-FileCopyrightText: Copyright 2024-2025 Kasumi Hanazuki <kasumi@rollingapple.net>
 require 'mkmf'
-include MakeMakefile['C++']
+require_relative '../rcx'
 
-root = File.join(__dir__, '../..')
+module RCX
+  CXX_STANDARD_FLAGS = {
+    'c++20' => %w[--std=c++20 --std=c++2a].freeze,
+    'c++23' => %w[--std=c++23 --std=c++2b].freeze,
+    'c++26' => %w[--std=c++26 --std=c++2c].freeze,
+  }.freeze
 
-$INCFLAGS << " -I#{File.join(root, 'include').shellescape}"
+  root = File.join(__dir__, '../..')
+  INCDIR = File.join(root, 'include').shellescape
+  HEADERS = Dir[File.join(root, 'include/**/*.hpp')]
 
-$rcx_headers = Dir[File.join(root, 'include/**/*.hpp')]
+  module MakeMakefile
+    include ::MakeMakefile['C++']
 
-include (Module.new do
-    def configuration(...)
-      super.tap do |mk|
-        mk << <<MAKEFILE
-rcx_headers = #{$rcx_headers.join(?\s)}
-ruby_headers := $(ruby_headers) $(rcx_headers)
-MAKEFILE
-      end
-    end
-  end)
+    def setup_rcx(cxx_standard: 'c++20')
+      CXX_STANDARD_FLAGS.fetch(cxx_standard).find do |flag|
+        if checking_for("whether #{flag} is accepted as CXXFLAGS") { try_cflags(flag) }
+          $CXXFLAGS << " " << flag
+          true
+        else
+          false
+        end
+      end or raise "C++ compiler does not support #{cxx_standard}"
 
-## libffi
+      $INCFLAGS << " -I#{INCDIR}"
 
-dir_config('libffi').any? || pkg_config('libffi')
-ffi_h = 'ffi.h'
-unless have_func('ffi_prep_cif', ffi_h)
-  raise "libffi was not found"
-end
-unless have_func('ffi_closure_alloc', ffi_h) && have_func('ffi_prep_closure_loc', ffi_h)
-  raise "libffi does not support closures"
-end
+      ## libffi
+      dir_config('libffi').any? || pkg_config('libffi')
+      ffi_h = 'ffi.h'
+      unless have_func('ffi_prep_cif', ffi_h)
+        raise "libffi was not found"
+      end
+      unless have_func('ffi_closure_alloc', ffi_h) && have_func('ffi_prep_closure_loc', ffi_h)
+        raise "libffi does not support closures"
+      end
 
-if have_header('cxxabi.h')
-  have_func('abi::__cxa_demangle', 'cxxabi.h')
-  have_func('abi::__cxa_current_exception_type', 'cxxabi.h')
-end
+      if have_header('cxxabi.h')
+        have_func('abi::__cxa_demangle', 'cxxabi.h')
+        have_func('abi::__cxa_current_exception_type', 'cxxabi.h')
+      end
 
-if checking_for("std::is_layout_compatible<>")  {
-    try_compile(<<'CXX')
+      if checking_for("std::is_layout_compatible<>")  {
+          try_compile(<<'CXX')
 #include <type_traits>
 struct A { int a; };
 struct B { int b; };
 static_assert(std::is_layout_compatible<A, B>::value);
 CXX
-  }
-  $defs.push("-DHAVE_STD_IS_LAYOUT_COMPATIBLE=1")
-end
+        }
+        $defs.push("-DHAVE_STD_IS_LAYOUT_COMPATIBLE=1")
+      end
 
-if checking_for("nullability extension")  {
-    try_compile("void *_Nullable p, *_Nonnull q;")
-  }
-  $defs.push("-DHAVE_FEATURE_NULLABILITY=1")
-end
+      if checking_for("nullability extension")  {
+          try_compile("void *_Nullable p, *_Nonnull q;")
+        }
+        $defs.push("-DHAVE_FEATURE_NULLABILITY=1")
+      end
 
-have_func('ruby_thread_has_gvl_p', 'ruby/thread.h')
+      have_func('ruby_thread_has_gvl_p', 'ruby/thread.h')
+    end
+
+    def configuration(...)
+      super.tap do |mk|
+        mk << <<MAKEFILE
+rcx_headers = #{RCX::HEADERS.join(?\s)}
+ruby_headers := $(ruby_headers) $(rcx_headers)
+MAKEFILE
+      end
+    end
+  end
+end

data/lib/rcx/version.rb

@@ -1,3 +1,3 @@
 module RCX
-  VERSION = -'0.3.0'
+  VERSION = -'0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rcx
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Kasumi Hanazuki
@@ -44,6 +44,7 @@ files:
 - include/rcx/rcx.hpp
 - lib/rcx.rb
 - lib/rcx/mkmf.rb
+- lib/rcx/mkmf/c++20.rb
 - lib/rcx/version.rb
 - package.json
 - yarn.lock