ffi-clang 0.2.0 → 0.2.1

data/lib/ffi/clang/index.rb

@@ -1,5 +1,6 @@
 # Copyright, 2010-2012 by Jari Bakken.
 # Copyright, 2013, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2014, by Masahiro Sano.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -29,12 +30,12 @@ module FFI
 			end
 
 			def self.release(pointer)
-				Lib.dispose_index_debug(pointer)
+				Lib.dispose_index(pointer)
 			end
 
 			def parse_translation_unit(source_file, command_line_args = nil, unsaved = [], opts = {})
 				command_line_args = Array(command_line_args)
-				unsaved_files = unsaved_pointer_from(unsaved)
+				unsaved_files = UnsavedFile.unsaved_pointer_from(unsaved)
 
 				translation_unit_pointer = Lib.parse_translation_unit(self, source_file, args_pointer_from(command_line_args), command_line_args.size, unsaved_files, unsaved.length, options_bitmask_from(opts))
 
@@ -43,6 +44,12 @@ module FFI
 				TranslationUnit.new translation_unit_pointer, self
 			end
 
+			def create_translation_unit(ast_filename)
+				tu_pointer = Lib.create_translation_unit(self, ast_filename)
+				raise Error, "error parsing #{ast_filename.inspect}" if tu_pointer.null?
+				TranslationUnit.new tu_pointer, self
+			end
+
 			private
 
 			def args_pointer_from(command_line_args)
@@ -59,21 +66,6 @@ module FFI
 			def options_bitmask_from(opts)
 				Lib.bitmask_from Lib::TranslationUnitFlags, opts
 			end
-
-			def unsaved_pointer_from(unsaved)
-				return nil if unsaved.length == 0
-
-				vec = MemoryPointer.new(Lib::CXUnsavedFile, unsaved.length)
-
-				unsaved.each_with_index do |file, i|
-					uf = Lib::CXUnsavedFile.new(vec + i * Lib::CXUnsavedFile.size)
-					uf[:filename] = MemoryPointer.from_string(file.filename)
-					uf[:contents] = MemoryPointer.from_string(file.contents)
-					uf[:length] = file.contents.length
-				end
-
-				vec
-			end
 		end
 	end
 end

data/lib/ffi/clang/lib.rb

@@ -26,10 +26,16 @@ module FFI
 
 			libs = ["clang"]
 
-			if ENV['LLVM_CONFIG']
+			if ENV['LIBCLANG']
+				libs << ENV['LIBCLANG']
+			elsif ENV['LLVM_CONFIG']
 				llvm_library_dir = `#{ENV['LLVM_CONFIG']} --libdir`.chomp
 
-				libs << llvm_library_dir + '/libclang.dylib'
+				if FFI::Clang.platform == :darwin
+					libs << llvm_library_dir + '/libclang.dylib'
+				else
+					libs << llvm_library_dir + '/libclang.so'
+				end
 			end
 
 			ffi_lib libs
@@ -49,6 +55,23 @@ module FFI
 
 				bitmask
 			end
+
+			def self.opts_from(enum, bitmask)
+				bit = 1
+				opts = {}
+				while bitmask != 0
+					if bitmask & 1
+						if sym = enum[bit]
+							opts[sym] = true
+						else
+							raise Error, "unknown values: #{bit}, expected one of #{enum.symbols}"
+						end
+					end
+					bitmask >>= 1
+					bit <<= 1
+				end
+				opts
+			end
 		end
 	end
 end

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

