c2ffi4rb 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86a593339fb44c53b753ecbae5120b0d3cd67363f8899b8122fa100f800d1fcc
-  data.tar.gz: c2a2c0ab90ce7e1307d706b268778267237691a56ce71491bfe2503b27b3f8c8
+  metadata.gz: 3a7511b48117f836d65991de99d5aeaf1a4dc5f4c9a9b99e4a9577fe415c941a
+  data.tar.gz: 3ee454048f080abae9a07ab3a11293d1af7a8f57518d6ae1ae12eaac6fd7d2ab
 SHA512:
-  metadata.gz: 42260432b9a7267183c23e4ab79303257e25445c5ea5be46bcf61d7d27b43e8283144741bcf6eb95a9fd66ac7e3094067e68165648fa6fe13594459b588670f4
-  data.tar.gz: '08281db0ccbaedba8fb39908f343c69dbe348da5e8e49071ded01c382468962b84b308b59c6a57c707586a94dba6b5fb86937d48e0c3a1f37486ae1b52b29bdd'
+  metadata.gz: b75a019a77528b7ceac118bc3108991c0cae5aba439ef330a1480fe6dd7390ce04e5780f7263dfab9dd626f98bf754166a9780272277267098e5e1871625d9fe
+  data.tar.gz: 3aa7cf6cf49094f75d9ff220c90e66edda3b80092fe96d087c1471b22f71d9d9c5b56a3f5bab914ec0db908222f90c7d0be26f2c9e6eac0a406b806b82f56936

data/README.md

@@ -1,8 +1,12 @@
 # c2ffi4rb
 
