Clean up OS specific library names.

Author: cfis

lib/ruby-bindgen/generators/ffi/ffi.rb

@@ -214,7 +214,7 @@ def visit_function(cursor)
 
         result = Array.new
         parameter_types = cursor.find_by_kind(false, :cursor_parm_decl).map do |parameter|
-          callback_name = "#{cursor.spelling}_#{parameter.spelling}_callback"
+          callback_name = "#{cursor.spelling.underscore}_#{parameter.spelling.underscore}_callback"
           if parameter.type.is_a?(::FFI::Clang::Types::Pointer) && parameter.type.function?
             parameters = parameter.find_by_kind(false, :cursor_parm_decl)
             result << self.visit_callback(callback_name, parameters, parameter.type.pointee)
@@ -252,7 +252,7 @@ def visit_struct(cursor)
         # Define any embedded callbacks
         cursor.find_by_kind(false, :cursor_field_decl).each do |field|
           if field.type.is_a?(::FFI::Clang::Types::Pointer) && field.type.function?
-            callback_name = "#{cursor.spelling}_#{field.spelling}_callback"
+            callback_name = "#{cursor.spelling.underscore}_#{field.spelling.underscore}_callback"
             parameters = field.find_by_kind(false, :cursor_parm_decl)
             result[nil] << self.visit_callback(callback_name, parameters, field.type.pointee)
           end
@@ -268,7 +268,7 @@ def visit_struct(cursor)
       def visit_field_decl(cursor)
         ffi_type = if cursor.type.is_a?(::FFI::Clang::Types::Pointer)
                       if cursor.type.function?
-                        ":#{cursor.semantic_parent.spelling}_#{cursor.spelling}_callback"
+                        ":#{cursor.semantic_parent.spelling.underscore}_#{cursor.spelling.underscore}_callback"
                       elsif cursor.type.forward_declaration?
                        ":pointer"
                       end
@@ -323,7 +323,7 @@ def visit_union(cursor)
         # Define any embedded callbacks
         cursor.find_by_kind(false, :cursor_field_decl).each do |field|
           if field.type.is_a?(::FFI::Clang::Types::Pointer) && field.type.function?
-            callback_name = "#{cursor.ruby}_#{field.ruby}_callback"
+            callback_name = "#{cursor.spelling.underscore}_#{field.spelling.underscore}_callback"
             result[nil] << self.visit_callback(callback_name, field.parameters, field.type.pointee)
           end
         end

test/bindings/c/clang-c/Index.rb

@@ -1017,8 +1017,8 @@ class CXToken < FFI::Struct
   attach_function :clang_get_cursor_kind_spelling, :clang_getCursorKindSpelling, [CXCursorKind], CXString.by_value
   attach_function :clang_get_definition_spelling_and_extent, :clang_getDefinitionSpellingAndExtent, [CXCursor.by_value, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :void
   attach_function :clang_enable_stack_traces, :clang_enableStackTraces, [], :void
-  callback :clang_executeOnThread_fn_callback, [:pointer], :void
-  attach_function :clang_execute_on_thread, :clang_executeOnThread, [:clang_executeOnThread_fn_callback, :pointer, :uint], :void
+  callback :clang_execute_on_thread_fn_callback, [:pointer], :void
+  attach_function :clang_execute_on_thread, :clang_executeOnThread, [:clang_execute_on_thread_fn_callback, :pointer, :uint], :void
   typedef :pointer, :cx_completion_string
 
   class CXCompletionResult < FFI::Struct
@@ -1153,11 +1153,11 @@ class CXCodeCompleteResults < FFI::Struct
     :CXVisit_Continue, 1
   )
 
-  callback :CXCursorAndRangeVisitor_visit_callback, [:pointer, CXCursor.by_value, CXSourceRange.by_value], CXVisitorResult
+  callback :cx_cursor_and_range_visitor_visit_callback, [:pointer, CXCursor.by_value, CXSourceRange.by_value], CXVisitorResult
 
   class CXCursorAndRangeVisitor < FFI::Struct
     layout :context, :pointer,
