ffi-clang 0.2.0 → 0.2.1

data/lib/ffi/clang/lib/diagnostic.rb

@@ -35,33 +35,53 @@ module FFI
 			end
 
 			typedef :pointer, :CXDiagnostic
+			typedef :pointer, :CXDiagnosticSet
+
+			DiagnosticDisplayOptions = enum [
+				:source_location, 0x01,
+				:column, 0x02,
+				:source_ranges, 0x04,
+				:option, 0x08,
+				:category_id, 0x10,
+				:category_name , 0x20,
+			]
+
+			enum :diagnostic_severity, [:ignored, :note, :warning, :error, :fatal]
 
 			# Source code diagnostics:
 			attach_function :get_num_diagnostics, :clang_getNumDiagnostics, [:CXTranslationUnit], :uint
-			attach_function :get_diagnostic, :clang_getDiagnostic, [:CXTranslationUnit,  :uint], :CXDiagnostic
+			attach_function :get_diagnostic, :clang_getDiagnostic, [:CXTranslationUnit, :uint], :CXDiagnostic
 			attach_function :dispose_diagnostic, :clang_disposeDiagnostic, [:CXDiagnostic], :void
 
-			attach_function :get_diagnostic_location, :clang_getDiagnosticLocation, [:CXDiagnostic], CXSourceLocation.by_value
+			# DiagnosticSet (not used yet)
+			# attach_function :get_diagnostic_set_from_tu, :clang_getDiagnosticSetFromTU, [:CXTranslationUnit], :CXDiagnosticSet
+			# attach_function :dispose_diagnostic_set, :clang_disposeDiagnosticSet, [:CXDiagnosticSet], :void
+			# attach_function :load_diagnostics, :clang_loadDiagnostics, [:string, :pointer, :pointer], :CXDiagnosticSet
 
 			# Diagnostic details and string representations:
-			DiagnosticDisplayOptions = enum [:source_location, 0x01, :column, 0x02, :source_ranges, 0x04]
+			attach_function :get_diagnostic_spelling, :clang_getDiagnosticSpelling, [:CXDiagnostic], CXString.by_value
 			attach_function :default_diagnostic_display_options, :clang_defaultDiagnosticDisplayOptions, [], :uint
 			attach_function :format_diagnostic, :clang_formatDiagnostic, [:CXDiagnostic, :uint], CXString.by_value
-
-			attach_function :get_diagnostic_spelling, :clang_getDiagnosticSpelling, [:CXDiagnostic], CXString.by_value
-
-			enum :diagnostic_severity, [:ignored, :note, :warning, :error, :fatal]
 			attach_function :get_diagnostic_severity, :clang_getDiagnosticSeverity, [:CXDiagnostic], :diagnostic_severity
+			attach_function :get_diagnostic_option, :clang_getDiagnosticOption, [:CXDiagnostic, :pointer], CXString.by_value
 
-			# Diagnostic source ranges:
+			# Diagnostic source location and source ranges:
+			attach_function :get_diagnostic_location, :clang_getDiagnosticLocation, [:CXDiagnostic], CXSourceLocation.by_value
 			attach_function :get_diagnostic_num_ranges, :clang_getDiagnosticNumRanges, [:CXDiagnostic], :uint
 			attach_function :get_diagnostic_range, :clang_getDiagnosticRange, [:CXDiagnostic, :uint], CXSourceRange.by_value
 
-			# Range to source code location conversion:
-			attach_function :get_range_start, :clang_getRangeStart, [CXSourceRange.by_value], CXSourceLocation.by_value
-			attach_function :get_range_end, :clang_getRangeEnd, [CXSourceRange.by_value], CXSourceLocation.by_value
+			# Child Diagnostics:
+			attach_function :get_child_diagnostics, :clang_getChildDiagnostics, [:CXDiagnostic], :CXDiagnosticSet
+			attach_function :get_num_diagnostics_in_set, :clang_getNumDiagnosticsInSet, [:CXDiagnosticSet], :uint
+			attach_function :get_diagnostic_in_set, :clang_getDiagnosticInSet, [:CXDiagnosticSet, :uint], :CXDiagnostic
+
+			# Category:
+			attach_function :get_diagnostic_category, :clang_getDiagnosticCategory, [:CXDiagnostic], :uint
+			attach_function :get_diagnostic_category_text, :clang_getDiagnosticCategoryText, [:CXDiagnostic], CXString.by_value
 
-			attach_function :equal_locations, :clang_equalLocations, [CXSourceLocation.by_value, CXSourceLocation.by_value], :uint
+			# Fixit:
+			attach_function :get_diagnostic_num_fix_its, :clang_getDiagnosticNumFixIts, [:CXDiagnostic], :uint
+			attach_function :get_diagnostic_fix_it, :clang_getDiagnosticFixIt, [:CXDiagnostic, :uint, :pointer], CXString.by_value
 		end
 	end
 end

