ffi-clang 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDE1NGQxNDVlMTM4Mjk5YTMyOGM5MmI2MjY1YWI4ODQ0NTc1YjZmYw==
-  data.tar.gz: !binary |-
-    NjYwNTIxYTcwYjc0M2I1NjE5NTU3YWRkYTAwMmQxMTg5N2NiZmE0Nw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MGVjMjcwMTg2NDU5MGRmYjgxMzNiYzU5MjY5NzY4OTI1ZDBkZTU0ZDBlNmEx
-    N2RjYzg5NjdjM2E1YWRhNTdiMzk1ZTAzNTAzOTU4MTc3YmRhYmM3YzUwMWFm
-    ZTA2OWQ4ODU3Y2JlMzdmNzQ1ZmM4NWRiNmIwNzIwNDE5Y2NkYjU=
-  data.tar.gz: !binary |-
-    MzlhMDM1OGViZmZmOGRkNTMzODA5ZjM2OTdlZDBlMmMyNjQyOTg2NGE0MWRj
-    MjY1ZDQyMTBjMzM0YjA3OTg3Yjg5OTdmNzdiODg5YmFkMDExOWY0MGU1M2Vh
-    NGRiNGFhY2QwNTE3NDlmZjM1MDQ4MGU3NWM0MWQ4YzliNWIzMDc=
+SHA1:
+  metadata.gz: 9dcbefd7f0ba372cb4d7b1f7cdc0486840d8dd22
+  data.tar.gz: b00aec280bd1ae965af5dbe99336bc65a94499f6
+SHA512:
+  metadata.gz: c668b1273d5650d12de4a757629a2b02cf398288dc148b5e10a8fef34020d1ff354357c60381baa8597538b871e360d0e188cb6ec7a51420f2d202a5c4c726f3
+  data.tar.gz: b2fadb72c282ee775c8aedc146870d95e12872ee14b1ae182731116b05a2353ce9855554f305004ef0cac5310d252085c10e7a7466daa1ef38a8bc407557331a

data/.travis.yml

@@ -2,8 +2,7 @@ language: ruby
 rvm:
   - "2.0"
 install:
-# libclang-3.2-dev
     - sudo add-apt-repository --yes ppa:h-rayflood/llvm
     - sudo apt-get -qq update
-    - sudo apt-get -qq install libclang-3.2-dev
+    - sudo apt-get -qq install libclang-3.3-dev
     - bundle install

data/lib/ffi/clang/cursor.rb

@@ -22,6 +22,7 @@
 require 'ffi/clang/lib/cursor'
 require 'ffi/clang/source_location'
 require 'ffi/clang/comment'
+require 'ffi/clang/type'
 
 module FFI
 	module Clang
@@ -90,7 +91,7 @@ module FFI
 				SourceRange.new(Lib.get_cursor_extent(@cursor))
 			end
 
-			def displayName
+			def display_name
 				Lib.extract_string Lib.get_cursor_display_name(@cursor)
 			end
 
@@ -102,6 +103,14 @@ module FFI
 				@cursor[:kind]
 			end
 
+			def type
+				Type.new Lib.get_cursor_type(@cursor)
+			end
+
+			def result_type
+				Type.new Lib.get_cursor_result_type(@cursor)
+			end
+
 			def visit_children(&block)
 				adapter = Proc.new do | cxcursor, parent_cursor, unused |
 					block.call Cursor.new(cxcursor), Cursor.new(parent_cursor)

data/lib/ffi/clang/lib.rb

@@ -28,8 +28,8 @@ module FFI
 
 			if Clang.platform == :linux
 				libs += [
-					"/usr/lib/llvm-3.2/lib/libclang.so",
-					"/usr/lib64/llvm-3.2/lib/libclang.so"
+					"/usr/lib/llvm-3.3/lib/libclang.so",
+					"/usr/lib64/llvm-3.3/lib/libclang.so"
 				]
 			end
 

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

@@ -23,6 +23,7 @@
 require 'ffi/clang/lib/translation_unit'
 require 'ffi/clang/lib/diagnostic'
 require 'ffi/clang/lib/comment'
+require 'ffi/clang/lib/type'
 
 module FFI
 	module Clang
@@ -34,7 +35,8 @@ module FFI
 				:cursor_parm_decl, 10,
 				:cursor_typedef_decl, 20,
 				:cursor_invalid_file, 70,
