ffi-clang 0.3.0 → 0.5.0

data/lib/ffi/clang/lib.rb

@@ -38,7 +38,7 @@ module FFI
 			begin
 				xcode_dir = `xcode-select -p`.chomp
 				libs << "#{xcode_dir}/Toolchains/XcodeDefault.xctoolchain/usr/lib/libclang.dylib"
-			rescue Errno::ENOENT => e
+			rescue Errno::ENOENT
 				# Ignore
 			end
 

data/lib/ffi/clang/lib/{utils.rb → clang_version.rb}

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/string'
+require_relative 'string'
 
 module FFI
 	module Clang

data/lib/ffi/clang/lib/code_completion.rb

@@ -18,9 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/translation_unit'
-require 'ffi/clang/lib/cursor'
-require 'ffi/clang/lib/diagnostic'
+require_relative 'cursor'
+require_relative 'diagnostic'
 
 module FFI
 	module Clang

data/lib/ffi/clang/lib/comment.rb

@@ -19,8 +19,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/index'
-
 module FFI
 	module Clang
 		module Lib

data/lib/ffi/clang/lib/compilation_database.rb

@@ -34,9 +34,7 @@ module FFI
 			attach_function :compilation_database_from_directory, :clang_CompilationDatabase_fromDirectory, [:string, :pointer], :CXCompilationDatabase
 			attach_function :compilation_database_dispose, :clang_CompilationDatabase_dispose, [:CXCompilationDatabase], :uint
 			attach_function :compilation_database_get_compile_commands, :clang_CompilationDatabase_getCompileCommands, [:CXCompilationDatabase, :string], :CXCompileCommands
-			if FFI::Clang::Utils.satisfy_version?('3.3')
-				attach_function :compilation_database_get_all_compile_commands, :clang_CompilationDatabase_getAllCompileCommands, [:CXCompilationDatabase], :CXCompileCommands
-			end
+			attach_function :compilation_database_get_all_compile_commands, :clang_CompilationDatabase_getAllCompileCommands, [:CXCompilationDatabase], :CXCompileCommands
 
 			# CompilationDatabase::CompileCommands
 			attach_function :compile_commands_dispose, :clang_CompileCommands_dispose, [:CXCompileCommands], :void
@@ -47,12 +45,11 @@ module FFI
 			attach_function :compile_command_get_directory, :clang_CompileCommand_getDirectory, [:CXCompileCommand], CXString.by_value
 			attach_function :compile_command_get_num_args, :clang_CompileCommand_getNumArgs, [:CXCompileCommand], :uint
 			attach_function :compile_command_get_arg, :clang_CompileCommand_getArg, [:CXCompileCommand, :uint], CXString.by_value
-			if FFI::Clang::Utils.satisfy_version?('3.4')
-				# Thease functions are not exposed by libclang.so privided by packages.
-				# attach_function :compile_command_get_num_mapped_sources, :clang_CompileCommand_getNumMappedSources, [:CXCompileCommand], :uint
-				# attach_function :compile_command_get_mapped_source_path, :clang_CompileCommand_getMappedSourcePath, [:CXCompileCommand, :uint], CXString.by_value
-				# attach_function :compile_command_get_mapped_source_content, :clang_CompileCommand_getMappedSourceContent, [:CXCompileCommand, :uint], CXString.by_value
-			end
+			
+			# Thease functions are not exposed by libclang.so privided by packages.
+			# attach_function :compile_command_get_num_mapped_sources, :clang_CompileCommand_getNumMappedSources, [:CXCompileCommand], :uint
+			# attach_function :compile_command_get_mapped_source_path, :clang_CompileCommand_getMappedSourcePath, [:CXCompileCommand, :uint], CXString.by_value
+			# attach_function :compile_command_get_mapped_source_content, :clang_CompileCommand_getMappedSourceContent, [:CXCompileCommand, :uint], CXString.by_value
 		end
 	end
 end

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

@@ -21,11 +21,10 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/translation_unit'
-require 'ffi/clang/lib/diagnostic'
-require 'ffi/clang/lib/comment'
-require 'ffi/clang/lib/type'
-require 'ffi/clang/utils'
+require_relative 'translation_unit'
+require_relative 'diagnostic'
+require_relative 'comment'
+require_relative 'type'
 
 module FFI
 	module Clang