@@ -0,0 +1,130 @@
+# Copyright, 2014, by Masahiro Sano.
+# 
+# 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 'ffi/clang/lib/translation_unit'
+require 'ffi/clang/lib/cursor'
+require 'ffi/clang/lib/diagnostic'
+
+module FFI
+	module Clang
+		module Lib
+			typedef :pointer, :CXCompletionString
+
+			class CXCompletionResult < FFI::Struct
+				layout(
+					:kind, :cursor_kind,
+					:string, :CXCompletionString,
+				)
+			end
+
+			class CXCodeCompleteResults < FFI::Struct
+				layout(
+					:results, :pointer,
+					:num, :uint,
+				)
+			end
+
+			enum :completion_chunk_kind, [
+				:optional,
+				:typed_text,
+				:text,
+				:placeholder,
+				:informative,
+				:current_parameter,
+				:left_paren,
+				:right_paren,
+				:left_bracket,
+				:right_bracket,
+				:left_brace,
+				:right_brace,
+				:left_angle,
+				:right_angle,
+				:comma,
+				:result_type,
+				:colon,
+				:semi_colon,
+				:equal,
+				:horizontal_space,
+				:vertical_space
+			]
+
+			CodeCompleteFlags = enum :code_complete_flags, [
+				:include_macros, 0x01,
+				:include_code_patterns, 0x02,
+				:include_brief_comments, 0x04
+			]
+
+			CompletionContext = enum :completion_context, [
+				:unexposed, 0,
+				:any_type, 1 << 0,
+				:any_value, 1 << 1,
+				:objc_object_value, 1 << 2,
+				:objc_selector_value, 1 << 3,
+				:cxx_class_type_value, 1 << 4,
+				:dot_member_access, 1 << 5,
+				:arrow_member_access, 1 << 6,
+				:objc_property_access, 1 << 7,
+				:enum_tag, 1 << 8,
+				:union_tag, 1 << 9,
+				:struct_tag, 1 << 10,
+				:class_tag, 1 << 11,
+				:namespace, 1 << 12,
+				:nested_name_specifier, 1 << 13,
+				:objc_interface, 1 << 14,
+				:objc_protocol, 1 << 15,
+				:objc_category, 1 << 16,
+				:objc_instance_message, 1 << 17,
+				:objc_class_message, 1 << 18,
+				:objc_selector_name, 1 << 19,
+				:macro_name, 1 << 20,
+				:natural_language, 1 << 21,
+				:unknown, ((1 << 22) - 1),
+			]
+
+			# CXCompletionString functions
+			attach_function :get_completion_chunk_kind, :clang_getCompletionChunkKind, [:CXCompletionString, :uint], :completion_chunk_kind
+			attach_function :get_completion_text, :clang_getCompletionChunkText, [:CXCompletionString, :uint], CXString.by_value
+			attach_function :get_completion_chunk_completion_string, :clang_getCompletionChunkCompletionString, [:CXCompletionString, :uint], :CXCompletionString
+			attach_function :get_num_completion_chunks, :clang_getNumCompletionChunks, [:CXCompletionString], :uint
+			attach_function :get_completion_priority, :clang_getCompletionPriority, [:CXCompletionString], :uint
+			attach_function :get_completion_availability, :clang_getCompletionAvailability, [:CXCompletionString], :availability
+			attach_function :get_completion_num_annotations, :clang_getCompletionNumAnnotations, [:CXCompletionString], :uint
+			attach_function :get_completion_annotation, :clang_getCompletionAnnotation, [:CXCompletionString, :uint], CXString.by_value
+			attach_function :get_completion_parent, :clang_getCompletionParent, [:CXCompletionString, :pointer], CXString.by_value
+			attach_function :get_completion_brief_comment, :clang_getCompletionBriefComment, [:CXCompletionString], CXString.by_value
+
+			# CXCodeCompleteResults functions
+			attach_function :get_code_complete_get_num_diagnostics, :clang_codeCompleteGetNumDiagnostics, [CXCodeCompleteResults.ptr], :uint
+			attach_function :get_code_complete_get_diagnostic, :clang_codeCompleteGetDiagnostic, [CXCodeCompleteResults.ptr, :uint], :CXDiagnostic
+			attach_function :get_code_complete_get_contexts, :clang_codeCompleteGetContexts, [CXCodeCompleteResults.ptr], :ulong_long
+			attach_function :get_code_complete_get_container_kind, :clang_codeCompleteGetContainerKind, [CXCodeCompleteResults.ptr, :pointer], :cursor_kind
+			attach_function :get_code_complete_get_container_usr, :clang_codeCompleteGetContainerUSR, [CXCodeCompleteResults.ptr], CXString.by_value
+			attach_function :get_code_complete_get_objc_selector, :clang_codeCompleteGetObjCSelector, [CXCodeCompleteResults.ptr], CXString.by_value
+
+			# Other functions
+			attach_function :code_complete_at, :clang_codeCompleteAt, [:CXTranslationUnit, :string, :uint, :uint, :pointer, :uint, :uint], CXCodeCompleteResults.ptr
+			attach_function :dispose_code_complete_results, :clang_disposeCodeCompleteResults, [CXCodeCompleteResults.ptr], :void
+			attach_function :get_cursor_completion_string, :clang_getCursorCompletionString, [CXCursor.by_value], :CXCompletionString
+			attach_function :default_code_completion_options, :clang_defaultCodeCompleteOptions, [], :uint
+			attach_function :sort_code_completion_results, :clang_sortCodeCompletionResults, [:pointer, :uint], :void
+		end
+	end
+end
+

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