-           :visit, :CXCursorAndRangeVisitor_visit_callback
+           :visit, :cx_cursor_and_range_visitor_visit_callback
   end
 
   CXResult = enum(
@@ -1380,24 +1380,24 @@ class CXIdxEntityRefInfo < FFI::Struct
            :role, CXSymbolRole
   end
 
-  callback :IndexerCallbacks_abortQuery_callback, [:pointer, :pointer], :int
-  callback :IndexerCallbacks_diagnostic_callback, [:pointer, :pointer, :pointer], :void
-  callback :IndexerCallbacks_enteredMainFile_callback, [:pointer, :pointer, :pointer], :pointer
-  callback :IndexerCallbacks_ppIncludedFile_callback, [:pointer, :pointer], :pointer
-  callback :IndexerCallbacks_importedASTFile_callback, [:pointer, :pointer], :pointer
-  callback :IndexerCallbacks_startedTranslationUnit_callback, [:pointer, :pointer], :pointer
-  callback :IndexerCallbacks_indexDeclaration_callback, [:pointer, :pointer], :void
-  callback :IndexerCallbacks_indexEntityReference_callback, [:pointer, :pointer], :void
+  callback :indexer_callbacks_abort_query_callback, [:pointer, :pointer], :int
+  callback :indexer_callbacks_diagnostic_callback, [:pointer, :pointer, :pointer], :void
+  callback :indexer_callbacks_entered_main_file_callback, [:pointer, :pointer, :pointer], :pointer
+  callback :indexer_callbacks_pp_included_file_callback, [:pointer, :pointer], :pointer
+  callback :indexer_callbacks_imported_ast_file_callback, [:pointer, :pointer], :pointer
+  callback :indexer_callbacks_started_translation_unit_callback, [:pointer, :pointer], :pointer
+  callback :indexer_callbacks_index_declaration_callback, [:pointer, :pointer], :void
+  callback :indexer_callbacks_index_entity_reference_callback, [:pointer, :pointer], :void
 
   class IndexerCallbacks < FFI::Struct
-    layout :abort_query, :IndexerCallbacks_abortQuery_callback,
-           :diagnostic, :IndexerCallbacks_diagnostic_callback,
-           :entered_main_file, :IndexerCallbacks_enteredMainFile_callback,
-           :pp_included_file, :IndexerCallbacks_ppIncludedFile_callback,
-           :imported_ast_file, :IndexerCallbacks_importedASTFile_callback,
-           :started_translation_unit, :IndexerCallbacks_startedTranslationUnit_callback,
-           :index_declaration, :IndexerCallbacks_indexDeclaration_callback,
-           :index_entity_reference, :IndexerCallbacks_indexEntityReference_callback
+    layout :abort_query, :indexer_callbacks_abort_query_callback,
+           :diagnostic, :indexer_callbacks_diagnostic_callback,
+           :entered_main_file, :indexer_callbacks_entered_main_file_callback,
+           :pp_included_file, :indexer_callbacks_pp_included_file_callback,
+           :imported_ast_file, :indexer_callbacks_imported_ast_file_callback,
+           :started_translation_unit, :indexer_callbacks_started_translation_unit_callback,
+           :index_declaration, :indexer_callbacks_index_declaration_callback,
+           :index_entity_reference, :indexer_callbacks_index_entity_reference_callback
   end
 
   attach_function :clang_index_is_entity_obj_c_container_kind, :clang_index_isEntityObjCContainerKind, [CXIdxEntityKind], :int

test/bindings/c/clang_ffi.rb

@@ -18,11 +18,12 @@ def self.search_names
       result << "lib#{name}"
       self.library_versions.each do |version|
         case RbConfig::CONFIG['host_os']
-          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-            result << "lib#{name}-#{version}"
-            result << "lib#{name}_#{version}"
           when /darwin|mac os/
             result << "lib#{name}.#{version}"
+          when /mingw/
+            result << "lib#{name}-#{version}"
+          when /mswin/
+            result << "#{name}_#{version}"
           else
             result << "lib#{name}.so.#{version}"
         end

test/bindings/c/constants_ffi.rb

@@ -18,11 +18,12 @@ def self.search_names
       result << "lib#{name}"
       self.library_versions.each do |version|
         case RbConfig::CONFIG['host_os']
-          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-            result << "lib#{name}-#{version}"
-            result << "lib#{name}_#{version}"
           when /darwin|mac os/
             result << "lib#{name}.#{version}"
+          when /mingw/
+            result << "lib#{name}-#{version}"
+          when /mswin/
+            result << "#{name}_#{version}"
           else
             result << "lib#{name}.so.#{version}"
         end

test/bindings/c/filtering_ffi.rb

@@ -18,11 +18,12 @@ def self.search_names
       result << "lib#{name}"
       self.library_versions.each do |version|
         case RbConfig::CONFIG['host_os']
-          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-            result << "lib#{name}-#{version}"
-            result << "lib#{name}_#{version}"
           when /darwin|mac os/
             result << "lib#{name}.#{version}"
+          when /mingw/
+            result << "lib#{name}-#{version}"
+          when /mswin/
+            result << "#{name}_#{version}"
           else
             result << "lib#{name}.so.#{version}"
         end

test/bindings/c/forward_ffi.rb

@@ -18,11 +18,12 @@ def self.search_names
       result << "lib#{name}"
       self.library_versions.each do |version|
         case RbConfig::CONFIG['host_os']
-          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-            result << "lib#{name}-#{version}"
-            result << "lib#{name}_#{version}"
           when /darwin|mac os/
             result << "lib#{name}.#{version}"
+          when /mingw/
+            result << "lib#{name}-#{version}"
+          when /mswin/
+            result << "#{name}_#{version}"
           else
             result << "lib#{name}.so.#{version}"
         end

test/bindings/c/proj_ffi.rb

@@ -19,11 +19,12 @@ def self.search_names
         result << "lib#{name}"
         self.library_versions.each do |version|
           case RbConfig::CONFIG['host_os']
-            when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-              result << "lib#{name}-#{version}"
-              result << "lib#{name}_#{version}"
             when /darwin|mac os/
               result << "lib#{name}.#{version}"
+            when /mingw/
+              result << "lib#{name}-#{version}"
+            when /mswin/
+              result << "#{name}_#{version}"
             else
               result << "lib#{name}.so.#{version}"
           end

test/bindings/c/rename_ffi.rb

@@ -18,11 +18,12 @@ def self.search_names
       result << "lib#{name}"
       self.library_versions.each do |version|
         case RbConfig::CONFIG['host_os']
-          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-            result << "lib#{name}-#{version}"
-            result << "lib#{name}_#{version}"
           when /darwin|mac os/
             result << "lib#{name}.#{version}"
+          when /mingw/
+            result << "lib#{name}-#{version}"
+          when /mswin/
+            result << "#{name}_#{version}"
           else
             result << "lib#{name}.so.#{version}"
         end

test/bindings/c/sqlite3_ffi.rb

@@ -18,11 +18,12 @@ def self.search_names
       result << "lib#{name}"
       self.library_versions.each do |version|
         case RbConfig::CONFIG['host_os']
-          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-            result << "lib#{name}-#{version}"
-            result << "lib#{name}_#{version}"
           when /darwin|mac os/
             result << "lib#{name}.#{version}"
+          when /mingw/
+            result << "lib#{name}-#{version}"
+          when /mswin/
+            result << "#{name}_#{version}"
           else
             result << "lib#{name}.so.#{version}"
         end

test/bindings/c/structs_ffi.rb

@@ -18,11 +18,12 @@ def self.search_names
       result << "lib#{name}"
       self.library_versions.each do |version|
         case RbConfig::CONFIG['host_os']
-          when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
-            result << "lib#{name}-#{version}"
-            result << "lib#{name}_#{version}"
           when /darwin|mac os/
             result << "lib#{name}.#{version}"
+          when /mingw/
+            result << "lib#{name}-#{version}"
+          when /mswin/
+            result << "#{name}_#{version}"
           else
             result << "lib#{name}.so.#{version}"
         end