@@ -259,16 +258,14 @@ module FFI
 
 			attach_function :is_virtual_base, :clang_isVirtualBase, [CXCursor.by_value], :uint
 			attach_function :is_dynamic_call, :clang_Cursor_isDynamicCall, [CXCursor.by_value], :uint
-			if FFI::Clang::Utils.satisfy_version?('3.3')
-				attach_function :is_variadic, :clang_Cursor_isVariadic, [CXCursor.by_value], :uint
-			end
+			attach_function :is_variadic, :clang_Cursor_isVariadic, [CXCursor.by_value], :uint
+
 			attach_function :is_definition, :clang_isCursorDefinition, [CXCursor.by_value], :uint
 			attach_function :cxx_method_is_static, :clang_CXXMethod_isStatic, [CXCursor.by_value], :uint
 			attach_function :cxx_method_is_virtual, :clang_CXXMethod_isVirtual, [CXCursor.by_value], :uint
 
-			if FFI::Clang::Utils.satisfy_version?('3.4')
-				attach_function :cxx_method_is_pure_virtual, :clang_CXXMethod_isPureVirtual, [CXCursor.by_value], :uint
-			end
+			attach_function :cxx_method_is_pure_virtual, :clang_CXXMethod_isPureVirtual, [CXCursor.by_value], :uint
+			
 			attach_function :cxx_get_access_specifier, :clang_getCXXAccessSpecifier, [CXCursor.by_value], :access_specifier
 			
 			enum :language_kind, [:invalid, :c, :obj_c, :c_plus_plus]
@@ -330,10 +327,8 @@ module FFI
 			attach_function :get_included_file, :clang_getIncludedFile, [CXCursor.by_value], :CXFile
 			attach_function :get_cursor_hash, :clang_hashCursor, [CXCursor.by_value], :uint
 
-			if FFI::Clang::Utils.satisfy_version?('3.3')
-				attach_function :is_bit_field,:clang_Cursor_isBitField, [CXCursor.by_value], :uint
-				attach_function :get_field_decl_bit_width, :clang_getFieldDeclBitWidth, [CXCursor.by_value], :int
-			end
+			attach_function :is_bit_field,:clang_Cursor_isBitField, [CXCursor.by_value], :uint
+			attach_function :get_field_decl_bit_width, :clang_getFieldDeclBitWidth, [CXCursor.by_value], :int
 
 			attach_function :get_overloaded_decl, :clang_getOverloadedDecl, [CXCursor.by_value, :uint], CXCursor.by_value
 			attach_function :get_num_overloaded_decls, :clang_getNumOverloadedDecls, [CXCursor.by_value], :uint
@@ -350,13 +345,10 @@ module FFI
 			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/diagnostic.rb

@@ -19,9 +19,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/translation_unit'
-require 'ffi/clang/lib/source_location'
-require 'ffi/clang/lib/string'
+require_relative 'translation_unit'
+require_relative 'source_location'
+require_relative 'string'
 
 module FFI
 	module Clang
@@ -54,7 +54,7 @@ module FFI
 			attach_function :dispose_diagnostic, :clang_disposeDiagnostic, [:CXDiagnostic], :void
 
 			# DiagnosticSet (not used yet)
-			# attach_function :get_diagnostic_set_from_tu, :clang_getDiagnosticSetFromTU, [:CXTranslationUnit], :CXDiagnosticSet
+			# attach_function :get_diagnostic_set_from_translation_unit, :clang_getDiagnosticSetFromTU, [:CXTranslationUnit], :CXDiagnosticSet
 			# attach_function :dispose_diagnostic_set, :clang_disposeDiagnosticSet, [:CXDiagnosticSet], :void
 			# attach_function :load_diagnostics, :clang_loadDiagnostics, [:string, :pointer, :pointer], :CXDiagnosticSet
 

data/lib/ffi/clang/lib/file.rb

@@ -20,9 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/string'
-require 'ffi/clang/lib/translation_unit'
-require 'ffi/clang/utils'
+require_relative 'string'
+require_relative 'translation_unit'
 
 module FFI
 	module Clang
@@ -49,9 +48,8 @@ module FFI
 			attach_function :get_file_name, :clang_getFileName, [:CXFile], CXString.by_value
 			attach_function :get_file_time, :clang_getFileTime, [:CXFile], :time_t
 			attach_function :is_file_multiple_include_guarded, :clang_isFileMultipleIncludeGuarded, [:CXTranslationUnit, :CXFile], :int