@@ -26,31 +26,92 @@ module FFI
 		module Lib
 			class CXComment < FFI::Struct
 				layout(
-				       :ast_node, :pointer,
-				       :translation_unit, :pointer
-				       )
+					:ast_node, :pointer,
+					:translation_unit, :pointer
+				)
 			end
 
-			enum :kind, [:comment_null, 0,
-				     :comment_text, 1,
-				     :comment_paragraph, 5,
-				     :comment_block_command,6 ,
-				     :comment_param_command, 7,
-				     :comment_full, 12]
+			enum :kind, [
+				:comment_null, 0,
+				:comment_text, 1,
+				:comment_inline_command, 2,
+				:comment_html_start_tag, 3,
+				:comment_html_end_tag, 4,
+				:comment_paragraph, 5,
+				:comment_block_command, 6,
+				:comment_param_command, 7,
+				:comment_tparam_command, 8,
+				:comment_verbatim_block_command, 9,
+				:comment_verbatim_block_line, 10,
+				:comment_verbatim_line, 11,
+				:comment_full, 12,
+			]
 
+			enum :render_kind, [
+				:normal,
+				:bold,
+				:monospaced,
+				:emphasized
+			]
+
+			enum :pass_direction, [
+				:pass_direction_in, 0,
+				:pass_direction_out, 1,
+				:pass_direction_inout, 2
+			]
+
+			# common functions
 			attach_function :comment_get_kind, :clang_Comment_getKind, [CXComment.by_value], :kind
 			attach_function :comment_get_num_children, :clang_Comment_getNumChildren, [CXComment.by_value], :uint
 			attach_function :comment_get_child, :clang_Comment_getChild, [CXComment.by_value, :uint], CXComment.by_value
+			attach_function :comment_is_whitespace, :clang_Comment_isWhitespace, [CXComment.by_value], :uint
+
+			# TextComment functions
 			attach_function :text_comment_get_text, :clang_TextComment_getText, [CXComment.by_value], CXString.by_value
-			attach_function :block_command_comment_get_paragraph, :clang_BlockCommandComment_getParagraph, [CXComment.by_value], CXComment.by_value
-			attach_function :full_comment_get_as_html, :clang_FullComment_getAsHTML, [CXComment.by_value], CXString.by_value
-			attach_function :full_comment_get_as_xml, :clang_FullComment_getAsXML, [CXComment.by_value], CXString.by_value
 