+[![Gem Version](https://badge.fury.io/rb/c2ffi4rb.svg)](https://badge.fury.io/rb/c2ffi4rb)
+[![test](https://github.com/kojix2/c2ffi4rb/actions/workflows/ci.yml/badge.svg)](https://github.com/kojix2/c2ffi4rb/actions/workflows/ci.yml)
+
+
 [c2ffi](https://github.com/rpav/c2ffi) - FFI binding generator - for Ruby
 
-# installation
+## installation
 
 ```sh
 gem install c2ffi4rb

data/exe/c2ffi4rb

@@ -6,7 +6,6 @@
 ## your build system.  But this is how you can use it.
 
 require 'optparse'
-require 'json'
 require 'c2ffi4rb'
 
 options = {}

data/lib/c2ffi4rb/parser.rb

@@ -1,120 +1,119 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module C2FFI4RB
   class Parser
     TYPE_TABLE = {
-      "unsigned-int": :uint,
-      "unsigned-char": :uchar,
-      "unsigned-long": :ulong,
-      "function-pointer": :pointer
-    }.freeze
+      ':unsigned-int' => ':uint',
+      ':unsigned-char' => ':uchar',
+      ':unsigned-long' => ':ulong',
+      ':function-pointer' => ':pointer'
+    }
 
     def self.parse(arr)
       Parser.new.parse(arr)
     end
 
     def initialize
-      @struct_type = {}
+      @struct_type = []
       @toplevels = []
       @anon_counter = 0
     end
 
     def parse(arr)
       arr.each do |form|
-        s = parse_toplevel(form)
-        @toplevels << s if s
+        parse_toplevel(form)
       end
 
-      @toplevels.each do |t|
-        puts
-        case t
-        when String
-          puts "#{t}"
-        when Array
-          t.each do |l|
-            puts "#{l}"
-          end
-        end
-      end
+      puts @toplevels.join("\n\n")
     end
 
     private
 
     def parse_toplevel(form)
-      case form[:tag]
-      when 'typedef'
-        type = parse_type(form[:type])
-
-        # I don't think typedef works right with structs, so assign
-        if @struct_type[type]
-          name = add_struct(form[:name])
-          "#{name} = #{type}"
-        else
-          "typedef #{type}, :#{form[:name]}"
-        end
+      lines = \
+        case form[:tag]
+        when 'typedef'
+          type = parse_type(form[:type])
+
+          # I don't think typedef works right with structs, so assign
+          if @struct_type.include?(type)
+            name = add_struct(form[:name])
+            "#{name} = #{type}"
+          else
+            "typedef #{type}, :#{form[:name]}"
+          end
 
-      when 'const'
-        type = parse_type(form[:type])
-        if type == ':string'
-          "#{form[:name].upcase} = \"#{form[:value]}\""
-        else
-          "#{form[:name].upcase} = #{form[:value]}"
-        end
+        when 'const'
+          type = parse_type(form[:type])
+          if type == ':string'
+            "#{form[:name].upcase} = \"#{form[:value]}\""
+          else
+            "#{form[:name].upcase} = #{form[:value]}"
+          end
 
-      when 'extern'
-        'attach_variable ' \
-            ":#{form[:name]}, :#{form[:name]}, #{parse_type(form[:type])}"
+        when 'extern'
+          'attach_variable ' \
+              ":#{form[:name]}, :#{form[:name]}, #{parse_type(form[:type])}"
 
-      when 'function'
-        s = []
-        s << "attach_function '#{form[:name]}', ["
-        form[:parameters].each do |f|
-          s << "  #{parse_type(f[:type])},"
+        when 'function'
+          l = []
+          l << "attach_function '#{form[:name]}', ["
+          form[:parameters].each do |f|
+            l << "  #{parse_type(f[:type])},"
+          end
+          l << "], #{parse_type(form['return-type'.intern])}"
+          #          emacs doesn't like :"foo" ---^
+          l.join("\n")
+
+        when 'struct', 'union'
+          make_struct(form)
+
+        when 'enum'
+          name = add_enum(form[:name])
+          l = []
+          l << "enum #{name}, ["
+          form[:fields].each do |f|
+            l << "  :#{f[:name]}, #{f[:value]},"
+          end
+          l << ']'
+          l.join("\n")
         end
-        s << "], #{parse_type(form['return-type'.intern])}"
-      # emacs doesn't like :"foo" ---^
 
-      when 'struct', 'union'
-        name = add_struct(form[:name])
-        make_struct(form)
-
-      when 'enum'
-        name = add_enum(form[:name])
-        s = []
-        s << "enum #{name}, ["
-        form[:fields].each do |f|
-          s << "  :#{f[:name]}, #{f[:value]},"
-        end
-        s << ']'
-      end
+      @toplevels << lines
+      nil
     end
 
     def add_struct(name)
+      # Anonymous structs are given a name
       if name == ''
         @anon_counter += 1
-        name = 'Anon_Type_' + @anon_counter.to_s
+        name = "Anon_Type_#{@anon_counter}"
         return name
       end
 
+      # Do not allow names that start with an underscore
       name = 'C' + name if name.start_with? '_'
 
+      # Convert snake_case to CamelCase
       name = name.capitalize.gsub!(/_([a-z])/) { |m| "_#{m[1].upcase}" }
-      @struct_type[name] = true
+
+      @struct_type << name unless @struct_type.include? name
       name
     end
 
     def add_enum(name)
+      # Anonymous enums are given a name
       if name == ''
         @anon_counter += 1
         name = ':anon_type_' + @anon_counter.to_s
         return name
       end
 
-      if name[0] != ':'
-        ":#{name}"
-      else
-        name
-      end
+      # All enums are prefixed with a colon
+      name = ":#{name}" unless name.start_with? ':'
+      name
     end
 
     def make_struct(form)
@@ -126,19 +125,19 @@ module C2FFI4RB
                'FFI::Union'
              end
 
-      s = []
-      s << "class #{name} < #{type}"
+      l = []
+      l << "class #{name} < #{type}"
 
       if form[:fields].length.positive?
-        s << '  layout \\'
+        l << '  layout \\'
         size = form[:fields].length
-        sep = ','
         form[:fields].each_with_index do |f, i|
-          sep = '' if i >= (size - 1)
-          s << "    :#{f[:name]}, #{parse_type(f[:type])}#{sep}"
+          sep = i >= (size - 1) ? '' : ','
+          l << "    :#{f[:name]}, #{parse_type(f[:type])}#{sep}"
         end
       end
-      s << 'end'
+      l << 'end'
+      l.join("\n")
     end
 
     def parse_type(form)
@@ -150,8 +149,8 @@ module C2FFI4RB
         pointee = parse_type(form[:type])
         if [':char', ':uchar'].include?(pointee)
           ':string'
-        elsif @struct_type[pointee]
-          "#{@struct_type[pointee]}.ptr"
+        elsif @struct_type.include?(pointee)
+          "#{pointee}.ptr"
         else
           ':pointer'
         end

data/lib/c2ffi4rb/version.rb

@@ -1,3 +1,3 @@
 module C2FFI4RB
-  VERSION = '0.0.0'
+  VERSION = '0.0.1'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: c2ffi4rb
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - kojix2
 - Ryan Pavlik
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-14 00:00:00.000000000 Z
+date: 2023-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,7 +71,7 @@ homepage: https://github.com/kojix2/c2ffi4rb
 licenses:
 - LGPL-2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.4.14
+signing_key:
 specification_version: 4
 summary: C2FFI for Ruby-FFI
 test_files: []