-			if FFI::Clang::Utils.satisfy_version?('3.3')
-				attach_function :get_file_unique_id, :clang_getFileUniqueID, [:CXFile, :pointer], :int
-			end
+			
+			attach_function :get_file_unique_id, :clang_getFileUniqueID, [:CXFile, :pointer], :int
 		end
 	end
 end

data/lib/ffi/clang/lib/inclusions.rb

@@ -18,8 +18,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/file'
-require 'ffi/clang/lib/source_location'
+require_relative 'file'
+require_relative 'source_location'
 
 module FFI
 	module Clang

data/lib/ffi/clang/lib/index.rb

@@ -19,8 +19,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib'
-
 module FFI
 	module Clang
 		module Lib

data/lib/ffi/clang/lib/source_location.rb

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/file'
+require_relative 'file'
 
 module FFI
 	module Clang
@@ -39,15 +39,13 @@ module FFI
 			attach_function :get_location_offset, :clang_getLocationForOffset, [:CXTranslationUnit, :CXFile, :uint], CXSourceLocation.by_value
 			attach_function :get_expansion_location, :clang_getExpansionLocation, [CXSourceLocation.by_value, :pointer, :pointer, :pointer, :pointer], :void
 			attach_function :get_presumed_location, :clang_getPresumedLocation, [CXSourceLocation.by_value, :pointer, :pointer, :pointer], :void
-			if FFI::Clang::Utils.satisfy_version?('3.3')
-				attach_function :get_file_location, :clang_getFileLocation, [CXSourceLocation.by_value, :pointer, :pointer, :pointer, :pointer], :void
-			end
+
+			attach_function :get_file_location, :clang_getFileLocation, [CXSourceLocation.by_value, :pointer, :pointer, :pointer, :pointer], :void
+
 			attach_function :get_spelling_location, :clang_getSpellingLocation, [CXSourceLocation.by_value, :pointer, :pointer, :pointer, :pointer], :void
 
-			if FFI::Clang::Utils.satisfy_version?('3.4')
-				attach_function :location_in_system_header, :clang_Location_isInSystemHeader, [CXSourceLocation.by_value], :int
-				attach_function :location_is_from_main_file, :clang_Location_isFromMainFile, [CXSourceLocation.by_value], :int
-			end
+			attach_function :location_in_system_header, :clang_Location_isInSystemHeader, [CXSourceLocation.by_value], :int
+			attach_function :location_is_from_main_file, :clang_Location_isFromMainFile, [CXSourceLocation.by_value], :int
 		end
 	end
 end

data/lib/ffi/clang/lib/source_range.rb

@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/source_location'
+require_relative 'source_location'
 
 module FFI
 	module Clang

data/lib/ffi/clang/lib/string.rb

@@ -19,8 +19,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib'
-
 module FFI
 	module Clang
 		module Lib

data/lib/ffi/clang/lib/translation_unit.rb

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/index'
+require_relative 'index'
 
 module FFI
 	module Clang
@@ -47,7 +47,7 @@ module FFI
 				:none, 0,
 				:unknown, 1,
 				:translation_errors, 2,