+			# InlineCommandComment functions
+			attach_function :inline_command_comment_get_command_name, :clang_InlineCommandComment_getCommandName, [CXComment.by_value], CXString.by_value
+			attach_function :inline_command_comment_get_num_args, :clang_InlineCommandComment_getNumArgs, [CXComment.by_value], :uint
+			attach_function :inline_content_comment_has_trailing_newline, :clang_InlineContentComment_hasTrailingNewline, [CXComment.by_value], :uint
+			attach_function :inline_command_comment_get_render_kind, :clang_InlineCommandComment_getRenderKind, [CXComment.by_value], :render_kind
+			attach_function :inline_command_comment_get_arg_text, :clang_InlineCommandComment_getArgText, [CXComment.by_value, :uint], CXString.by_value
+
+			# HTMLTagComment functions
+			attach_function :html_tag_comment_get_as_string, :clang_HTMLTagComment_getAsString, [CXComment.by_value], CXString.by_value
+			attach_function :html_tag_comment_get_tag_name, :clang_HTMLTagComment_getTagName, [CXComment.by_value], CXString.by_value
+			attach_function :html_start_tag_comment_is_self_closing, :clang_HTMLStartTagComment_isSelfClosing, [CXComment.by_value], :uint
+			attach_function :html_start_tag_comment_get_num_attrs, :clang_HTMLStartTag_getNumAttrs, [CXComment.by_value], :uint
+			attach_function :html_start_tag_comment_get_attr_name, :clang_HTMLStartTag_getAttrName, [CXComment.by_value, :uint], CXString.by_value
+			attach_function :html_start_tag_comment_get_attr_value, :clang_HTMLStartTag_getAttrValue,[CXComment.by_value, :uint], CXString.by_value
+
+			# ParamCommandComment functions
+			attach_function :param_command_comment_is_direction_explicit, :clang_ParamCommandComment_isDirectionExplicit, [CXComment.by_value], :uint
+			attach_function :param_command_comment_get_direction, :clang_ParamCommandComment_getDirection, [CXComment.by_value], :pass_direction
 			attach_function :param_command_comment_get_param_name, :clang_ParamCommandComment_getParamName, [CXComment.by_value], CXString.by_value
 			attach_function :param_command_comment_is_param_index_valid, :clang_ParamCommandComment_isParamIndexValid, [CXComment.by_value], :uint
 			attach_function :param_command_comment_get_param_index, :clang_ParamCommandComment_getParamIndex, [CXComment.by_value], :uint
+
+			# TParamCommandComment functions
+			attach_function :tparam_command_comment_get_param_name, :clang_TParamCommandComment_getParamName, [CXComment.by_value], CXString.by_value
+			attach_function :tparam_command_comment_is_param_position_valid, :clang_TParamCommandComment_isParamPositionValid, [CXComment.by_value], :uint
+			attach_function :tparam_command_comment_get_depth, :clang_TParamCommandComment_getDepth, [CXComment.by_value], :uint
+			attach_function :tparam_command_comment_get_index, :clang_TParamCommandComment_getIndex, [CXComment.by_value, :uint], :uint
+
+			# BlockCommandComment functions
+			attach_function :block_command_comment_get_paragraph, :clang_BlockCommandComment_getParagraph, [CXComment.by_value], CXComment.by_value
 			attach_function :block_command_comment_get_command_name, :clang_BlockCommandComment_getCommandName, [CXComment.by_value], CXString.by_value
 			attach_function :block_command_comment_get_num_args, :clang_BlockCommandComment_getNumArgs, [CXComment.by_value], :uint
+			attach_function :block_command_comment_get_arg_text, :clang_BlockCommandComment_getArgText, [CXComment.by_value, :uint], CXString.by_value
+
+			# VerbatimBlockLineComment functions
+			attach_function :verbatim_block_line_comment_get_text, :clang_VerbatimBlockLineComment_getText, [CXComment.by_value], CXString.by_value
+
+			# VerbatimLineComment functions
+			attach_function :verbatim_line_comment_get_text, :clang_VerbatimLineComment_getText, [CXComment.by_value], CXString.by_value
+
+			# FullComment functions
+			attach_function :full_comment_get_as_html, :clang_FullComment_getAsHTML, [CXComment.by_value], CXString.by_value
+			attach_function :full_comment_get_as_xml, :clang_FullComment_getAsXML, [CXComment.by_value], CXString.by_value
 		end
 	end
 end

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

@@ -0,0 +1,58 @@
+# Copyright, 2014, by Masahiro Sano.
+# 
+# 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.
+
+module FFI
+	module Clang
+		module Lib
+			typedef :pointer, :CXCompilationDatabase
+			typedef :pointer, :CXCompileCommands
+			typedef :pointer, :CXCompileCommand
+
+			CompilationDatabaseError = enum [
+				:no_error, 0,
+				:can_not_load_database, 1,
+			]
+
+			# CompilationDatabase
+			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
+
+			# CompilationDatabase::CompileCommands
+			attach_function :compile_commands_dispose, :clang_CompileCommands_dispose, [:CXCompileCommands], :void
+			attach_function :compile_commands_get_size, :clang_CompileCommands_getSize, [:CXCompileCommands], :uint
+			attach_function :compile_commands_get_command, :clang_CompileCommands_getCommand, [:CXCompileCommands, :uint], :CXCompileCommand
+
+			# CompilationDatabase::CompileCommand
+			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
+		end
+	end
+end

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

