Merge pull request #144 from sue445/feature/fix_rb_int2num_inline

Fix rb_int2num_inline

Author: sue445

_tools/ruby_h_to_go/lib/ruby_header_parser/parser.rb

@@ -76,14 +76,14 @@ def __extract_function_definitions(c_kinds:, kind:, is_parse_multiline_definitio
         parts = line.split("\t")
 
         function_name = parts[0]
+        filepath = parts[1]
 
         next unless data.should_generate_function?(function_name)
 
         next unless parts[3] == kind
 
         line_num = Util.find_field(parts, "line").to_i
-        definition =
-          parse_function_definition(filepath: parts[1], pattern: parts[2], line_num:, is_parse_multiline_definition:)
+        definition = parse_function_definition(filepath:, pattern: parts[2], line_num:, is_parse_multiline_definition:)
 
         args = parse_definition_args(function_name, Util.find_field(parts, "signature"))
 
@@ -94,9 +94,9 @@ def __extract_function_definitions(c_kinds:, kind:, is_parse_multiline_definitio
 
         definitions << FunctionDefinition.new(
           definition:,
-          name:       parts[0],
-          filepath:   parts[1],
-          typeref:    create_typeref(definition:, function_name:, typeref_field:),
+          name:       function_name,
+          filepath:,
+          typeref:    create_typeref(definition:, function_name:, typeref_field:, filepath:, line_num:),
           args:,
         )
       end
@@ -212,17 +212,11 @@ def parse_definition_args(function_name, signature)
     # @param definition [String]
     # @param function_name [String]
     # @param typeref_field [String,nil]
+    # @param filepath [String]
+    # @param line_num [Integer]
     # @return [RubyHeaderParser::TyperefDefinition]
-    def create_typeref(definition:, function_name:, typeref_field:)
-      typeref_type =
-        if typeref_field
-          type = typeref_field.gsub(/[A-Z_]+\s*\(\(.*\)\)/, "").gsub("RUBY_SYMBOL_EXPORT_BEGIN", "")
-          Util.sanitize_type(type) # rubocop:disable Style/IdenticalConditionalBranches
-        else
-          # parse typeref in definition
-          type = definition[0...definition.index(function_name)].gsub("char *", "char*").strip
-          Util.sanitize_type(type) # rubocop:disable Style/IdenticalConditionalBranches
-        end
+    def create_typeref(definition:, function_name:, typeref_field:, filepath:, line_num:)
+      typeref_type = parse_typeref_type(definition:, function_name:, typeref_field:, filepath:, line_num:)
 
       typeref_pointer = nil
       if typeref_type.match?(/\*+$/)
@@ -232,5 +226,39 @@ def create_typeref(definition:, function_name:, typeref_field:)
 
       TyperefDefinition.new(type: typeref_type, pointer: typeref_pointer)
     end
+
+    # @param definition [String]
+    # @param function_name [String]
+    # @param typeref_field [String,nil]
+    # @param filepath [String]
+    # @param line_num [Integer]
+    # @return [String]
+    def parse_typeref_type(definition:, function_name:, typeref_field:, filepath:, line_num:)
+      typeref_type =
+        if typeref_field
+          typeref_field.gsub(/[A-Z_]+\s*\(\(.*\)\)/, "").gsub("RUBY_SYMBOL_EXPORT_BEGIN", "")
+        else
+          # parse typeref in definition
+          definition[0...definition.index(function_name)].gsub("char *", "char*").strip
+        end
+
+      typeref_type = Util.sanitize_type(typeref_type)
+      return typeref_type unless typeref_type.empty?
+
+      # Check prev line
+      line = read_file_line(filepath:, line_num: line_num - 1)
+      return Util.sanitize_type(line) if line
+
+      ""
+    end
+
+    # @param filepath [String]
+    # @param line_num [Integer]
+    def read_file_line(filepath:, line_num:)
+      return nil if line_num < 1
+
+      lines = File.open(filepath, "rb") { |f| f.readlines(chomp: true) }
+      lines[line_num - 1]
+    end
   end
 end

_tools/ruby_h_to_go/lib/ruby_header_parser/util.rb

@@ -23,7 +23,7 @@ def self.split_signature(signature)
     # @param type [String]
     # @return [String]
     def self.sanitize_type(type)
-      type.gsub(/(RUBY_EXTERN|enum|volatile|const|struct)\s+/i, "").gsub("const*", "").strip
+      type.gsub(/(RUBY_EXTERN|enum|volatile|const|struct|static\s+inline)\s+/i, "").gsub("const*", "").strip
     end
   end
 end

_tools/ruby_h_to_go/spec/ruby_header_parser/parser_spec.rb

@@ -177,6 +177,22 @@
       its(:typeref)    { should eq typedef(type: "int") }
       its(:args)       { should eq args }
     end
+
+    context "rb_int2num_inline" do
+      subject { definitions.find { |d| d.name == "rb_int2num_inline" } }
+
+      let(:args) do
+        [
+          argument(type: "int", name: "v"),
+        ]
+      end
+
+      its(:name)       { should eq "rb_int2num_inline" }
+      its(:definition) { should eq "rb_int2num_inline(int v)" }
+      its(:filepath)   { should be_end_with "/ruby/internal/arithmetic/int.h" }
+      its(:typeref)    { should eq typedef(type: "VALUE") }
+      its(:args)       { should eq args }
+    end
   end
 
   describe "#extract_struct_definitions" do