-				:invalid_tu, 3
+				:invalid_translation_unit, 3
 			]
 
 			ReparseFlags = enum [

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

@@ -112,9 +112,7 @@ module FFI
 			end
 
 			attach_function :get_type_kind_spelling, :clang_getTypeKindSpelling, [:kind], CXString.by_value
-			if FFI::Clang::Utils.satisfy_version?('3.3')
-				attach_function :get_type_spelling, :clang_getTypeSpelling, [CXType.by_value], CXString.by_value
-			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
@@ -122,9 +120,8 @@ module FFI
 			attach_function :get_pointee_type, :clang_getPointeeType, [CXType.by_value], CXType.by_value
 			attach_function :get_result_type, :clang_getResultType, [CXType.by_value], CXType.by_value
 			attach_function :get_canonical_type, :clang_getCanonicalType, [CXType.by_value], CXType.by_value
-			if FFI::Clang::Utils.satisfy_version?('3.4')
-				attach_function :type_get_class_type, :clang_Type_getClassType, [CXType.by_value], CXType.by_value
-			end
+			
+			attach_function :type_get_class_type, :clang_Type_getClassType, [CXType.by_value], CXType.by_value
 
 			attach_function :is_const_qualified_type, :clang_isConstQualifiedType, [CXType.by_value], :uint
 			attach_function :is_volatile_qualified_type, :clang_isVolatileQualifiedType, [CXType.by_value], :uint
@@ -137,21 +134,15 @@ module FFI
 			attach_function :get_array_size, :clang_getArraySize, [CXType.by_value], :long_long
 			attach_function :get_array_element_type ,:clang_getArrayElementType, [CXType.by_value], CXType.by_value
 
-			if FFI::Clang::Utils.satisfy_version?('3.3')
-				attach_function :type_get_align_of, :clang_Type_getAlignOf, [CXType.by_value], :long_long
-				attach_function :type_get_size_of, :clang_Type_getSizeOf, [CXType.by_value], :long_long
-				attach_function :type_get_offset_of, :clang_Type_getOffsetOf, [CXType.by_value, :string], :long_long
-			end
+			attach_function :type_get_align_of, :clang_Type_getAlignOf, [CXType.by_value], :long_long
+			attach_function :type_get_size_of, :clang_Type_getSizeOf, [CXType.by_value], :long_long
+			attach_function :type_get_offset_of, :clang_Type_getOffsetOf, [CXType.by_value, :string], :long_long
 
-			if FFI::Clang::Utils.satisfy_version?('3.4')
-				attach_function :type_get_cxx_ref_qualifier, :clang_Type_getCXXRefQualifier, [CXType.by_value], :ref_qualifier_kind
-			end
+			attach_function :type_get_cxx_ref_qualifier, :clang_Type_getCXXRefQualifier, [CXType.by_value], :ref_qualifier_kind
+			
 			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/source_location.rb

@@ -20,8 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/source_location'
-require 'ffi/clang/lib/file'
+require_relative 'lib/source_location'
+require_relative 'lib/file'
 
 module FFI
 	module Clang

data/lib/ffi/clang/source_range.rb

@@ -22,7 +22,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/source_range'
+require_relative 'lib/source_range'
 
 module FFI
 	module Clang
@@ -40,11 +40,24 @@ module FFI
 			end
 
 			def start
-				ExpansionLocation.new(Lib.get_range_start @range)
+				@start ||= ExpansionLocation.new(Lib.get_range_start @range)
 			end
 
 			def end
-				ExpansionLocation.new(Lib.get_range_end @range)
+				@end ||= ExpansionLocation.new(Lib.get_range_end @range)
+			end
+
+			# The size, in bytes, of the source range.
+			def bytesize
+				self.end.offset - self.start.offset
+			end
+
+			# Read the part of the source file referred to by this source range.
+			def text
+				::File.open(self.start.file, "r") do |file|
+					file.seek(self.start.offset)
+					return file.read(self.bytesize)
+				end
 			end
 
 			def null?

data/lib/ffi/clang/token.rb

@@ -18,9 +18,9 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/token'
-require 'ffi/clang/lib/cursor'
-require 'ffi/clang/source_location'
+require_relative 'lib/token'
+require_relative 'lib/cursor'
+require_relative 'source_location'
 
 module FFI
 	module Clang
@@ -46,7 +46,7 @@ module FFI
 			end
 
 			def self.release(pointer)
-				Lib.dispose_tokens(pointer, pointer.token_size, pointer.translation_unit)
+				Lib.dispose_tokens(pointer.translation_unit, pointer, pointer.token_size)
 			end
 
 			def each(&block)

data/lib/ffi/clang/translation_unit.rb

@@ -20,11 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/lib/translation_unit'
-require 'ffi/clang/lib/inclusions'
-require 'ffi/clang/cursor'
-require 'ffi/clang/file'
-require 'ffi/clang/token'
+require_relative 'lib/translation_unit'
+require_relative 'lib/inclusions'
+require_relative 'cursor'
+require_relative 'file'
+require_relative 'token'
 
 module FFI
 	module Clang

data/lib/ffi/clang/type.rb

@@ -19,8 +19,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'ffi/clang/cursor'
-
 module FFI
 	module Clang
 		class Type
@@ -130,18 +128,6 @@ 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/version.rb

@@ -1,5 +1,5 @@
 # Copyright, 2010-2012 by Jari Bakken.
-# Copyright, 2013, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2016, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -21,6 +21,6 @@
 
 module FFI
 	module Clang
-		VERSION = "0.3.0"
+		VERSION = "0.5.0"
 	end
 end