kanayago 0.6.1 → 0.7.0

data/patch/head/macos.patch.rej

@@ -0,0 +1,49 @@
+--- patch/head/macos.patch
++++ patch/head/macos.patch
+@@ -1,46 +0,0 @@
+---- a/ext/kanayago/ruby_parser.c
+-+++ b/ext/kanayago/ruby_parser.c
+-@@ -433,16 +433,21 @@
+-     return rb_stderr_tty_p();
+- }
+- 
+-+// Kanayago macOS: Use rb_reg_new_str instead of rb_reg_compile (not exported in Ruby head)
+- static VALUE
+- reg_compile(VALUE str, int options, const char *sourcefile, int sourceline)
+- {
+--     return rb_reg_compile(str, options, sourcefile, sourceline);
+-+    (void)sourcefile;
+-+    (void)sourceline;
+-+    return rb_reg_new_str(str, options);
+- }
+- 
+-+// Kanayago macOS: Return Qnil instead of calling rb_reg_check_preprocess (not exported in Ruby head)
+- static VALUE
+- reg_check_preprocess(VALUE val)
+- {
+--    return rb_reg_check_preprocess(val);
+-+    (void)val;
+-+    return Qnil;
+- }
+- // End of Add for Kanayago
+- 
+-@@ -985,7 +990,8 @@
+- VALUE
+- rb_str_new_parser_string(rb_parser_string_t *str)
+- {
+--    VALUE string = rb_enc_literal_str(str->ptr, str->len, str->enc);
+-+    // Kanayago macOS: Use rb_enc_str_new instead of rb_enc_literal_str (not exported in Ruby head)
+-+    VALUE string = rb_enc_str_new(str->ptr, str->len, str->enc);
+-     rb_enc_str_coderange(string);
+-     return string;
+- }
+-@@ -1167,7 +1173,8 @@
+-     rb_parser_string_t *string = node_reg->string;
+-     VALUE str = rb_enc_str_new(string->ptr, string->len, string->enc);
+- 
+--    return rb_reg_compile(str, node_reg->options, NULL, 0);
+-+    // Kanayago macOS: Use rb_reg_new_str instead of rb_reg_compile
+-+    return rb_reg_new_str(str, node_reg->options);
+- }
+- 
+- VALUE

data/script/setup_parser.rb

@@ -33,16 +33,33 @@ module KanayagoSetup
     private
 
     def detect_ruby_version
-      if RUBY_DESCRIPTION.include?('dev')
+      # Ruby head (master branch) has 'dev' in description but not a release version
+      # Ruby 3.4.0 also had 'dev' in its preview/rc releases, so check RUBY_VERSION
+      if RUBY_DESCRIPTION.include?('dev') && !RUBY_VERSION.start_with?('3.4')
         'head'
       else
-        RUBY_VERSION[0..2]
+        # Try exact version first (e.g., "3.4.1"), fallback to major.minor (e.g., "3.4")
+        exact_version = RUBY_VERSION
+        major_minor = RUBY_VERSION[0..2]
+
+        patch_dir = File.expand_path('../patch', __dir__)
+        if Dir.exist?(File.join(patch_dir, exact_version))
+          exact_version
+        else
+          major_minor
+        end
       end
     end
 
     def load_copy_targets(version)
+      # Try exact version first, then fallback to major.minor
       copy_target_path = File.expand_path("../patch/#{version}/copy_target.rb", __dir__)
 
+      unless File.exist?(copy_target_path)
+        fallback_version = version[0..2]
+        copy_target_path = File.expand_path("../patch/#{fallback_version}/copy_target.rb", __dir__)
+      end
+
       raise "Copy target file not found: #{copy_target_path}" unless File.exist?(copy_target_path)
 
       require copy_target_path
@@ -54,7 +71,9 @@ module KanayagoSetup
       tar_name = if version == 'head'
                    'snapshot/snapshot-master.tar.gz'
                  else
-                   "#{version}/ruby-#{RUBY_VERSION}.tar.gz"
+                   # Use major.minor for directory path (e.g., "3.4")
+                   major_minor = RUBY_VERSION[0..2]
+                   "#{major_minor}/ruby-#{RUBY_VERSION}.tar.gz"
                  end
 
       # Get project root directory
@@ -127,8 +146,26 @@ module KanayagoSetup
       Dir.chdir(project_root) do
         system("patch -p1 < #{patch_file}") ||
           raise('Failed to apply patch')
+
+        # Apply macOS-specific patch if on macOS
+        apply_macos_patch(version)
       end
     end
+
+    def apply_macos_patch(version)
+      return unless macos?
+
+      macos_patch_file = File.expand_path("../patch/#{version}/macos.patch", __dir__)
+      return unless File.exist?(macos_patch_file)
+
+      puts "Applying macOS-specific patch for Ruby #{version}..."
+      system("patch -p1 < #{macos_patch_file}") ||
+        raise('Failed to apply macOS patch')
+    end
+
+    def macos?
+      RUBY_PLATFORM.include?('darwin')
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kanayago
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - S-H-GAMELINKS
@@ -71,10 +71,33 @@ files:
 - lib/kanayago/string_node.rb
 - lib/kanayago/variable_node.rb
 - lib/kanayago/version.rb
+- patch/3.4.0/copy_target.rb
+- patch/3.4.0/kanayago.patch
+- patch/3.4.1/copy_target.rb
+- patch/3.4.1/kanayago.patch
+- patch/3.4.2/copy_target.rb
+- patch/3.4.2/kanayago.patch
+- patch/3.4.3/copy_target.rb
+- patch/3.4.3/kanayago.patch
+- patch/3.4.4/copy_target.rb
+- patch/3.4.4/kanayago.patch
+- patch/3.4.5/copy_target.rb
+- patch/3.4.5/kanayago.patch
+- patch/3.4.6/copy_target.rb
+- patch/3.4.6/kanayago.patch
+- patch/3.4.7/copy_target.rb
+- patch/3.4.7/kanayago.patch
+- patch/3.4.8/copy_target.rb
+- patch/3.4.8/kanayago.patch
 - patch/3.4/copy_target.rb
 - patch/3.4/kanayago.patch
+- patch/4.0.0/copy_target.rb
+- patch/4.0.0/kanayago.patch
+- patch/4.0.0/macos.patch
 - patch/head/copy_target.rb
 - patch/head/kanayago.patch
+- patch/head/macos.patch
+- patch/head/macos.patch.rej
 - sample/minitest_generator.rb
 - sample/test_generator.rb
 - script/setup_parser.rb
@@ -102,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.0.dev
+rubygems_version: 4.1.0.dev
 specification_version: 4
 summary: Trying to Make Ruby's Parser Available as a Gem
 test_files: []