data/lib/ffi/clang/lib/file.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
@@ -21,6 +22,7 @@
 
 require 'ffi/clang/lib/string'
 require 'ffi/clang/lib/translation_unit'
+require 'ffi/clang/utils'
 
 module FFI
 	module Clang
@@ -33,13 +35,23 @@ module FFI
 				)
 			end
 
+			class CXFileUniqueID < FFI::Struct
+				layout(
+					:device, :ulong_long,
+					:inode, :ulong_long,
+					:modification, :ulong_long
+				)
+			end
+
 			typedef :pointer, :CXFile
 
-			# Retrieve a file handle within the given translation unit.
 			attach_function :get_file, :clang_getFile, [:CXTranslationUnit, :string], :CXFile
-
-			# Retrieve the complete file and path name of the given file.
 			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
 		end
 	end
 end

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

@@ -0,0 +1,32 @@
+# Copyright, 2014, by Greg Hazel
+# 
+# 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/file'
+require 'ffi/clang/lib/source_location'
+
+module FFI
+	module Clang
+		module Lib
+			# Source code inclusions:
+			callback :visit_inclusion_function, [:CXFile, :pointer, :uint, :pointer], :void
+			attach_function :get_inclusions, :clang_getInclusions, [:CXTranslationUnit, :visit_inclusion_function, :pointer], :void      
+		end
+	end
+end

data/lib/ffi/clang/lib/source_location.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
@@ -19,6 +20,8 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
+require 'ffi/clang/lib/file'
+
 module FFI
 	module Clang
 		module Lib
@@ -29,7 +32,22 @@ module FFI
 				)
 			end
 
+			attach_function :get_null_location, :clang_getNullLocation, [], CXSourceLocation.by_value
+			attach_function :equal_locations, :clang_equalLocations,  [CXSourceLocation.by_value, CXSourceLocation.by_value], :int
+
+			attach_function :get_location, :clang_getLocation, [:CXTranslationUnit, :CXFile, :uint, :uint], CXSourceLocation.by_value
+			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_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
 		end
 	end
 end

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

@@ -2,6 +2,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
@@ -34,8 +35,12 @@ module FFI
 				)
 			end
 
+			attach_function :get_null_range, :clang_getNullRange, [], CXSourceLocation.by_value
+			attach_function :get_range, :clang_getRange, [CXSourceLocation.by_value, CXSourceLocation.by_value], CXSourceRange.by_value
 			attach_function :get_range_start, :clang_getRangeStart, [CXSourceRange.by_value], CXSourceLocation.by_value
 			attach_function :get_range_end, :clang_getRangeEnd, [CXSourceRange.by_value], CXSourceLocation.by_value
+			attach_function :range_is_null, :clang_Range_isNull, [CXSourceRange.by_value], :int
+			attach_function :equal_range, :clang_equalRanges, [CXSourceRange.by_value, CXSourceRange.by_value], :uint
 		end
 	end
 end

data/lib/ffi/clang/lib/token.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
+			class CXToken < FFI::Struct
+				layout(
+					:int_data, [:uint, 4],
+					:ptr_data, :pointer,
+				)
+			end
+
+			class TokensPointer < FFI::Pointer
+				attr_reader :token_size
+				attr_reader :translation_unit
+				def initialize(ptr, token_size, translation_unit)
+					super ptr
+					@token_size = token_size
+					@translation_unit = translation_unit
+				end
+			end
+
+			enum :token_kind, [
+				:punctuation,
+				:keyword,
+				:identifier,
+				:literal,
+				:comment,
+			]
+
+			attach_function :get_token_kind, :clang_getTokenKind, [CXToken.by_value], :token_kind
+			attach_function :get_token_spelliing, :clang_getTokenSpelling, [:CXTranslationUnit, CXToken.by_value], CXString.by_value
+			attach_function :get_token_location, :clang_getTokenLocation, [:CXTranslationUnit, CXToken.by_value], CXSourceLocation.by_value
+			attach_function :get_token_extent, :clang_getTokenExtent, [:CXTranslationUnit, CXToken.by_value], CXSourceRange.by_value
+			attach_function :tokenize, :clang_tokenize, [:CXTranslationUnit, CXSourceRange.by_value, :pointer, :pointer], :void
+			attach_function :annotate_tokens, :clang_annotateTokens, [:CXTranslationUnit, :pointer, :uint, :pointer], :void
+			attach_function :dispose_tokens, :clang_disposeTokens, [:CXTranslationUnit, :pointer, :uint], :void
+		end
+	end
+end

