Merge pull request #128 from sue445/feature/fix_rb_tracepoint_new

Fix rb_tracepoint_new

Author: sue445

_tools/ruby_h_to_go/lib/ruby_header_parser.rb

@@ -8,6 +8,7 @@
 require_relative "ruby_header_parser/struct_definition"
 require_relative "ruby_header_parser/type_definition"
 require_relative "ruby_header_parser/typeref_definition"
+require_relative "ruby_header_parser/util"
 
 # Parser for ruby.h
 module RubyHeaderParser

_tools/ruby_h_to_go/lib/ruby_header_parser/parser.rb

@@ -19,7 +19,7 @@ def initialize(header_dir)
 
     # @return [Array<RubyHeaderParser::FunctionDefinition>]
     def extract_function_definitions
-      stdout = `ctags --recurse --c-kinds=p --languages=C --language-force=C --fields=+n --extras=+q -f - #{header_dir}`
+      stdout = `ctags --recurse --c-kinds=p --languages=C --language-force=C --fields=+nS --extras=+q -f - #{header_dir}`
 
       stdout.each_line.with_object([]) do |line, definitions|
         parts = line.split("\t")
@@ -32,13 +32,13 @@ def extract_function_definitions
           if parts[2].end_with?(";$/;\"")
             parts[2].delete_prefix("/^").delete_suffix(";$/;\"")
           else
-            line_num = parts[4].delete_prefix("line:").to_i
+            line_num = Util.find_field(parts, "line").to_i
             read_definition_from_header_file(parts[1], line_num).delete_suffix(";")
           end
 
         definition.gsub!(/\);.*/, ")")
 
-        args = parse_definition_args(function_name, definition)
+        args = parse_definition_args(function_name, Util.find_field(parts, "signature"))
 
         # Exclude functions with variable-length arguments
         next if args&.last&.type == "..."
@@ -182,31 +182,27 @@ def should_generate_type?(type_name)
     end
 
     # @param function_name [String]
-    # @param definition [String]
+    # @param signature [String,nil]
     # @return [Array<RubyHeaderParser::ArgumentDefinition>]
-    def parse_definition_args(function_name, definition)
-      definition =~ /(?<=\()(.+)(?=\))/
-      args = ::Regexp.last_match(1).split(",").map(&:strip)
+    def parse_definition_args(function_name, signature)
+      return [] unless signature
+
+      signature = signature.strip.delete_prefix("(").delete_suffix(")")
+      return [] if signature.match?(/^void$/i)
+
+      args = Util.split_signature(signature)
 
       arg_pos = 0
       args.map do |str|
         arg_pos += 1
         parts = str.split
 
         if parts.count < 2
-          type = parts[0]
-
-          if type =~ /^void$/i
-            nil
-          else
-            name = "arg#{arg_pos}"
-
-            ArgumentDefinition.new(
-              type:,
-              name:,
-              pointer: nil,
-            )
-          end
+          ArgumentDefinition.new(
+            type:    parts[0],
+            name:    "arg#{arg_pos}",
+            pointer: nil,
+          )
         else
           loop do
             break unless parts[-1].start_with?("*")

_tools/ruby_h_to_go/lib/ruby_header_parser/util.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module RubyHeaderParser
+  # util methods
+  module Util
+    # @param array [Array<String>]
+    # @param field_name [String]
+    # @return [String,nil]
+    def self.find_field(array, field_name)
+      array.each do |element|
+        return element.delete_prefix("#{field_name}:") if element.start_with?("#{field_name}:")
+      end
+
+      nil
+    end
+
+    # @param signature [String]
+    # @return [Array<String>]
+    def self.split_signature(signature)
+      signature.scan(/[^,]+\([^()]*\)|[^,]+/).map(&:strip)
+    end
+  end
+end

_tools/ruby_h_to_go/spec/ruby_header_parser/parser_spec.rb

@@ -64,6 +64,25 @@
       its(:typeref)    { should eq typedef(type: "void", pointer: :ref) }
       its(:args)       { should eq args }
     end
+
+    context "rb_tracepoint_new" do
+      subject { definitions.find { |d| d.name == "rb_tracepoint_new" } }
+
+      let(:args) do
+        [
+          argument(type: "VALUE", name: "target_thread_not_supported_yet"),
+          argument(type: "rb_event_flag_t", name: "events"),
+          argument(type: "void", name: "arg3", pointer: :ref),
+          argument(type: "void", name: "data", pointer: :ref),
+        ]
+      end
+
+      its(:name)       { should eq "rb_tracepoint_new" }
+      its(:definition) { should eq "VALUE rb_tracepoint_new(VALUE target_thread_not_supported_yet, rb_event_flag_t events, void (*func)(VALUE, void *), void *data)" }
+      its(:filepath)   { should be_end_with "/ruby/debug.h" }
+      its(:typeref)    { should eq typedef(type: "VALUE") }
+      its(:args)       { should eq args }
+    end
   end
 
   describe "#extract_struct_definitions" do

_tools/ruby_h_to_go/spec/ruby_header_parser/util_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+RSpec.describe RubyHeaderParser::Util do
+  describe ".find_field" do
+    subject { RubyHeaderParser::Util.find_field(array, field_name) }
+
+    let(:array) { %w[a b foo:bar] }
+
+    context "when exists field" do
+      let(:field_name) { "foo" }
+
+      it { should eq "bar" }
+    end
+
+    context "when not exists field" do
+      let(:field_name) { "unknown" }
+
+      it { should eq nil }
+    end
+  end
+
+  describe ".split_signature" do
+    subject { RubyHeaderParser::Util.split_signature(signature) }
+
+    context "simple case" do
+      let(:signature) { "VALUE obj, ID mid, int argc, const VALUE *argv, rb_block_call_func_t proc, VALUE data2" }
+
+      it { should eq ["VALUE obj", "ID mid", "int argc", "const VALUE *argv", "rb_block_call_func_t proc", "VALUE data2"] }
+    end
+
+    context "with function pointer" do
+      let(:signature) { "VALUE target_thread_not_supported_yet,rb_event_flag_t events,void (* func)(VALUE,void *),void * data" }
+
+      it { should eq ["VALUE target_thread_not_supported_yet", "rb_event_flag_t events", "void (* func)(VALUE,void *)", "void * data"] }
+    end
+  end
+end