-				:cursor_translation_unit, 300]
+				:cursor_translation_unit, 300
+			]
 
 			class CXCursor < FFI::Struct
 				layout(
@@ -74,6 +76,10 @@ module FFI
 
 			callback :visit_children_function, [CXCursor.by_value, CXCursor.by_value, :pointer], :child_visit_result
 			attach_function :visit_children, :clang_visitChildren, [CXCursor.by_value, :visit_children_function, :pointer], :uint
+
+			attach_function :get_cursor_type, :clang_getCursorType, [CXCursor.by_value], CXType.by_value
+			attach_function :get_cursor_result_type, :clang_getCursorResultType, [CXCursor.by_value], CXType.by_value
+
 		end
 	end
 end

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

@@ -0,0 +1,28 @@
+module FFI
+	module Clang
+		module Lib
+			enum :kind, [
+				:type_invalid, 0,
+				:type_unexposed, 1,
+				:type_void, 2,
+				:type_pointer, 101,
+				:type_function_proto, 111
+			]
+
+			class CXType < FFI::Struct
+				layout(
+					:kind, :kind,
+					:data, [:pointer, 2]
+				)
+			end
+
+			attach_function :get_type_spelling, :clang_getTypeSpelling, [CXType.by_value], CXString.by_value
+			attach_function :is_function_type_variadic, :clang_isFunctionTypeVariadic, [CXType.by_value], :uint
+			attach_function :is_pod_type, :clang_isPODType, [CXType.by_value], :uint
+			attach_function :get_num_arg_types, :clang_getNumArgTypes, [CXType.by_value], :int
+			attach_function :get_arg_type, :clang_getArgType, [CXType.by_value, :uint], CXType.by_value
+			attach_function :get_result_type, :clang_getResultType, [CXType.by_value], CXType.by_value
+
+		end
+	end
+end

data/lib/ffi/clang/type.rb

@@ -0,0 +1,37 @@
+module FFI
+	module Clang
+		class Type
+			def initialize(type)
+				@type = type
+			end
+
+			def kind
+				@type[:kind]
+			end
+
+			def spelling
+				Lib.extract_string Lib.get_type_spelling(@type)
+			end
+
+			def variadic?
+				Lib.is_function_type_variadic(@type) != 0
+			end
+
+			def pod?
+				Lib.is_pod_type(@type) != 0
+			end
+
+			def num_arg_types
+				Lib.get_num_arg_types(@type)
+			end
+
+			def arg_type(i)
+				Type.new Lib.get_arg_type(@type, i)
+			end
+
+			def result_type
+				Type.new Lib.get_result_type(@type)
+			end
+		end
+	end
+end

data/lib/ffi/clang/version.rb

@@ -21,6 +21,6 @@
 
 module FFI
 	module Clang
-		VERSION = "0.1.2"
+		VERSION = "0.1.3"
 	end
 end

data/spec/clang/cursor_spec.rb

@@ -49,7 +49,7 @@ describe Cursor do
 	end
 
 	it "returns the path of the translation unit for the translation unit cursor" do
-		cursor.displayName.should eq(fixture_path("list.c"))
+		cursor.display_name.should eq(fixture_path("list.c"))
 		cursor.spelling.should eq(fixture_path("list.c"))
 	end
 
@@ -105,7 +105,7 @@ describe Cursor do
 
 		it "returns the name of the function" do
 			func.spelling.should eq("sum")
-			func.displayName.should eq("sum(union List *)")
+			func.display_name.should eq("sum(union List *)")
 		end
 	end
 
@@ -124,7 +124,7 @@ describe Cursor do
 
 		it "returns the name of the struct" do
 			struct.spelling.should eq("List")
-			struct.displayName.should eq("List")
+			struct.display_name.should eq("List")
 		end
 
 	end

data/spec/clang/type_spec.rb

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Copyright, 2013, by Carlos Martín Nieto <cmn@dwim.me>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'spec_helper'
+
+describe Type do
+	let(:cursor) { Index.new.parse_translation_unit(fixture_path("a.c")).cursor }
+	let(:type) { find_first(cursor, :cursor_function).type }
+
+	it "can tell us about the main function" do
+		type.variadic?.should equal(false)
+
+		type.num_arg_types.should equal(2)
+		type.arg_type(0).spelling.should eq("int")
+		type.arg_type(1).spelling.should eq("const char *")
+		type.result_type.spelling.should eq("int")
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-clang
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jari Bakken
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -43,28 +43,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby FFI bindings for libclang C interface.
@@ -97,9 +97,11 @@ files:
 - lib/ffi/clang/lib/source_range.rb
 - lib/ffi/clang/lib/string.rb
 - lib/ffi/clang/lib/translation_unit.rb
+- lib/ffi/clang/lib/type.rb
 - lib/ffi/clang/source_location.rb
 - lib/ffi/clang/source_range.rb
 - lib/ffi/clang/translation_unit.rb
+- lib/ffi/clang/type.rb
 - lib/ffi/clang/unsaved_file.rb
 - lib/ffi/clang/version.rb
 - spec/clang/comment_spec.rb
@@ -108,6 +110,7 @@ files:
 - spec/clang/index_spec.rb
 - spec/clang/source_location_spec.rb
 - spec/clang/translation_unit_spec.rb
+- spec/clang/type_spec.rb
 - spec/fixtures/a.c
 - spec/fixtures/docs.h
 - spec/fixtures/list.c
@@ -122,17 +125,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby FFI bindings for libclang C interface.
@@ -143,6 +146,7 @@ test_files:
 - spec/clang/index_spec.rb
 - spec/clang/source_location_spec.rb
 - spec/clang/translation_unit_spec.rb
+- spec/clang/type_spec.rb
 - spec/fixtures/a.c
 - spec/fixtures/docs.h
 - spec/fixtures/list.c