data/lib/ffi/clang/lib/translation_unit.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
@@ -26,11 +27,80 @@ module FFI
 		module Lib
 			typedef :pointer, :CXTranslationUnit
 
-			TranslationUnitFlags = enum [:none, :detailed_preprocessing_record, :incomplete, :precompiled_preamble, :cache_completion_results]
+			TranslationUnitFlags = enum [
+				:none, 0x0,
+				:detailed_preprocessing_record, 0x01,
+				:incomplete, 0x02,
+				:precompiled_preamble, 0x04,
+				:cache_completion_results, 0x08,
+				:for_serialization, 0x10,
+				:cxx_chained_pch, 0x20,
+				:skip_function_bodies, 0x40,
+				:include_brief_comments_in_code_completion, 0x80,
+			]
+
+			SaveTranslationUnitFlags = enum [
+				:save_translation_unit_none, 0x0,
+			]
+
+			SaveError = enum [
+				:none, 0,
+				:unknown, 1,
+				:translation_errors, 2,
+				:invalid_tu, 3
+			]
+
+			ReparseFlags = enum [
+				:none, 0x0,
+			]
+
+			enum :resource_usage_kind, [
+				:ast, 1,
+				:identifiers, 2,
+				:selectors, 3,
+				:global_completion_results, 4,
+				:source_manager_content_cache, 5,
+				:ast_side_tables, 6,
+				:source_manager_membuffer_malloc, 7,
+				:source_manager_membuffer_mmap, 8,
+				:external_ast_source_membuffer_malloc, 9,
+				:external_ast_source_membuffer_mmap, 10,
+				:preprocessor, 11,
+				:preprocessing_record, 12,
+				:sourcemanager_data_structures, 13,
+				:preprocessor_header_search, 14,
+			]
+
+			class CXTUResourceUsage < FFI::Struct
+				layout(
+					:data, :pointer,
+					:numEntries, :uint,
+					:entries, :pointer
+				)
+			end
+
+			class CXTUResourceUsageEntry < FFI::Struct
+				layout(
+					:kind, :resource_usage_kind,
+					:amount, :ulong,
+				)
+			end
 
 			# Source code translation units:
 			attach_function :parse_translation_unit, :clang_parseTranslationUnit, [:CXIndex, :string, :pointer, :int, :pointer, :uint, :uint], :CXTranslationUnit
+			attach_function :create_translation_unit, :clang_createTranslationUnit, [:CXIndex, :string], :CXTranslationUnit
 			attach_function :dispose_translation_unit, :clang_disposeTranslationUnit, [:CXTranslationUnit], :void
+			attach_function :get_translation_unit_spelling, :clang_getTranslationUnitSpelling, [:CXTranslationUnit], :string
+
+			attach_function :default_editing_translation_unit_options, :clang_defaultEditingTranslationUnitOptions, [], :uint
+			attach_function :default_save_options, :clang_defaultSaveOptions, [:CXTranslationUnit], :uint
+			attach_function :save_translation_unit, :clang_saveTranslationUnit, [:CXTranslationUnit, :string, :uint], :int
+			attach_function :default_reparse_options, :clang_defaultReparseOptions, [:CXTranslationUnit], :uint
+			attach_function :reparse_translation_unit, :clang_reparseTranslationUnit, [:CXTranslationUnit, :uint, :pointer, :uint], :int
+
+			attach_function :resource_usage, :clang_getCXTUResourceUsage, [:CXTranslationUnit], CXTUResourceUsage.by_value
+			attach_function :dispose_resource_usage, :clang_disposeCXTUResourceUsage, [CXTUResourceUsage.by_value], :void
+			attach_function :resource_usage_name, :clang_getTUResourceUsageName, [:resource_usage_kind], :string
 		end
 	end
 end

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

@@ -1,4 +1,5 @@
 # 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
@@ -72,6 +73,37 @@ module FFI
 				:type_member_pointer, 117,
 			]
 
