ffi-clang 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba2f1301bc825e8bb4bfe80ebe60ed2e2b20945a
-  data.tar.gz: 4d33834e8851dfcf646cb934dfd5a0921f5d81e8
+  metadata.gz: d482ffe964ca4f9817152f6fd3da834657851673
+  data.tar.gz: 405d56c4688d22790a36b7406ff8e0cffc924d1e
 SHA512:
-  metadata.gz: 93f851368ed6a50978407ab7227511d7a20fd12716cb6413615ab00b015867b384c8c3b8eb7e1921a3ddb2b95321202282dafc8a854459342f9243c4e66774ef
-  data.tar.gz: 365b47a6501012f6498fdbc3c9754ca4b9a2226edd5853f4084b93ac552c97a82a9c440d0fce1eb6e6f00bdd9115d144b265a78973971feb8e6cb49f85ac3d41
+  metadata.gz: f64cf1ee129eddde74597bd12a69dfa93c0eacfd5fd1cea9795dc51fa0915738bca97d4f88e4375fff714bc26c1ed23a434a52ea645c44667e9b3956a86f7d7b
+  data.tar.gz: 8895a0b39bc1ba92c4e5a799b736ee574254c925eabbaf89d30079664a75df6dd1546a23f5e5b3f545cb6929e0239ed1b0d7b9661ece208570e1512b8d3ebdb4

data/.travis.yml

@@ -1,22 +1,19 @@
 language: ruby
-rvm:
-  - "2.0"
-  - "2.1"
-env:
-  - LLVM_VERSION=3.2
-  - LLVM_VERSION=3.3
-  - LLVM_VERSION=3.4
-  - LLVM_VERSION=3.5
-install:
-  - sudo add-apt-repository --yes ppa:h-rayflood/llvm
-  - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
-  - sudo add-apt-repository --yes 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main'
-  - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
-  - sudo apt-get -qq update
-  - sudo apt-get -qq install libclang-${LLVM_VERSION}-dev clang-${LLVM_VERSION}
+sudo: false
+before_install:
   - export LD_LIBRARY_PATH=/usr/lib/llvm-${LLVM_VERSION}/lib/
   - export PATH=/usr/lib/llvm-${LLVM_VERSION}/bin:$PATH
-  - bundle install
 matrix:
-  allow_failures:
-    - env: LLVM_VERSION=3.5
+  include:
+    # The default build:
+    - &libclang-36
+      addons: {apt: {sources: [ubuntu-toolchain-r-test, llvm-toolchain-precise-3.6], packages: [libclang-3.6-dev, clang-3.6]}}
+      env: LLVM_VERSION=3.6
+      rvm: "2.3.0"
+    # A second build with the same configuration but using ruby 2.2.4
+    - <<: *libclang-36
+      rvm: "2.2.4"
+    # Other builds on other versions of LLVM, all using ruby 2.3.0
+    - addons: {apt: {sources: [ubuntu-toolchain-r-test, llvm-toolchain-precise-3.7], packages: [libclang-3.7-dev, clang-3.7]}}
+      env: LLVM_VERSION=3.7
+      rvm: "2.3.0"

data/README.md

@@ -1,9 +1,9 @@
 # FFI::Clang
 
-A light weight wrapper for Ruby exposing [libclang][1].
+A light-weight wrapper for Ruby exposing [libclang][1].
 
