c2ffi4rb 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9471bfff4cabf71daa4a888c294218eb8b74200168b35584cb166771a062fe4a
-  data.tar.gz: f84570b4abbae4fd1eba8e1ee76554da81aa621a92be31014748ac5e5aa5e20e
+  metadata.gz: 06ea739a36f2f4a6485ba3e65b6e91724eafed7f7440df1d26e7dfb5d5290897
+  data.tar.gz: 2eaf74991d02fd8b6e5beae79150cc1b40f5178c4bb27cf1277bf1bae0c744f2
 SHA512:
-  metadata.gz: a2443c99c551de4a8c42a977604c4654e75a0f9f9c754395fb894bdcf488d388e1523aac2a0862126baf17b7cda86966e902f71bbf0ecd2db54f8a68df1e2da8
-  data.tar.gz: ce7450668d888f8fc575e56a8a9be650ea2862044feac2e49e0a94f5f50834576cb3a3a46c4f6ac05ea056942e6b9924401342b87876941ebfe97dddd45c5e02
+  metadata.gz: cdc2f8439c2722a83b3a82aac50821d4bf4f9be35efa52e30202e44417ab29b3a203896ddc955e0046637667d50751a354902955df92560c22a4b74a9939fc61
+  data.tar.gz: 5bb0f1ba5929c3ba8dbc4ca176701fddc05a3fb836ac218a1606b935335af035972354cfb4ba0950f5a19daf04457486801fca9ea868685070c1134b90e6938b

data/exe/c2ffi4rb

@@ -8,8 +8,20 @@
 require 'optparse'
 require 'c2ffi4rb'
 
+type_table = {}
+
 opts = OptionParser.new
 opts.banner = 'Usage: c2ffi4rb [options] [file1, file2, ...]'
+opts.on('-t FILE', '--table FILE', 'Type conversion table TSV') do |file|
+  File.open(file) do |io|
+    io.each_line do |line|
+      next if line =~ /^#/
+
+      from, to = line.chomp.split("\t")
+      type_table[from] = to
+    end
+  end
+end
 opts.on('-h', '--help', 'Show this message') do
   puts opts
   exit
@@ -32,4 +44,4 @@ ARGV.each do |file|
   end
 end
 
-C2FFI4RB::BindGen.generate_bindings(spec)
+C2FFI4RB::BindGen.new(type_table).generate_bindings(spec)

data/lib/c2ffi4rb/bind_gen.rb

@@ -4,21 +4,28 @@ require 'json'
 
 module C2FFI4RB
   class BindGen
-    TYPE_TABLE = {
+    DEFAULT_TYPE_TABLE = {
+      ':signed-int' => ':int',
       ':unsigned-int' => ':uint',
+      ':signed-char' => ':char',
       ':unsigned-char' => ':uchar',
+      ':signed-short' => ':short',
       ':unsigned-short' => ':ushort',
       ':long-long' => ':long_long',
+      ':ulong-long' => ':ulong_long',
+      ':long-double' => ':long_double',
+      ':signed-long' => ':long',
       ':unsigned-long' => ':ulong',
       ':unsigned-long-long' => ':ulong_long',
       ':function-pointer' => ':pointer'
-    }.freeze
+    }
 
     def self.generate_bindings(arr)
       new.generate_bindings(arr)
     end
 
-    def initialize
+    def initialize(type_table = {})
+      @type_table = DEFAULT_TYPE_TABLE.merge(type_table)
       @struct_type = []
       @toplevels = []
       @anon_counter = 0
@@ -55,7 +62,11 @@ module C2FFI4RB
       type = resolve_type(form[:type])
       if @struct_type.include?(type)
         name = define_struct(form[:name])
-        "#{name} = #{type}"
+        if name == type
+          "# #{name} = #{type}"
+        else
+          "#{name} = #{type}"
+        end
       elsif type == ":{#{form[:name]}}"
         warn "Ignoring self-referential typedef #{form[:name]}"
       else
@@ -65,6 +76,7 @@ module C2FFI4RB
           warn "# Redefinition of #{form[:name]} from #{@typedefs[form[:name]]} to #{type}"
 
         end
+        "typedef :pointer, :#{form[:name]} # #{type}" if form[:type][:tag] == ':array'
         @typedefs[form[:name]] = type
         "typedef #{type}, :#{form[:name]}"
       end
@@ -81,7 +93,9 @@ module C2FFI4RB
     end
 
     def generate_function(form)
-      params = form[:parameters].map { |f| "  #{resolve_type(f[:type])}," }.join("\n")
+      params = form[:parameters].map do |f|
+        f[:type][:tag] == ':array' ? "  :pointer, # #{resolve_type(f[:type])}" : "  #{resolve_type(f[:type])},"
+      end.join("\n")
       <<~FUNCTION
         attach_function '#{form[:name]}', [
         #{params}
@@ -100,7 +114,7 @@ module C2FFI4RB
 
         @anon_enum_ids << id
       end
-      name = normalize_enum_name(form[:name])
+      name = normalize_enum_name(form[:name], form[:id])
       fields = form[:fields].map { |f| "  :#{f[:name]}, #{f[:value]}," }.join("\n")
       <<~ENUM
         enum #{name}, [
@@ -136,12 +150,9 @@ module C2FFI4RB
       end
     end
 
-    def normalize_enum_name(name)
+    def normalize_enum_name(name, id)
       # Anonymous enums are given a name
-      if name.empty?
-        @anon_counter += 1
-        name = "anon_type_#{@anon_counter}"
-      end
+      name = "anon_enum_#{id}" if name.empty?
 
       # All enums are prefixed with a colon
       name = ":#{name}" unless name.start_with?(':')
@@ -161,7 +172,8 @@ module C2FFI4RB
 
       register_struct(name)
 
-      type = form[:tag] == 'struct' ? 'FFI::Struct' : 'FFI::Union'
+      # FIXME: :FFI::Struct or FFI::Struct
+      type = form[:tag] == 'struct' ? '::FFI::Struct' : '::FFI::Union'
 
       lines = ["class #{name} < #{type}"]
 
@@ -183,12 +195,12 @@ module C2FFI4RB
     end
 
     def resolve_type(form)
-      TYPE_TABLE.fetch(form[:tag]) do
+      @type_table.fetch(form[:tag]) do
         case form[:tag]
         when ':pointer'          then resolve_pointer_type(form)
         when ':array'            then resolve_array_type(form)
         when ':struct', ':union' then define_struct(form[:name])
-        when ':enum'             then normalize_enum_name(form[:name])
+        when ':enum'             then normalize_enum_name(form[:name], form[:id])
         when 'struct', 'union'   then define_struct_or_union_type(form)
         when 'enum'              then normalize_enum_name_type(form)
         else resolve_default_type(form)
@@ -212,7 +224,7 @@ module C2FFI4RB
     end
 
     def normalize_enum_name_type(form)
-      form[:name] = normalize_enum_name(form[:name])
+      form[:name] = normalize_enum_name(form[:name], form[:id])
       process_toplevel(form)
       form[:name]
     end
@@ -224,6 +236,10 @@ module C2FFI4RB
     end
 
     def resolve_default_type(form)
+      ## FIXME
+      st_name = normalize_struct_name(form[:tag])
+      return st_name if @struct_type.include?(st_name)
+
       form[:tag].start_with?(':') ? form[:tag] : ":#{form[:tag]}"
     end
   end

data/lib/c2ffi4rb/version.rb

@@ -1,3 +1,3 @@
 module C2FFI4RB
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c2ffi4rb
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kojix2
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-05 00:00:00.000000000 Z
+date: 2024-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler