Merge pull request #142 from sue445/refactor

Refactor ruby_h_to_go

Author: sue445

_tools/ruby_h_to_go/lib/ruby_h_to_go/cli.rb

@@ -43,6 +43,8 @@ def write_type_definitions_to_go_file
       end
 
       type_definitions.each do |definition|
+        next unless target_header_file?(definition.filepath)
+
         definition.write_go_file(dist_dir)
       end
     end
@@ -53,6 +55,8 @@ def write_struct_definitions_to_go_file
       end
 
       struct_definitions.each do |definition|
+        next unless target_header_file?(definition.filepath)
+
         definition.write_go_file(dist_dir)
       end
     end
@@ -73,6 +77,8 @@ def write_function_definitions_to_go_file
       end
 
       function_definitions.each do |definition|
+        next unless target_header_file?(definition.filepath)
+
         definition.write_go_file(dist_dir)
       end
     end
@@ -83,14 +89,15 @@ def clean_generated_files
     end
 
     def copy_go_files
-      # FIXME: This is a temporary process until all possible contents of `ruby/*.go` are replaced
-      #       with automatically generated files. (Currently output to `dist/` as it is incomplete)
+      src_dir = File.expand_path("../../../../ruby", __dir__)
+      return if src_dir == dist_dir
+
       %w[
         c_types.go
         types.go
         wrapper.go
       ].each do |file|
-        FileUtils.cp(File.join(__dir__, "..", "..", "..", "..", "ruby", file), dist_dir)
+        FileUtils.cp(File.join(src_dir, file), dist_dir)
       end
     end
 
@@ -108,5 +115,11 @@ def go_fmt
         system("go fmt", exception: true)
       end
     end
+
+    # @param filename [String]
+    # @return [Boolean]
+    def target_header_file?(filename)
+      File.extname(filename) == ".h"
+    end
   end
 end

_tools/ruby_h_to_go/lib/ruby_header_parser/data.rb

@@ -26,23 +26,25 @@ def function_arg_pointer_hint(function_name:, index:)
     # @param function_name [String]
     # @return [Boolean]
     def should_generate_function?(function_name)
-      return false if data["function"]["deny_name"].any? { |format| format === function_name } # rubocop:disable Style/CaseEquality
+      return false if data["function"]["exclude_name"].any? { |format| format === function_name } # rubocop:disable Style/CaseEquality
 
-      data["function"]["allow_name"].any? { |format| format === function_name } # rubocop:disable Style/CaseEquality
+      data["function"]["include_name"].any? { |format| format === function_name } # rubocop:disable Style/CaseEquality
     end
 
     # Whether generate C struct to go
     # @param struct_name [String]
     # @return [Boolean]
     def should_generate_struct?(struct_name)
-      data["struct"]["allow_name"].any? { |format| format === struct_name } # rubocop:disable Style/CaseEquality
+      data["struct"]["include_name"].any? { |format| format === struct_name } # rubocop:disable Style/CaseEquality
     end
 
     # Whether generate C type to go
     # @param type_name [String]
     # @return [Boolean]
     def should_generate_type?(type_name)
-      data["type"]["allow_name"].any? { |format| format === type_name } # rubocop:disable Style/CaseEquality
+      return false if data["type"]["exclude_name"].any? { |format| format === type_name } # rubocop:disable Style/CaseEquality
+
+      data["type"]["include_name"].any? { |format| format === type_name } # rubocop:disable Style/CaseEquality
     end
   end
 end

_tools/ruby_h_to_go/lib/ruby_header_parser/data.yml

@@ -1,9 +1,9 @@
 function:
-  allow_name:
+  include_name:
     - !ruby/regexp /^rb_/i
     - !ruby/regexp /^rstring_/i
 
-  deny_name:
+  exclude_name:
     # deprecated functions
     - rb_check_safe_str
     - rb_clear_constant_cache
@@ -41,15 +41,17 @@ function:
       3: array
 
 struct:
-  allow_name:
+  include_name:
     - !ruby/regexp /^rb_/i
     - re_registers
 
 type:
-  allow_name:
+  include_name:
     - !ruby/regexp /^rb_/i
     - !ruby/regexp /^st_/i
     - ID
     - VALUE
     - regex_t
     - OnigPosition
+
+  exclude_name: []