-[![Build Status](https://secure.travis-ci.org/ioquatix/ffi-clang.png)](http://travis-ci.org/ioquatix/ffi-clang)
-[![Code Climate](https://codeclimate.com/github/ioquatix/ffi-clang.png)](https://codeclimate.com/github/ioquatix/ffi-clang)
+[![Build Status](https://secure.travis-ci.org/ioquatix/ffi-clang.svg)](http://travis-ci.org/ioquatix/ffi-clang)
+[![Code Climate](https://codeclimate.com/github/ioquatix/ffi-clang.svg)](https://codeclimate.com/github/ioquatix/ffi-clang)
 
 [1]: http://llvm.org/devmtg/2010-11/Gregor-libclang.pdf
 

data/lib/ffi/clang/cursor.rb

@@ -158,6 +158,10 @@ module FFI
 				Type.new Lib.get_enum_decl_integer_type(@cursor), @translation_unit
 			end
 
+			def typedef_type
+				Type.new Lib.get_typedef_decl_unerlying_type(@cursor), @translation_unit
+			end
+
 			def virtual_base?
 				Lib.is_virtual_base(@cursor) != 0
 			end
@@ -194,6 +198,10 @@ module FFI
 				Lib.get_enum_unsigned_value @cursor
 			end
 
+			def enum_type
+				Type.new Lib.get_enum_type(@cursor), @translation_unit
+			end
+
 			def specialized_template
 				Cursor.new Lib.get_specialized_cursor_template(@cursor), @translation_unit
 			end
@@ -234,6 +242,14 @@ module FFI
 				@translation_unit
 			end
 
+			def num_args
+				Lib.get_num_args @cursor
+			end
+
+			def variadic?
+				Lib.is_variadic(@cursor) != 0
+			end
+
 			def visit_children(&block)
 				adapter = Proc.new do |cxcursor, parent_cursor, unused|
 					block.call Cursor.new(cxcursor, @translation_unit), Cursor.new(parent_cursor, @translation_unit)

data/lib/ffi/clang/lib.rb

@@ -19,17 +19,35 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'mkmf'
+
 module FFI
 	module Clang
 		module Lib
 			extend FFI::Library
+			
+			# Use LLVM_CONFIG if it was explicitly specified:
+			llvm_config = ENV['LLVM_CONFIG']
+			
+			# If we aren't building for a specific version (e.g. travis) try to find llvm-config
+			unless ENV['LLVM_VERSION'] 
+				 llvm_config ||= MakeMakefile.find_executable0("llvm-config")
+			end
+
+			libs = []
+			begin
+				xcode_dir = `xcode-select -p`.chomp
+				libs << "#{xcode_dir}/Toolchains/XcodeDefault.xctoolchain/usr/lib/libclang.dylib"
+			rescue Errno::ENOENT => e
+				# Ignore
+			end
 
-			libs = ["clang"]
+			libs << "clang"
 
 			if ENV['LIBCLANG']
 				libs << ENV['LIBCLANG']
-			elsif ENV['LLVM_CONFIG']
-				llvm_library_dir = `#{ENV['LLVM_CONFIG']} --libdir`.chomp
+			elsif llvm_config
+				llvm_library_dir = `#{llvm_config} --libdir`.chomp
 
 				if FFI::Clang.platform == :darwin
 					libs << llvm_library_dir + '/libclang.dylib'

data/lib/ffi/clang/lib/cursor.rb

@@ -348,6 +348,15 @@ module FFI
 
 			attach_function :get_overridden_cursors, :clang_getOverriddenCursors, [CXCursor.by_value, :pointer, :pointer], :void
 			attach_function :dispose_overridden_cursors, :clang_disposeOverriddenCursors, [:pointer], :void
+
+			attach_function :get_typedef_decl_unerlying_type, :clang_getTypedefDeclUnderlyingType, [CXCursor.by_value], CXType.by_value
+			attach_function :get_type_declaration, :clang_getTypeDeclaration, [CXType.by_value], CXCursor.by_value
+
+			attach_function :get_enum_type, :clang_getEnumDeclIntegerType, [CXCursor.by_value], CXType.by_value
+
+			attach_function :get_num_args, :clang_Cursor_getNumArguments, [CXCursor.by_value], :int
+
+			attach_function :is_variadic, :clang_Cursor_isVariadic, [CXCursor.by_value], :uint
 		end
 	end
 end

data/lib/ffi/clang/lib/type.rb

@@ -149,6 +149,9 @@ module FFI
 			attach_function :get_fuction_type_calling_conv, :clang_getFunctionTypeCallingConv, [CXType.by_value], :calling_conv
 
 			attach_function :equal_types, :clang_equalTypes, [CXType.by_value, CXType.by_value], :uint
+
+			attach_function :get_array_element_type, :clang_getArrayElementType, [CXType.by_value], CXType.by_value
+			attach_function :get_array_size, :clang_getArraySize, [CXType.by_value], :int
 		end
 	end
 end

data/lib/ffi/clang/type.rb

@@ -130,6 +130,18 @@ module FFI
 			def ==(other)
 				Lib.equal_types(@type, other.type) != 0
 			end
+
+			def declaration
+				Cursor.new Lib.get_type_declaration(@type), @translation_unit
+			end
+
+			def element_type
+				Type.new Lib.get_array_element_type(@type), @translation_unit
+			end
+
+			def array_size
+				Lib.get_array_size(@type)
+			end
 		end
 	end
 end

data/lib/ffi/clang/utils.rb

@@ -35,10 +35,14 @@ module FFI
 				unless @@clang_version
 					# Version string vary wildy:
 					# Ubuntu: "Ubuntu clang version 3.0-6ubuntu3 (tags/RELEASE_30/final) (based on LLVM 3.0)"
-					# Mac OS X: "Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)"
+					# Mac OS X: "Apple LLVM version 7.0.0 (clang-700.0.72)"
 					# Linux: "clang version 3.3"
-				
-					if parts = clang_version_string.match(/(?:clang version|based on LLVM) (\d+)\.(\d+)(svn)?/)
+					if parts = clang_version_string.match(/^Apple LLVM version (\d+)\.(\d+).\d \(clang-.*\)$/)
+						@@clang_version = [3, 7] # Fake it.
+
+						puts "Using libclang: #{Lib::ffi_libraries[0].name}"
+						puts "Clang version detected: #{@@clang_version.inspect}"
+					elsif parts = clang_version_string.match(/(?:clang version|based on LLVM) (\d+)\.(\d+)(svn)?/)
 						major = parts[1].to_i
 						minor = parts[2].to_i
 						rc = parts[3]
@@ -50,6 +54,7 @@ module FFI
 					
 						@@clang_version = [major, minor]
 						
+						puts "Using libclang: #{Lib::ffi_libraries[0].name}"
 						puts "Clang version detected: #{@@clang_version.inspect}"
 					else
 						abort "Invalid/unsupported clang version string."

data/lib/ffi/clang/version.rb

@@ -21,6 +21,6 @@
 
 module FFI
 	module Clang
-		VERSION = "0.2.1"
+		VERSION = "0.3.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-clang
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Jari Bakken
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby FFI bindings for libclang C interface.