+			enum :calling_conv, [
+				:calling_conv_default, 0,
+				:calling_conv_c, 1,
+				:calling_conv_x86_stdcall, 2,
+				:calling_conv_x86_fastcall, 3,
+				:calling_conv_x86_thiscall, 4,
+				:calling_conv_x86_pascal, 5,
+				:calling_conv_aapcs, 6,
+				:calling_conv_aapcs_vfp, 7,
+				:calling_conv_pnacl_call, 8,
+				:calling_conv_intel_ocl_bicc, 9,
+				:calling_conv_x86_64_win64, 10,
+				:calling_conv_x86_64_sysv, 11,
+				:calling_conv_invalid, 100,
+				:calling_conv_unexposed, 200
+			]
+
+			enum :ref_qualifier_kind, [
+				:ref_qualifier_none, 0,
+				:ref_qualifier_lvalue, 1,
+				:ref_qualifier_rvalue, 2,
+			]
+
+			enum :layout_error, [
+				:layout_error_invalid, -1,
+				:layout_error_incomplete, -2,
+				:layout_error_dependent, -3,
+				:layout_error_not_constant_size, -4,
+				:layout_error_invalid_field_name, -5,
+			]
+
 			class CXType < FFI::Struct
 				layout(
 					:kind, :kind,
@@ -79,18 +111,44 @@ module FFI
 				)
 			end
 
-			attach_function :get_pointee_type, :clang_getPointeeType, [CXType.by_value], CXType.by_value
 			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 :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_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 :is_const_qualified_type, :clang_isConstQualifiedType, [CXType.by_value], :uint
+			attach_function :is_volatile_qualified_type, :clang_isVolatileQualifiedType, [CXType.by_value], :uint
+			attach_function :is_restrict_qualified_type, :clang_isRestrictQualifiedType, [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_num_elements, :clang_getNumElements, [CXType.by_value], :long_long
+			attach_function :get_element_type, :clang_getElementType, [CXType.by_value], CXType.by_value
+			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
+
+			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 :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
 		end
 	end
 end

data/lib/ffi/clang/source_location.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
@@ -25,8 +26,53 @@ require 'ffi/clang/lib/file'
 module FFI
 	module Clang
 		class SourceLocation
+			def self.null_location
+				ExpansionLocation.new Lib.get_null_location
+			end
+
+			attr_reader :location
 			def initialize(location)
 				@location = location
+			end
+
+			def in_system_header?
+				Lib.location_in_system_header(@location) != 0
+			end
+
+			def from_main_file?
+				Lib.location_is_from_main_file(@location) != 0
+			end
+
+			def expansion_location
+				ExpansionLocation.new(@location)
+			end
+
+			def presumed_location
+				PresumedLocation.new(@location)
+			end
+
+			def spelling_location
+				SpellingLocation.new(@location)
+			end
+
+			def file_location
+				FileLocation.new(@location)
+			end
+
+			def null?
+				Lib.equal_locations(@location, Lib.get_null_location) != 0
+			end
+
+			def ==(other)
+				Lib.equal_locations(@location, other.location) != 0
+			end
+		end
+
+		class ExpansionLocation < SourceLocation
+			attr_reader :file, :line, :column, :offset
+
+			def initialize(location)
+				super(location)
 
 				cxfile = MemoryPointer.new :pointer
 				line   = MemoryPointer.new :uint
@@ -40,8 +86,64 @@ module FFI
 				@column = column.get_uint(0)
 				@offset = offset.get_uint(0)
 			end
+		end
+
+		class PresumedLocation < SourceLocation
+			attr_reader :filename, :line, :column, :offset
+
+			def initialize(location)
+				super(location)
+
+				cxstring = MemoryPointer.new Lib::CXString
+				line	 = MemoryPointer.new :uint
+				column	 = MemoryPointer.new :uint
+
+				Lib::get_presumed_location(@location, cxstring, line, column)
+
+				@filename = Lib.extract_string cxstring
+				@line = line.get_uint(0)
+				@column = column.get_uint(0)
+			end
+		end
+
+		class SpellingLocation < SourceLocation
+			attr_reader :file, :line, :column, :offset
+
+			def initialize(location)
+				super(location)
+
+				cxfile = MemoryPointer.new :pointer
+				line   = MemoryPointer.new :uint
+				column = MemoryPointer.new :uint
+				offset = MemoryPointer.new :uint
+
+				Lib::get_spelling_location(@location, cxfile, line, column, offset)
+
+				@file = Lib.extract_string Lib.get_file_name(cxfile.read_pointer)
+				@line = line.get_uint(0)
+				@column = column.get_uint(0)
+				@offset = offset.get_uint(0)
+			end
+		end
 
+		class FileLocation < SourceLocation
 			attr_reader :file, :line, :column, :offset
+
+			def initialize(location)
+				super(location)
+
+				cxfile = MemoryPointer.new :pointer
+				line   = MemoryPointer.new :uint
+				column = MemoryPointer.new :uint
+				offset = MemoryPointer.new :uint
+
+				Lib::get_file_location(@location, cxfile, line, column, offset)
+
+				@file = Lib.extract_string Lib.get_file_name(cxfile.read_pointer)
+				@line = line.get_uint(0)
+				@column = column.get_uint(0)
+				@offset = offset.get_uint(0)
+			end
 		end
 	end
 end