@@ -1,6 +1,7 @@
 # Copyright, 2010-2012 by Jari Bakken.
 # Copyright, 2013, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # Copyright, 2013, by Garry C. Marshall. <http://www.meaningfulname.net>
+# Copyright, 2014, by Masahiro Sano.
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -24,11 +25,12 @@ 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'
 
 module FFI
 	module Clang
 		module Lib
-			enum :kind, [
+			enum :cursor_kind, [
 				:cursor_unexposed_decl, 1,
 				:cursor_struct, 2,
 				:cursor_union, 3,
@@ -83,7 +85,7 @@ module FFI
 				:cursor_no_decl_found, 71,
 				:cursor_not_implemented, 72,
 				:cursor_invalid_code, 73,
-				:cursor_first_expr, 100,
+				:cursor_unexposed_expr, 100,
 				:cursor_decl_ref_expr, 101,
 				:cursor_member_ref_expr, 102,
 				:cursor_call_expr, 103,
@@ -204,16 +206,56 @@ module FFI
 
 			class CXCursor < FFI::Struct
 				layout(
-					:kind, :kind,
+					:kind, :cursor_kind,
 					:xdata, :int,
 					:data, [:pointer, 3]
 				)
 			end
 
+			class CXVersion < FFI::Struct
+				layout(
+					:major, :int,
+					:minor, :int,
+					:subminor, :int,
+				)
+
+				def major
+					self[:major]
+				end
+
+				def minor
+					self[:minor]
+				end
+
+				def subminor
+					self[:subminor]
+				end
+
+				def version_string
+					[major, minor, subminor].reject{|v| v < 0}.map(&:to_s).join(".")
+				end
+
+				def to_s
+					version_string
+				end
+			end
+
+			class CXPlatformAvailability < FFI::Struct
+				layout(
+					:platform, CXString,
+					:introduced, CXVersion,
+					:deprecated, CXVersion,
+					:obsoleted, CXVersion,
+					:unavailable, :int,
+					:message, CXString,
+				)
+			end
+
 			enum :cxx_access_specifier, [:invalid, :public, :protected, :private]
 			attach_function :get_cxx_access_specifier, :clang_getCXXAccessSpecifier, [CXCursor.by_value], :cxx_access_specifier
 
 			attach_function :get_enum_value, :clang_getEnumConstantDeclValue, [CXCursor.by_value], :long_long
+			attach_function :get_enum_unsigned_value, :clang_getEnumConstantDeclUnsignedValue, [CXCursor.by_value], :ulong_long
 
 			attach_function :is_virtual_base, :clang_isVirtualBase, [CXCursor.by_value], :uint
 			attach_function :is_dynamic_call, :clang_Cursor_isDynamicCall, [CXCursor.by_value], :uint
@@ -223,6 +265,7 @@ module FFI
 			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
@@ -234,7 +277,7 @@ module FFI
 			attach_function :get_canonical_cursor, :clang_getCanonicalCursor, [CXCursor.by_value], CXCursor.by_value
 			attach_function :get_cursor_definition, :clang_getCursorDefinition, [CXCursor.by_value], CXCursor.by_value
 			attach_function :get_specialized_cursor_template, :clang_getSpecializedCursorTemplate, [CXCursor.by_value], CXCursor.by_value
-			attach_function :get_template_cursor_kind, :clang_getTemplateCursorKind, [CXCursor.by_value], :kind
+			attach_function :get_template_cursor_kind, :clang_getTemplateCursorKind, [CXCursor.by_value], :cursor_kind
 
 			attach_function :get_translation_unit_cursor, :clang_getTranslationUnitCursor, [:CXTranslationUnit], CXCursor.by_value
 			attach_function :cursor_get_translation_unit, :clang_Cursor_getTranslationUnit, [CXCursor.by_value], :CXTranslationUnit
@@ -243,6 +286,7 @@ module FFI
 
 			attach_function :cursor_is_null, :clang_Cursor_isNull, [CXCursor.by_value], :int
 
+			attach_function :cursor_get_comment_range, :clang_Cursor_getCommentRange, [CXCursor.by_value], CXSourceRange.by_value
 			attach_function :cursor_get_raw_comment_text, :clang_Cursor_getRawCommentText, [CXCursor.by_value], CXString.by_value
 			attach_function :cursor_get_parsed_comment, :clang_Cursor_getParsedComment, [CXCursor.by_value], CXComment.by_value
 
@@ -252,18 +296,19 @@ module FFI
 			attach_function :get_cursor_display_name, :clang_getCursorDisplayName, [CXCursor.by_value], CXString.by_value
 			attach_function :get_cursor_spelling, :clang_getCursorSpelling, [CXCursor.by_value], CXString.by_value
 			attach_function :get_cursor_usr, :clang_getCursorUSR, [CXCursor.by_value], CXString.by_value
+			attach_function :get_cursor_kind_spelling, :clang_getCursorKindSpelling, [:cursor_kind], CXString.by_value
 
 			attach_function :are_equal, :clang_equalCursors, [CXCursor.by_value, CXCursor.by_value], :uint
 
-			attach_function :is_declaration, :clang_isDeclaration, [:kind], :uint
-			attach_function :is_reference, :clang_isReference, [:kind], :uint
-			attach_function :is_expression, :clang_isExpression, [:kind], :uint
-			attach_function :is_statement, :clang_isStatement, [:kind], :uint
-			attach_function :is_attribute, :clang_isAttribute, [:kind], :uint
-			attach_function :is_invalid, :clang_isInvalid, [:kind], :uint
-			attach_function :is_translation_unit, :clang_isTranslationUnit, [:kind], :uint
-			attach_function :is_preprocessing, :clang_isPreprocessing, [:kind], :uint
-			attach_function :is_unexposed, :clang_isUnexposed, [:kind], :uint
+			attach_function :is_declaration, :clang_isDeclaration, [:cursor_kind], :uint
+			attach_function :is_reference, :clang_isReference, [:cursor_kind], :uint
+			attach_function :is_expression, :clang_isExpression, [:cursor_kind], :uint
+			attach_function :is_statement, :clang_isStatement, [:cursor_kind], :uint
+			attach_function :is_attribute, :clang_isAttribute, [:cursor_kind], :uint
+			attach_function :is_invalid, :clang_isInvalid, [:cursor_kind], :uint
+			attach_function :is_translation_unit, :clang_isTranslationUnit, [:cursor_kind], :uint
+			attach_function :is_preprocessing, :clang_isPreprocessing, [:cursor_kind], :uint
+			attach_function :is_unexposed, :clang_isUnexposed, [:cursor_kind], :uint
 
 			enum :child_visit_result, [:break, :continue, :recurse]
 
@@ -282,8 +327,27 @@ module FFI
 
 			attach_function :get_cursor_availability, :clang_getCursorAvailability, [CXCursor.by_value], :availability
 			attach_function :get_cursor_linkage, :clang_getCursorLinkage, [CXCursor.by_value], :linkage_kind
-			# attach_function :get_included_file, :clang_getIncludedFile, [CXCursor.by_value], :CXFile
+			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 :get_overloaded_decl, :clang_getOverloadedDecl, [CXCursor.by_value, :uint], CXCursor.by_value
+			attach_function :get_num_overloaded_decls, :clang_getNumOverloadedDecls, [CXCursor.by_value], :uint
+
+			attach_function :cursor_get_argument, :clang_Cursor_getArgument, [CXCursor.by_value, :uint], CXCursor.by_value
+			attach_function :cursor_get_num_arguments, :clang_Cursor_getNumArguments, [CXCursor.by_value], :int
+
+			attach_function :get_decl_objc_type_encoding, :clang_getDeclObjCTypeEncoding, [CXCursor.by_value], CXString.by_value
+
+			attach_function :get_cursor_platform_availability, :clang_getCursorPlatformAvailability, [CXCursor.by_value, :pointer, :pointer, :pointer, :pointer, :pointer, :int], :int
+			attach_function :dispose_platform_availability, :clang_disposeCXPlatformAvailability, [:pointer], :void
+
+			attach_function :get_overridden_cursors, :clang_getOverriddenCursors, [CXCursor.by_value, :pointer, :pointer], :void
+			attach_function :dispose_overridden_cursors, :clang_disposeOverriddenCursors, [:pointer], :void
 		end
 	end
 end