ffi_gen 0.7 → 0.8

data/lib/ffi_gen.rb

@@ -64,26 +64,21 @@ class FFIGen
         symbol = ":#{@generator.to_ruby_lowercase constant_name[prefix_length..(-1 - suffix_length)]}"
         symbols << symbol
         definitions << "    #{symbol}#{constant_value ? ", #{constant_value}" : ""}"
-        description = constant_comment.split("\n").map { |line| @generator.prepare_comment_line line }
-        symbol_descriptions << "  # #{symbol}::\n  #   #{@generator.create_description_comment(description, '  #   ', true)}"
-      end
-
-      enum_description = []
-      @comment.split("\n").map do |line|
-        enum_description << @generator.prepare_comment_line(line)
+        symbol_descriptions << "  # #{symbol} ::\n  #   #{@generator.create_description_comment(constant_comment, '  #   ', true)}\n"
       end
       
       str = ""
-      str << @generator.create_description_comment(enum_description, '  # ')
-      str << "  # === Options:\n#{symbol_descriptions.join("\n")}\n  #\n"
-      str << "  # @return [Array of Symbols]\n"
+      str << @generator.create_description_comment(@comment, '  # ')
+      str << "  # \n"
+      str << "  # === Options:\n#{symbol_descriptions.join}  #\n"
+      str << "  # @return [Array<Symbol>]\n"
       str << "  def self.#{@generator.to_ruby_lowercase @name}_enum\n    [#{symbols.join(', ')}]\n  end\n"
       str << "  enum :#{@generator.to_ruby_lowercase @name}, [\n#{definitions.join(",\n")}\n  ]"
       str
     end
     
-    def type_name
-      "Symbol from #{@generator.to_ruby_lowercase @name}_enum"
+    def type_name(short)
+      short ? @name : "Symbol from #{@generator.to_ruby_lowercase @name}_enum"
     end
     
     def reference
@@ -94,23 +89,38 @@ class FFIGen
   class Struct
     attr_reader :fields
     
-    def initialize(generator, name)
+    def initialize(generator, name, comment)
       @generator = generator
       @name = name
+      @comment = comment
       @fields = []
     end
     
     def to_s
-      lines = @fields.map { |(field_name, field_type)| ":#{@generator.to_ruby_lowercase field_name}, #{@generator.to_ffi_type field_type}" }
-      "  class #{@generator.to_ruby_camelcase @name} < FFI::Struct\n    layout #{lines.join(",\n           ")}\n  end"
+      field_definitions = []
+      field_descriptions = []
+      @fields.each do |(field_name, field_type, field_comment)|
+        symbol = ":#{@generator.to_ruby_lowercase field_name}"
+        field_definitions << "#{symbol}, #{@generator.to_ffi_type field_type}"
+        field_descriptions << "  # #{symbol} ::\n  #   (#{@generator.to_type_name field_type}) #{@generator.create_description_comment(field_comment, '  #   ', true)}\n"
+      end
+      
+      str = ""
+      str << @generator.create_description_comment(@comment, '  # ')
+      str << "  # \n"
+      str << "  # = Fields:\n#{field_descriptions.join}  #\n"
+      str << "  class #{@generator.to_ruby_camelcase @name} < FFI::Struct\n"
+      str << "    layout #{field_definitions.join(",\n           ")}\n" unless @fields.empty?
+      str << "  end"
+      str
     end
     
-    def type_name
+    def type_name(short)
       @generator.to_ruby_camelcase @name
     end
     
     def reference
-      "#{type_name}.by_value"
+      "#{type_name(false)}.by_value"
     end
   end
   
@@ -127,50 +137,55 @@ class FFIGen
     end
     
     def to_s
-      str = ""
-      
       ruby_name = @generator.to_ruby_lowercase @name
       ruby_parameters = @parameters.map do |(name, type)|
         ruby_param_type = @generator.to_type_name type
-        ruby_param_name = @generator.to_ruby_lowercase(name.empty? ? ruby_param_type.split.last : name)
+        ruby_param_name = @generator.to_ruby_lowercase(name.empty? ? @generator.to_type_name(type, true) : name)
         [ruby_param_name, ruby_param_type, []]
       end
       
-      signature = "[#{@parameters.map{ |(name, type)| @generator.to_ffi_type type }.join(', ')}], #{@generator.to_ffi_type @return_type}"
-      if @is_callback
-        str << "  callback :#{ruby_name}, #{signature}"
-      else
-        function_description = []
-        return_value_description = []
-        current_description = function_description
-        @comment.split("\n").map do |line|
-          line = @generator.prepare_comment_line line
-          if line.gsub! /\\param (.*?) /, ''
-            index = @parameters.index { |(name, type)| name == $1 }
-            if index
-              current_description = ruby_parameters[index][2]
-            else
-              current_description << "#{$1}: "
-            end
+      ffi_signature = "[#{@parameters.map{ |(name, type)| @generator.to_ffi_type type }.join(', ')}], #{@generator.to_ffi_type @return_type}"
+      
+      function_description = []
+      return_value_description = []
+      current_description = function_description
+      @comment.split("\n").map do |line|
+        line = @generator.prepare_comment_line line
+        if line.gsub! /\\param (.*?) /, ''
+          index = @parameters.index { |(name, type)| name == $1 }
+          if index
+            current_description = ruby_parameters[index][2]
+          else
+            current_description << "#{$1}: "
           end
-          current_description = return_value_description if line.gsub! '\\returns ', ''
-          current_description << line
         end
-        
-        str << @generator.create_description_comment(function_description, '  # ')
-        str << "  # @method #{ruby_name}(#{ruby_parameters.map{ |(name, type, description)| name }.join(', ')})\n"
-        ruby_parameters.each do |(name, type, description)|
-          str << "  # @param [#{type}] #{name} #{@generator.create_description_comment(description, '  #   ', true)}\n"
-        end
-        str << "  # @return [#{@generator.to_type_name @return_type}] #{@generator.create_description_comment(return_value_description, '  #   ', true)}\n"
-        str << "  # @scope class\n"
-        str << "  attach_function :#{ruby_name}, :#{@name}, #{signature}"
+        current_description = return_value_description if line.gsub! '\\returns ', ''
+        current_description << line
+      end
+      
+      str = ""
+      if @is_callback
+        str << "  # <em>This is no real method. This entry is only for documentation of the callback.</em>\n"
+        str << "  # \n"
+      end
+      str << @generator.create_description_comment(function_description, '  # ')
+      str << "  # \n"
+      str << "  # @method #{ruby_name}#{@is_callback ? '_callback' : ''}(#{ruby_parameters.map{ |(name, type, description)| name }.join(', ')})\n"
+      ruby_parameters.each do |(name, type, description)|
+        str << "  # @param [#{type}] #{name} #{@generator.create_description_comment(description, '  #   ', true)}\n"
+      end
+      str << "  # @return [#{@generator.to_type_name @return_type}] #{@generator.create_description_comment(return_value_description, '  #   ', true)}\n"
+      str << "  # @scope class\n"
+      if @is_callback
+        str << "  callback :#{ruby_name}, #{ffi_signature}"
+      else
+        str << "  attach_function :#{ruby_name}, :#{@name}, #{ffi_signature}"
       end
       str
     end
     
-    def type_name
-      "Callback"
+    def type_name(short)
+      "Proc(#{@generator.to_ruby_lowercase @name}_callback)"
     end
     
     def reference
@@ -235,7 +250,9 @@ class FFIGen
       
       extent = Clang.get_cursor_extent declaration
       comment_range = Clang.get_range previous_declaration_end, Clang.get_range_start(extent)
-      previous_declaration_end = Clang.get_range_end extent
+      unless declaration[:kind] == :enum_decl or declaration[:kind] == :struct_decl # keep comment for typedef_decl
+        previous_declaration_end = Clang.get_range_end extent
+      end 
       
       next if not header_files.include? file
       
@@ -245,7 +262,7 @@ class FFIGen
       comment = extract_comment translation_unit, comment_range
       
       case declaration[:kind]
-      when :enum_decl
+      when :enum_decl, :struct_decl
         read_named_declaration declaration, name, comment unless name.empty?
       
       when :function_decl
@@ -302,7 +319,6 @@ class FFIGen
       previous_constant_location = Clang.get_cursor_location declaration
       Clang.get_children(declaration).each do |enum_constant|
         constant_name = Clang.get_cursor_spelling(enum_constant).to_s_and_dispose
-        constant_location = Clang.get_cursor_location enum_constant
         
         constant_value = nil
         value_cursor = Clang.get_children(enum_constant).first
@@ -319,6 +335,7 @@ class FFIGen
           next # skip those entries for now
         end
         
+        constant_location = Clang.get_cursor_location enum_constant
         constant_comment_range = Clang.get_range previous_constant_location, constant_location
         constant_comment = extract_comment translation_unit, constant_comment_range
         previous_constant_location = constant_location
@@ -327,13 +344,20 @@ class FFIGen
       end
       
     when :struct_decl
-      struct = Struct.new self, name
+      struct = Struct.new self, name, comment
       @declarations[name] = struct
       
+      previous_field_location = Clang.get_cursor_location declaration
       Clang.get_children(declaration).each do |field_decl|
         field_name = Clang.get_cursor_spelling(field_decl).to_s_and_dispose
         field_type = Clang.get_cursor_type field_decl
-        struct.fields << [field_name, field_type]
+        
+        field_location = Clang.get_cursor_location field_decl
+        field_comment_range = Clang.get_range previous_field_location, field_location
+        field_comment = extract_comment translation_unit, field_comment_range
+        previous_field_location = field_location
+        
+        struct.fields << [field_name, field_type, field_comment]
       end
     end
   end
@@ -383,10 +407,10 @@ class FFIGen
     end
   end
   
-  def to_type_name(full_type)
+  def to_type_name(full_type, short = false)
     declaration = Clang.get_type_declaration full_type
     name = Clang.get_cursor_spelling(declaration).to_s_and_dispose
-    return @declarations[name].type_name if @declarations.has_key? name
+    return @declarations[name].type_name(short) if @declarations.has_key? name
     
     canonical_type = Clang.get_canonical_type full_type
     case canonical_type[:kind]
@@ -398,13 +422,31 @@ class FFIGen
       pointee_type = Clang.get_pointee_type canonical_type
       if pointee_type[:kind] == :char_s
         "String"
-      elsif not name.empty?
-        "FFI::Pointer of #{to_ruby_camelcase name}"
       else
-        pointee_declaration = Clang.get_type_declaration full_type
-        pointee_name = Clang.get_cursor_spelling(pointee_declaration).to_s_and_dispose
-        "FFI::Pointer to #{pointee_name}"
+        pointer_depth = 0
+        pointer_target_name = ""
+        current_type = full_type
+        loop do
+          declaration = Clang.get_type_declaration current_type
+          pointer_target_name = to_ruby_camelcase Clang.get_cursor_spelling(declaration).to_s_and_dispose
+          break if not pointer_target_name.empty?
+
+          case current_type[:kind]
+          when :pointer
+            pointer_depth += 1
+            current_type = Clang.get_pointee_type current_type
+          when :unexposed
+            break
+          else
+            pointer_target_name = Clang.get_type_kind_spelling(current_type[:kind]).to_s_and_dispose
+            break
+          end
+        end
+        short ? pointer_target_name : "FFI::Pointer(#{'*' * pointer_depth}#{pointer_target_name})"
       end
+    when :constant_array
+      element_type = Clang.get_array_element_type canonical_type
+      "Array<#{to_type_name element_type}>"
     else
       raise NotImplementedError, "No type name for type #{canonical_type[:kind]}"
     end
@@ -438,12 +480,15 @@ class FFIGen
   end
   
   def create_description_comment(description, line_prefix, inline_mode = false)
+    if description.is_a? String
+      description = description.split("\n").map { |line| prepare_comment_line(line) }
+    end
+    
     description.shift while not description.empty? and description.first.strip.empty?
     description.pop while not description.empty? and description.last.strip.empty?
-    return "" if description.empty?
+    description << "(Not documented)" if not inline_mode and description.empty?
     
     str = ""
-    description << "" if not inline_mode # empty line at end
     description.each_with_index do |line, index|
       str << line_prefix if not inline_mode or index > 0
       str << line
@@ -466,6 +511,6 @@ if __FILE__ == $0
     cflags:      `llvm-config --cflags`.split(" "),
     prefixes:    ["clang_", "CX"],
     blacklist:   ["clang_getExpansionLocation"],
-    output:      "ffi_gen/clang.rb"
+    output:      File.join(File.dirname(__FILE__), "ffi_gen/clang.rb")
   )
 end

data/lib/ffi_gen/clang.rb

@@ -6,23 +6,52 @@ module Clang
   extend FFI::Library
   ffi_lib 'clang'
 
+  # A single translation unit, which resides in an index.
+  # 
+  # = Fields:
+  #
+  class TranslationUnitImpl < FFI::Struct
+  end
+
+  # Provides the contents of a file that has not yet been saved to disk.
+  # 
+  # Each CXUnsavedFile instance provides the name of a file on the
+  # system along with the current contents of that file that have not
+  # yet been saved to disk.
+  # 
+  # = Fields:
+  # :filename ::
+  #   (String) The file whose contents have not yet been saved.
+  #   
+  #   This file must already exist in the file system.
+  # :contents ::
+  #   (String) A buffer containing the unsaved contents of this file.
+  # :length ::
+  #   (Integer) The length of the unsaved contents of this buffer.
+  #
+  class UnsavedFile < FFI::Struct
+    layout :filename, :string,
+           :contents, :string,
+           :length, :ulong
+  end
+
   # Describes the availability of a particular entity, which indicates
   # whether the use of this entity will result in a warning or error due to
   # it being deprecated or unavailable.
   # 
   # === Options:
-  # :available::
+  # :available ::
   #   The entity is available.
-  # :deprecated::
+  # :deprecated ::
   #   The entity is available, but has been deprecated (and its use is
   #   not recommended).
-  # :not_available::
+  # :not_available ::
   #   The entity is not available; any use of it will be an error.
-  # :not_accessible::
+  # :not_accessible ::
   #   The entity is available, but not accessible; any use of it will be
   #   an error.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.availability_kind_enum
     [:available, :deprecated, :not_available, :not_accessible]
   end
@@ -33,6 +62,19 @@ module Clang
     :not_accessible
   ]
 
+  # A character string.
+  # 
+  # The \c CXString type is used to return strings from the interface when
+  # the ownership of that string might different from one call to the next.
+  # Use \c clang_getCString() to retrieve the string data and, once finished
+  # with the string data, call \c clang_disposeString() to free the string.
+  # 
+  # = Fields:
+  # :data ::
+  #   (FFI::Pointer(*Void)) 
+  # :private_flags ::
+  #   (Integer) 
+  #
   class String < FFI::Struct
     layout :data, :pointer,
            :private_flags, :uint
@@ -93,7 +135,7 @@ module Clang
   # @method create_index(exclude_declarations_from_pch, display_diagnostics)
   # @param [Integer] exclude_declarations_from_pch 
   # @param [Integer] display_diagnostics 
-  # @return [FFI::Pointer of Index] 
+  # @return [FFI::Pointer(Index)] 
   # @scope class
   attach_function :create_index, :clang_createIndex, [:int, :int], :pointer
 
@@ -103,7 +145,7 @@ module Clang
   # within that index have been destroyed.
   # 
   # @method dispose_index(index)
-  # @param [FFI::Pointer of Index] index 
+  # @param [FFI::Pointer(Index)] index 
   # @return [nil] 
   # @scope class
   attach_function :dispose_index, :clang_disposeIndex, [:pointer], :void
@@ -111,7 +153,7 @@ module Clang
   # Retrieve the complete file and path name of the given file.
   # 
   # @method get_file_name(s_file)
-  # @param [FFI::Pointer of File] s_file 
+  # @param [FFI::Pointer(File)] s_file 
   # @return [String] 
   # @scope class
   attach_function :get_file_name, :clang_getFileName, [:pointer], String.by_value
@@ -119,7 +161,7 @@ module Clang
   # Retrieve the last modification time of the given file.
   # 
   # @method get_file_time(s_file)
-  # @param [FFI::Pointer of File] s_file 
+  # @param [FFI::Pointer(File)] s_file 
   # @return [Integer] 
   # @scope class
   attach_function :get_file_time, :clang_getFileTime, [:pointer], :long
@@ -129,8 +171,8 @@ module Clang
   # #ifndef/#define/#endif macro guards or with #pragma once.
   # 
   # @method is_file_multiple_include_guarded(tu, file)
-  # @param [FFI::Pointer of TranslationUnit] tu 
-  # @param [FFI::Pointer of File] file 
+  # @param [FFI::Pointer(TranslationUnit)] tu 
+  # @param [FFI::Pointer(File)] file 
   # @return [Integer] 
   # @scope class
   attach_function :is_file_multiple_include_guarded, :clang_isFileMultipleIncludeGuarded, [:pointer, :pointer], :uint
@@ -138,18 +180,43 @@ module Clang
   # Retrieve a file handle within the given translation unit.
   # 
   # @method get_file(tu, file_name)
-  # @param [FFI::Pointer of TranslationUnit] tu the translation unit
+  # @param [FFI::Pointer(TranslationUnit)] tu the translation unit
   # @param [String] file_name the name of the file.
-  # @return [FFI::Pointer of File] the file handle for the named file in the translation unit \p tu,
+  # @return [FFI::Pointer(File)] the file handle for the named file in the translation unit \p tu,
   #   or a NULL file handle if the file was not a part of this translation unit.
   # @scope class
   attach_function :get_file, :clang_getFile, [:pointer, :string], :pointer
 
+  # Identifies a specific source location within a translation
+  # unit.
+  # 
+  # Use clang_getExpansionLocation() or clang_getSpellingLocation()
+  # to map a source location to a particular file, line, and column.
+  # 
+  # = Fields:
+  # :ptr_data ::
+  #   (Array<FFI::Pointer(*Void)>) 
+  # :int_data ::
+  #   (Integer) 
+  #
   class SourceLocation < FFI::Struct
     layout :ptr_data, [:pointer, 2],
            :int_data, :uint
   end
 
+  # Identifies a half-open character range in the source code.
+  # 
+  # Use clang_getRangeStart() and clang_getRangeEnd() to retrieve the
+  # starting and end locations from a source range, respectively.
+  # 
+  # = Fields:
+  # :ptr_data ::
+  #   (Array<FFI::Pointer(*Void)>) 
+  # :begin_int_data ::
+  #   (Integer) 
+  # :end_int_data ::
+  #   (Integer) 
+  #
   class SourceRange < FFI::Struct
     layout :ptr_data, [:pointer, 2],
            :begin_int_data, :uint,
@@ -179,8 +246,8 @@ module Clang
   # in a particular translation unit.
   # 
   # @method get_location(tu, file, line, column)
-  # @param [FFI::Pointer of TranslationUnit] tu 
-  # @param [FFI::Pointer of File] file 
+  # @param [FFI::Pointer(TranslationUnit)] tu 
+  # @param [FFI::Pointer(File)] file 
   # @param [Integer] line 
   # @param [Integer] column 
   # @return [SourceLocation] 
@@ -191,8 +258,8 @@ module Clang
   # in a particular translation unit.
   # 
   # @method get_location_for_offset(tu, file, offset)
-  # @param [FFI::Pointer of TranslationUnit] tu 
-  # @param [FFI::Pointer of File] file 
+  # @param [FFI::Pointer(TranslationUnit)] tu 
+  # @param [FFI::Pointer(File)] file 
   # @param [Integer] offset 
   # @return [SourceLocation] 
   # @scope class
@@ -255,16 +322,16 @@ module Clang
   # @method get_presumed_location(location, filename, line, column)
   # @param [SourceLocation] location the location within a source file that will be decomposed
   #   into its parts.
-  # @param [FFI::Pointer to ] filename (out) if non-NULL, will be set to the filename of the
+  # @param [FFI::Pointer(*String)] filename (out) if non-NULL, will be set to the filename of the
   #   source location. Note that filenames returned will be for "virtual" files,
   #   which don't necessarily exist on the machine running clang - e.g. when
   #   parsing preprocessed output obtained from a different environment. If
   #   a non-NULL value is passed in, remember to dispose of the returned value
   #   using \c clang_disposeString() once you've finished with it. For an invalid
   #   source location, an empty string is returned.
-  # @param [FFI::Pointer to ] line (out) if non-NULL, will be set to the line number of the
+  # @param [FFI::Pointer(*UInt)] line (out) if non-NULL, will be set to the line number of the
   #   source location. For an invalid source location, zero is returned.
-  # @param [FFI::Pointer to ] column (out) if non-NULL, will be set to the column number of the
+  # @param [FFI::Pointer(*UInt)] column (out) if non-NULL, will be set to the column number of the
   #   source location. For an invalid source location, zero is returned.
   # @return [nil] 
   # @scope class
@@ -279,10 +346,10 @@ module Clang
   # 
   # @method get_instantiation_location(location, file, line, column, offset)
   # @param [SourceLocation] location 
-  # @param [FFI::Pointer to ] file 
-  # @param [FFI::Pointer to ] line 
-  # @param [FFI::Pointer to ] column 
-  # @param [FFI::Pointer to ] offset 
+  # @param [FFI::Pointer(*File)] file 
+  # @param [FFI::Pointer(*UInt)] line 
+  # @param [FFI::Pointer(*UInt)] column 
+  # @param [FFI::Pointer(*UInt)] offset 
   # @return [nil] 
   # @scope class
   attach_function :get_instantiation_location, :clang_getInstantiationLocation, [SourceLocation.by_value, :pointer, :pointer, :pointer, :pointer], :void
@@ -296,13 +363,13 @@ module Clang
   # @method get_spelling_location(location, file, line, column, offset)
   # @param [SourceLocation] location the location within a source file that will be decomposed
   #   into its parts.
-  # @param [FFI::Pointer to ] file (out) if non-NULL, will be set to the file to which the given
+  # @param [FFI::Pointer(*File)] file (out) if non-NULL, will be set to the file to which the given
   #   source location points.
-  # @param [FFI::Pointer to ] line (out) if non-NULL, will be set to the line to which the given
+  # @param [FFI::Pointer(*UInt)] line (out) if non-NULL, will be set to the line to which the given
   #   source location points.
-  # @param [FFI::Pointer to ] column (out) if non-NULL, will be set to the column to which the given
+  # @param [FFI::Pointer(*UInt)] column (out) if non-NULL, will be set to the column to which the given
   #   source location points.
-  # @param [FFI::Pointer to ] offset (out) if non-NULL, will be set to the offset into the
+  # @param [FFI::Pointer(*UInt)] offset (out) if non-NULL, will be set to the offset into the
   #   buffer to which the given source location points.
   # @return [nil] 
   # @scope class
@@ -329,23 +396,23 @@ module Clang
   # Describes the severity of a particular diagnostic.
   # 
   # === Options:
-  # :ignored::
+  # :ignored ::
   #   A diagnostic that has been suppressed, e.g., by a command-line
   #   option.
-  # :note::
+  # :note ::
   #   This diagnostic is a note that should be attached to the
   #   previous (non-note) diagnostic.
-  # :warning::
+  # :warning ::
   #   This diagnostic indicates suspicious code that may not be
   #   wrong.
-  # :error::
+  # :error ::
   #   This diagnostic indicates that the code is ill-formed.
-  # :fatal::
+  # :fatal ::
   #   This diagnostic indicates that the code is ill-formed such
   #   that future parser recovery is unlikely to produce useful
   #   results.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.diagnostic_severity_enum
     [:ignored, :note, :warning, :error, :fatal]
   end
@@ -361,7 +428,7 @@ module Clang
   # translation unit.
   # 
   # @method get_num_diagnostics(unit)
-  # @param [FFI::Pointer of TranslationUnit] unit 
+  # @param [FFI::Pointer(TranslationUnit)] unit 
   # @return [Integer] 
   # @scope class
   attach_function :get_num_diagnostics, :clang_getNumDiagnostics, [:pointer], :uint
@@ -369,9 +436,9 @@ module Clang
   # Retrieve a diagnostic associated with the given translation unit.
   # 
   # @method get_diagnostic(unit, index)
-  # @param [FFI::Pointer of TranslationUnit] unit the translation unit to query.
+  # @param [FFI::Pointer(TranslationUnit)] unit the translation unit to query.
   # @param [Integer] index the zero-based diagnostic number to retrieve.
-  # @return [FFI::Pointer of Diagnostic] the requested diagnostic. This diagnostic must be freed
+  # @return [FFI::Pointer(Diagnostic)] the requested diagnostic. This diagnostic must be freed
   #   via a call to \c clang_disposeDiagnostic().
   # @scope class
   attach_function :get_diagnostic, :clang_getDiagnostic, [:pointer, :uint], :pointer
@@ -379,7 +446,7 @@ module Clang
   # Destroy a diagnostic.
   # 
   # @method dispose_diagnostic(diagnostic)
-  # @param [FFI::Pointer of Diagnostic] diagnostic 
+  # @param [FFI::Pointer(Diagnostic)] diagnostic 
   # @return [nil] 
   # @scope class
   attach_function :dispose_diagnostic, :clang_disposeDiagnostic, [:pointer], :void
@@ -390,7 +457,7 @@ module Clang
   # behavior of \c clang_displayDiagnostic().
   # 
   # === Options:
-  # :display_source_location::
+  # :display_source_location ::
   #   Display the source-location information where the
   #   diagnostic was located.
   #   
@@ -402,38 +469,38 @@ module Clang
   #   \endcode
   #   
   #   This option corresponds to the clang flag \c -fshow-source-location.
-  # :display_column::
+  # :display_column ::
   #   If displaying the source-location information of the
   #   diagnostic, also include the column number.
   #   
   #   This option corresponds to the clang flag \c -fshow-column.
-  # :display_source_ranges::
+  # :display_source_ranges ::
   #   If displaying the source-location information of the
   #   diagnostic, also include information about source ranges in a
   #   machine-parsable format.
   #   
   #   This option corresponds to the clang flag
   #   \c -fdiagnostics-print-source-range-info.
-  # :display_option::
+  # :display_option ::
   #   Display the option name associated with this diagnostic, if any.
   #   
   #   The option name displayed (e.g., -Wconversion) will be placed in brackets
   #   after the diagnostic text. This option corresponds to the clang flag
   #   \c -fdiagnostics-show-option.
-  # :display_category_id::
+  # :display_category_id ::
   #   Display the category number associated with this diagnostic, if any.
   #   
   #   The category number is displayed within brackets after the diagnostic text.
   #   This option corresponds to the clang flag 
   #   \c -fdiagnostics-show-category=id.
-  # :display_category_name::
+  # :display_category_name ::
   #   Display the category name associated with this diagnostic, if any.
   #   
   #   The category name is displayed within brackets after the diagnostic text.
   #   This option corresponds to the clang flag 
   #   \c -fdiagnostics-show-category=name.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.diagnostic_display_options_enum
     [:display_source_location, :display_column, :display_source_ranges, :display_option, :display_category_id, :display_category_name]
   end
@@ -454,7 +521,7 @@ module Clang
   # options that most closely mimics the behavior of the clang compiler.
   # 
   # @method format_diagnostic(diagnostic, options)
-  # @param [FFI::Pointer of Diagnostic] diagnostic The diagnostic to print.
+  # @param [FFI::Pointer(Diagnostic)] diagnostic The diagnostic to print.
   # @param [Integer] options A set of options that control the diagnostic display,
   #   created by combining \c CXDiagnosticDisplayOptions values.
   # @return [String] A new string containing for formatted diagnostic.
@@ -473,7 +540,7 @@ module Clang
   # Determine the severity of the given diagnostic.
   # 
   # @method get_diagnostic_severity(diagnostic)
-  # @param [FFI::Pointer of Diagnostic] diagnostic 
+  # @param [FFI::Pointer(Diagnostic)] diagnostic 
   # @return [Symbol from diagnostic_severity_enum] 
   # @scope class
   attach_function :get_diagnostic_severity, :clang_getDiagnosticSeverity, [:pointer], :diagnostic_severity
@@ -484,7 +551,7 @@ module Clang
   # displaying the diagnostic on the command line.
   # 
   # @method get_diagnostic_location(diagnostic)
-  # @param [FFI::Pointer of Diagnostic] diagnostic 
+  # @param [FFI::Pointer(Diagnostic)] diagnostic 
   # @return [SourceLocation] 
   # @scope class
   attach_function :get_diagnostic_location, :clang_getDiagnosticLocation, [:pointer], SourceLocation.by_value
@@ -492,7 +559,7 @@ module Clang
   # Retrieve the text of the given diagnostic.
   # 
   # @method get_diagnostic_spelling(diagnostic)
-  # @param [FFI::Pointer of Diagnostic] diagnostic 
+  # @param [FFI::Pointer(Diagnostic)] diagnostic 
   # @return [String] 
   # @scope class
   attach_function :get_diagnostic_spelling, :clang_getDiagnosticSpelling, [:pointer], String.by_value
@@ -501,8 +568,8 @@ module Clang
   # diagnostic.
   # 
   # @method get_diagnostic_option(diag, disable)
-  # @param [FFI::Pointer of Diagnostic] diag The diagnostic to be queried.
-  # @param [FFI::Pointer to ] disable If non-NULL, will be set to the option that disables this
+  # @param [FFI::Pointer(Diagnostic)] diag The diagnostic to be queried.
+  # @param [FFI::Pointer(*String)] disable If non-NULL, will be set to the option that disables this
   #   diagnostic (if any).
   # @return [String] A string that contains the command-line option used to enable this
   #   warning, such as "-Wconversion" or "-pedantic". 
@@ -516,7 +583,7 @@ module Clang
   # retrieves the category number for the given diagnostic.
   # 
   # @method get_diagnostic_category(diagnostic)
-  # @param [FFI::Pointer of Diagnostic] diagnostic 
+  # @param [FFI::Pointer(Diagnostic)] diagnostic 
   # @return [Integer] The number of the category that contains this diagnostic, or zero
   #   if this diagnostic is uncategorized.
   # @scope class
@@ -535,7 +602,7 @@ module Clang
   # diagnostic.
   # 
   # @method get_diagnostic_num_ranges(diagnostic)
-  # @param [FFI::Pointer of Diagnostic] diagnostic 
+  # @param [FFI::Pointer(Diagnostic)] diagnostic 
   # @return [Integer] 
   # @scope class
   attach_function :get_diagnostic_num_ranges, :clang_getDiagnosticNumRanges, [:pointer], :uint
@@ -547,7 +614,7 @@ module Clang
   # underlining them with '~' characters.
   # 
   # @method get_diagnostic_range(diagnostic, range)
-  # @param [FFI::Pointer of Diagnostic] diagnostic the diagnostic whose range is being extracted.
+  # @param [FFI::Pointer(Diagnostic)] diagnostic the diagnostic whose range is being extracted.
   # @param [Integer] range the zero-based index specifying which range to
   # @return [SourceRange] the requested source range.
   # @scope class
@@ -557,7 +624,7 @@ module Clang
   # given diagnostic.
   # 
   # @method get_diagnostic_num_fix_its(diagnostic)
-  # @param [FFI::Pointer of Diagnostic] diagnostic 
+  # @param [FFI::Pointer(Diagnostic)] diagnostic 
   # @return [Integer] 
   # @scope class
   attach_function :get_diagnostic_num_fix_its, :clang_getDiagnosticNumFixIts, [:pointer], :uint
@@ -575,9 +642,9 @@ module Clang
   # insert).
   # 
   # @method get_diagnostic_fix_it(diagnostic, fix_it, replacement_range)
-  # @param [FFI::Pointer of Diagnostic] diagnostic The diagnostic whose fix-its are being queried.
+  # @param [FFI::Pointer(Diagnostic)] diagnostic The diagnostic whose fix-its are being queried.
   # @param [Integer] fix_it The zero-based index of the fix-it.
-  # @param [FFI::Pointer to ] replacement_range The source range whose contents will be
+  # @param [FFI::Pointer(*SourceRange)] replacement_range The source range whose contents will be
   #   replaced with the returned replacement string. Note that source
   #   ranges are half-open ranges (a, b), so the source code should be
   #   replaced from a and up to (but not including) b.
@@ -589,7 +656,7 @@ module Clang
   # Get the original translation unit source file name.
   # 
   # @method get_translation_unit_spelling(ct_unit)
-  # @param [FFI::Pointer of TranslationUnit] ct_unit 
+  # @param [FFI::Pointer(TranslationUnit)] ct_unit 
   # @return [String] 
   # @scope class
   attach_function :get_translation_unit_spelling, :clang_getTranslationUnitSpelling, [:pointer], String.by_value
@@ -610,34 +677,34 @@ module Clang
   #   '-o <output file>'  (both '-o' and '<output file>' are ignored)
   # 
   # @method create_translation_unit_from_source_file(c_idx, source_filename, num_clang_command_line_args, command_line_args, num_unsaved_files, unsaved_files)
-  # @param [FFI::Pointer of Index] c_idx The index object with which the translation unit will be
+  # @param [FFI::Pointer(Index)] c_idx The index object with which the translation unit will be
   #   associated.
   # @param [String] source_filename - The name of the source file to load, or NULL if the
   #   source file is included in \p clang_command_line_args.
   # @param [Integer] num_clang_command_line_args The number of command-line arguments in
   #   \p clang_command_line_args.
-  # @param [FFI::Pointer to ] command_line_args The command-line arguments that would be
+  # @param [FFI::Pointer(**Char_S)] command_line_args The command-line arguments that would be
   #   passed to the \c clang executable if it were being invoked out-of-process.
   #   These command-line options will be parsed and will affect how the translation
   #   unit is parsed. Note that the following options are ignored: '-c',
   #   '-emit-ast', '-fsyntex-only' (which is the default), and '-o <output file>'.
   # @param [Integer] num_unsaved_files the number of unsaved file entries in \p
   #   unsaved_files.
-  # @param [FFI::Pointer to ] unsaved_files the files that have not yet been saved to disk
+  # @param [FFI::Pointer(*UnsavedFile)] unsaved_files the files that have not yet been saved to disk
   #   but may be required for code completion, including the contents of
   #   those files.  The contents and name of these files (as specified by
   #   CXUnsavedFile) are copied when necessary, so the client only needs to
   #   guarantee their validity until the call to this function returns.
-  # @return [FFI::Pointer of TranslationUnit] 
+  # @return [FFI::Pointer(TranslationUnit)] 
   # @scope class
   attach_function :create_translation_unit_from_source_file, :clang_createTranslationUnitFromSourceFile, [:pointer, :string, :int, :pointer, :uint, :pointer], :pointer
 
   # Create a translation unit from an AST file (-emit-ast).
   # 
   # @method create_translation_unit(index, ast_filename)
-  # @param [FFI::Pointer of Index] index 
+  # @param [FFI::Pointer(Index)] index 
   # @param [String] ast_filename 
-  # @return [FFI::Pointer of TranslationUnit] 
+  # @return [FFI::Pointer(TranslationUnit)] 
   # @scope class
   attach_function :create_translation_unit, :clang_createTranslationUnit, [:pointer, :string], :pointer
 
@@ -648,10 +715,10 @@ module Clang
   # constructing the translation unit.
   # 
   # === Options:
-  # :none::
+  # :none ::
   #   Used to indicate that no special translation-unit options are
   #   needed.
-  # :detailed_preprocessing_record::
+  # :detailed_preprocessing_record ::
   #   Used to indicate that the parser should construct a "detailed"
   #   preprocessing record, including all macro definitions and instantiations.
   #   
@@ -660,7 +727,7 @@ module Clang
   #   is usually not retained. However, it can be useful for
   #   applications that require more detailed information about the
   #   behavior of the preprocessor.
-  # :incomplete::
+  # :incomplete ::
   #   Used to indicate that the translation unit is incomplete.
   #   
   #   When a translation unit is considered "incomplete", semantic
@@ -670,7 +737,7 @@ module Clang
   #   instantiation of implicitly-instantiation function templates in
   #   C++. This option is typically used when parsing a header with the
   #   intent of producing a precompiled header.
-  # :precompiled_preamble::
+  # :precompiled_preamble ::
   #   Used to indicate that the translation unit should be built with an 
   #   implicit precompiled header for the preamble.
   #   
@@ -683,24 +750,24 @@ module Clang
   #   preamble or the files in it have not changed, \c
   #   clang_reparseTranslationUnit() will re-use the implicit
   #   precompiled header to improve parsing performance.
-  # :cache_completion_results::
+  # :cache_completion_results ::
   #   Used to indicate that the translation unit should cache some
   #   code-completion results with each reparse of the source file.
   #   
   #   Caching of code-completion results is a performance optimization that
   #   introduces some overhead to reparsing but improves the performance of
   #   code-completion operations.
-  # :x_precompiled_preamble::
+  # :x_precompiled_preamble ::
   #   DEPRECATED: Enable precompiled preambles in C++.
   #   
   #   Note: this is a *temporary* option that is available only while
   #   we are testing C++ precompiled preamble support. It is deprecated.
-  # :x_chained_pch::
+  # :x_chained_pch ::
   #   DEPRECATED: Enabled chained precompiled preambles in C++.
   #   
   #   Note: this is a *temporary* option that is available only while
   #   we are testing C++ precompiled preamble support. It is deprecated.
-  # :nested_macro_expansions::
+  # :nested_macro_expansions ::
   #   Used to indicate that the "detailed" preprocessing record,
   #   if requested, should also contain nested macro expansions.
   #   
@@ -709,7 +776,7 @@ module Clang
   #   a large amount of storage to due preprocessor metaprogramming. Moreover,
   #   its fairly rare that this information is useful for libclang clients.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.translation_unit_flags_enum
     [:none, :detailed_preprocessing_record, :incomplete, :precompiled_preamble, :cache_completion_results, :x_precompiled_preamble, :x_chained_pch, :nested_macro_expansions]
   end
@@ -750,18 +817,18 @@ module Clang
   # way that the compiler is configured on the command line.
   # 
   # @method parse_translation_unit(c_idx, source_filename, command_line_args, num_command_line_args, unsaved_files, num_unsaved_files, options)
-  # @param [FFI::Pointer of Index] c_idx The index object with which the translation unit will be 
+  # @param [FFI::Pointer(Index)] c_idx The index object with which the translation unit will be 
   #   associated.
   # @param [String] source_filename The name of the source file to load, or NULL if the
   #   source file is included in \p command_line_args.
-  # @param [FFI::Pointer to ] command_line_args The command-line arguments that would be
+  # @param [FFI::Pointer(**Char_S)] command_line_args The command-line arguments that would be
   #   passed to the \c clang executable if it were being invoked out-of-process.
   #   These command-line options will be parsed and will affect how the translation
   #   unit is parsed. Note that the following options are ignored: '-c', 
   #   '-emit-ast', '-fsyntex-only' (which is the default), and '-o <output file>'.
   # @param [Integer] num_command_line_args The number of command-line arguments in
   #   \p command_line_args.
-  # @param [FFI::Pointer to ] unsaved_files the files that have not yet been saved to disk
+  # @param [FFI::Pointer(*UnsavedFile)] unsaved_files the files that have not yet been saved to disk
   #   but may be required for parsing, including the contents of
   #   those files.  The contents and name of these files (as specified by
   #   CXUnsavedFile) are copied when necessary, so the client only needs to
@@ -771,7 +838,7 @@ module Clang
   # @param [Integer] options A bitmask of options that affects how the translation unit
   #   is managed but not its compilation. This should be a bitwise OR of the
   #   CXTranslationUnit_XXX flags.
-  # @return [FFI::Pointer of TranslationUnit] A new translation unit describing the parsed code and containing
+  # @return [FFI::Pointer(TranslationUnit)] A new translation unit describing the parsed code and containing
   #   any diagnostics produced by the compiler. If there is a failure from which
   #   the compiler cannot recover, returns NULL.
   # @scope class
@@ -784,10 +851,10 @@ module Clang
   # saving the translation unit.
   # 
   # === Options:
-  # :save_translation_unit_none::
+  # :save_translation_unit_none ::
   #   Used to indicate that no special saving options are needed.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.save_translation_unit_flags_enum
     [:save_translation_unit_none]
   end
@@ -804,7 +871,7 @@ module Clang
   # the most commonly-requested data.
   # 
   # @method default_save_options(tu)
-  # @param [FFI::Pointer of TranslationUnit] tu 
+  # @param [FFI::Pointer(TranslationUnit)] tu 
   # @return [Integer] 
   # @scope class
   attach_function :default_save_options, :clang_defaultSaveOptions, [:pointer], :uint
@@ -813,25 +880,25 @@ module Clang
   # \c clang_saveTranslationUnit().
   # 
   # === Options:
-  # :none::
+  # :none ::
   #   Indicates that no error occurred while saving a translation unit.
-  # :unknown::
+  # :unknown ::
   #   Indicates that an unknown error occurred while attempting to save
   #   the file.
   #   
   #   This error typically indicates that file I/O failed when attempting to 
   #   write the file.
-  # :translation_errors::
+  # :translation_errors ::
   #   Indicates that errors during translation prevented this attempt
   #   to save the translation unit.
   #   
   #   Errors that prevent the translation unit from being saved can be
   #   extracted using \c clang_getNumDiagnostics() and \c clang_getDiagnostic().
-  # :invalid_tu::
+  # :invalid_tu ::
   #   Indicates that the translation unit to be saved was somehow
   #   invalid (e.g., NULL).
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.save_error_enum
     [:none, :unknown, :translation_errors, :invalid_tu]
   end
@@ -853,7 +920,7 @@ module Clang
   # units.
   # 
   # @method save_translation_unit(tu, file_name, options)
-  # @param [FFI::Pointer of TranslationUnit] tu The translation unit to save.
+  # @param [FFI::Pointer(TranslationUnit)] tu The translation unit to save.
   # @param [String] file_name The file to which the translation unit will be saved.
   # @param [Integer] options A bitmask of options that affects how the translation unit
   #   is saved. This should be a bitwise OR of the
@@ -867,7 +934,7 @@ module Clang
   # Destroy the specified CXTranslationUnit object.
   # 
   # @method dispose_translation_unit(translation_unit)
-  # @param [FFI::Pointer of TranslationUnit] translation_unit 
+  # @param [FFI::Pointer(TranslationUnit)] translation_unit 
   # @return [nil] 
   # @scope class
   attach_function :dispose_translation_unit, :clang_disposeTranslationUnit, [:pointer], :void
@@ -879,10 +946,10 @@ module Clang
   # reparsing the translation unit.
   # 
   # === Options:
-  # :reparse_none::
+  # :reparse_none ::
   #   Used to indicate that no special reparsing options are needed.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.reparse_flags_enum
     [:reparse_none]
   end
@@ -900,7 +967,7 @@ module Clang
   # to the next.
   # 
   # @method default_reparse_options(tu)
-  # @param [FFI::Pointer of TranslationUnit] tu 
+  # @param [FFI::Pointer(TranslationUnit)] tu 
   # @return [Integer] 
   # @scope class
   attach_function :default_reparse_options, :clang_defaultReparseOptions, [:pointer], :uint
@@ -921,12 +988,12 @@ module Clang
   # unit using this routine.
   # 
   # @method reparse_translation_unit(tu, num_unsaved_files, unsaved_files, options)
-  # @param [FFI::Pointer of TranslationUnit] tu The translation unit whose contents will be re-parsed. The
+  # @param [FFI::Pointer(TranslationUnit)] tu The translation unit whose contents will be re-parsed. The
   #   translation unit must originally have been built with 
   #   \c clang_createTranslationUnitFromSourceFile().
   # @param [Integer] num_unsaved_files The number of unsaved file entries in \p
   #   unsaved_files.
-  # @param [FFI::Pointer to ] unsaved_files The files that have not yet been saved to disk
+  # @param [FFI::Pointer(*UnsavedFile)] unsaved_files The files that have not yet been saved to disk
   #   but may be required for parsing, including the contents of
   #   those files.  The contents and name of these files (as specified by
   #   CXUnsavedFile) are copied when necessary, so the client only needs to
@@ -944,36 +1011,36 @@ module Clang
   # Categorizes how memory is being used by a translation unit.
   # 
   # === Options:
-  # :ast::
+  # :ast ::
   #   
-  # :identifiers::
+  # :identifiers ::
   #   
-  # :selectors::
+  # :selectors ::
   #   
-  # :global_completion_results::
+  # :global_completion_results ::
   #   
-  # :source_manager_content_cache::
+  # :source_manager_content_cache ::
   #   
-  # :ast_side_tables::
+  # :ast_side_tables ::
   #   
-  # :source_manager_membuffer_malloc::
+  # :source_manager_membuffer_malloc ::
   #   
-  # :source_manager_membuffer_m_map::
+  # :source_manager_membuffer_m_map ::
   #   
-  # :external_ast_source_membuffer_malloc::
+  # :external_ast_source_membuffer_malloc ::
   #   
-  # :external_ast_source_membuffer_m_map::
+  # :external_ast_source_membuffer_m_map ::
   #   
-  # :preprocessor::
+  # :preprocessor ::
   #   
-  # :preprocessing_record::
+  # :preprocessing_record ::
   #   
-  # :source_manager_data_structures::
+  # :source_manager_data_structures ::
   #   
-  # :preprocessor_header_search::
+  # :preprocessor_header_search ::
   #   
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.tu_resource_usage_kind_enum
     [:ast, :identifiers, :selectors, :global_completion_results, :source_manager_content_cache, :ast_side_tables, :source_manager_membuffer_malloc, :source_manager_membuffer_m_map, :external_ast_source_membuffer_malloc, :external_ast_source_membuffer_m_map, :preprocessor, :preprocessing_record, :source_manager_data_structures, :preprocessor_header_search]
   end
@@ -1003,11 +1070,31 @@ module Clang
   # @scope class
   attach_function :get_tu_resource_usage_name, :clang_getTUResourceUsageName, [:tu_resource_usage_kind], :string
 
+  # (Not documented)
+  # 
+  # = Fields:
+  # :kind ::
+  #   (Symbol from tu_resource_usage_kind_enum) The memory usage category.
+  # :amount ::
+  #   (Integer) Amount of resources used. 
+  #         The units will depend on the resource kind.
+  #
   class TUResourceUsageEntry < FFI::Struct
     layout :kind, :tu_resource_usage_kind,
            :amount, :ulong
   end
 
+  # The memory usage of a CXTranslationUnit, broken into categories.
+  # 
+  # = Fields:
+  # :data ::
+  #   (FFI::Pointer(*Void)) Private data member, used for queries.
+  # :num_entries ::
+  #   (Integer) The number of entries in the 'entries' array.
+  # :entries ::
+  #   (FFI::Pointer(*TUResourceUsageEntry)) An array of key-value pairs, representing the breakdown of memory
+  #               usage.
+  #
   class TUResourceUsage < FFI::Struct
     layout :data, :pointer,
            :num_entries, :uint,
@@ -1018,11 +1105,13 @@ module Clang
   #  should be released with clang_disposeCXTUResourceUsage().
   # 
   # @method get_cxtu_resource_usage(tu)
-  # @param [FFI::Pointer of TranslationUnit] tu 
+  # @param [FFI::Pointer(TranslationUnit)] tu 
   # @return [TUResourceUsage] 
   # @scope class
   attach_function :get_cxtu_resource_usage, :clang_getCXTUResourceUsage, [:pointer], TUResourceUsage.by_value
 
+  # (Not documented)
+  # 
   # @method dispose_cxtu_resource_usage(usage)
   # @param [TUResourceUsage] usage 
   # @return [nil] 
@@ -1032,7 +1121,7 @@ module Clang
   # Describes the kind of entity that a cursor refers to.
   # 
   # === Options:
-  # :unexposed_decl::
+  # :unexposed_decl ::
   #   A declaration whose specific kind is not exposed via this
   #   interface.
   #   
@@ -1040,92 +1129,92 @@ module Clang
   #   of declaration; one can extract their location information,
   #   spelling, find their definitions, etc. However, the specific kind
   #   of the declaration is not reported.
-  # :struct_decl::
+  # :struct_decl ::
   #   A C or C++ struct.
-  # :union_decl::
+  # :union_decl ::
   #   A C or C++ union.
-  # :class_decl::
+  # :class_decl ::
   #   A C++ class.
-  # :enum_decl::
+  # :enum_decl ::
   #   An enumeration.
-  # :field_decl::
+  # :field_decl ::
   #   A field (in C) or non-static data member (in C++) in a
   #   struct, union, or C++ class.
-  # :enum_constant_decl::
+  # :enum_constant_decl ::
   #   An enumerator constant.
-  # :function_decl::
+  # :function_decl ::
   #   A function.
-  # :var_decl::
+  # :var_decl ::
   #   A variable.
-  # :parm_decl::
+  # :parm_decl ::
   #   A function or method parameter.
-  # :obj_c_interface_decl::
+  # :obj_c_interface_decl ::
   #   An Objective-C @interface.
-  # :obj_c_category_decl::
+  # :obj_c_category_decl ::
   #   An Objective-C @interface for a category.
-  # :obj_c_protocol_decl::
+  # :obj_c_protocol_decl ::
   #   An Objective-C @protocol declaration.
-  # :obj_c_property_decl::
+  # :obj_c_property_decl ::
   #   An Objective-C @property declaration.
-  # :obj_c_ivar_decl::
+  # :obj_c_ivar_decl ::
   #   An Objective-C instance variable.
-  # :obj_c_instance_method_decl::
+  # :obj_c_instance_method_decl ::
   #   An Objective-C instance method.
-  # :obj_c_class_method_decl::
+  # :obj_c_class_method_decl ::
   #   An Objective-C class method.
-  # :obj_c_implementation_decl::
+  # :obj_c_implementation_decl ::
   #   An Objective-C @implementation.
-  # :obj_c_category_impl_decl::
+  # :obj_c_category_impl_decl ::
   #   An Objective-C @implementation for a category.
-  # :typedef_decl::
+  # :typedef_decl ::
   #   A typedef
-  # :x_method::
+  # :x_method ::
   #   A C++ class method.
-  # :namespace::
+  # :namespace ::
   #   A C++ namespace.
-  # :linkage_spec::
+  # :linkage_spec ::
   #   A linkage specification, e.g. 'extern "C"'.
-  # :constructor::
+  # :constructor ::
   #   A C++ constructor.
-  # :destructor::
+  # :destructor ::
   #   A C++ destructor.
-  # :conversion_function::
+  # :conversion_function ::
   #   A C++ conversion function.
-  # :template_type_parameter::
+  # :template_type_parameter ::
   #   A C++ template type parameter.
-  # :non_type_template_parameter::
+  # :non_type_template_parameter ::
   #   A C++ non-type template parameter.
-  # :template_template_parameter::
+  # :template_template_parameter ::
   #   A C++ template template parameter.
-  # :function_template::
+  # :function_template ::
   #   A C++ function template.
-  # :class_template::
+  # :class_template ::
   #   A C++ class template.
-  # :class_template_partial_specialization::
+  # :class_template_partial_specialization ::
   #   A C++ class template partial specialization.
-  # :namespace_alias::
+  # :namespace_alias ::
   #   A C++ namespace alias declaration.
-  # :using_directive::
+  # :using_directive ::
   #   A C++ using directive.
-  # :using_declaration::
+  # :using_declaration ::
   #   A C++ using declaration.
-  # :type_alias_decl::
+  # :type_alias_decl ::
   #   A C++ alias declaration
-  # :obj_c_synthesize_decl::
+  # :obj_c_synthesize_decl ::
   #   An Objective-C @synthesize definition.
-  # :obj_c_dynamic_decl::
+  # :obj_c_dynamic_decl ::
   #   An Objective-C @dynamic definition.
-  # :x_access_specifier::
+  # :x_access_specifier ::
   #   An access specifier.
-  # :first_ref::
+  # :first_ref ::
   #   References
-  # :obj_c_super_class_ref::
+  # :obj_c_super_class_ref ::
   #   Decl references
-  # :obj_c_protocol_ref::
+  # :obj_c_protocol_ref ::
   #   
-  # :obj_c_class_ref::
+  # :obj_c_class_ref ::
   #   
-  # :type_ref::
+  # :type_ref ::
   #   A reference to a type declaration.
   #   
   #   A type reference occurs anywhere where a type is named but not
@@ -1139,17 +1228,17 @@ module Clang
   #   The typedef is a declaration of size_type (CXCursor_TypedefDecl),
   #   while the type of the variable "size" is referenced. The cursor
   #   referenced by the type of size is the typedef for size_type.
-  # :x_base_specifier::
+  # :x_base_specifier ::
   #   
-  # :template_ref::
+  # :template_ref ::
   #   A reference to a class template, function template, template
   #   template parameter, or class template partial specialization.
-  # :namespace_ref::
+  # :namespace_ref ::
   #   A reference to a namespace or namespace alias.
-  # :member_ref::
+  # :member_ref ::
   #   A reference to a member of a struct, union, or class that occurs in 
   #   some non-expression context, e.g., a designated initializer.
-  # :label_ref::
+  # :label_ref ::
   #   A reference to a labeled statement.
   #   
   #   This cursor kind is used to describe the jump to "start_over" in the 
@@ -1163,7 +1252,7 @@ module Clang
   #   \endcode
   #   
   #   A label reference cursor refers to a label statement.
-  # :overloaded_decl_ref::
+  # :overloaded_decl_ref ::
   #   A reference to a set of overloaded functions or function templates
   #   that has not yet been resolved to a specific function or function template.
   #   
@@ -1198,19 +1287,19 @@ module Clang
   #   The functions \c clang_getNumOverloadedDecls() and 
   #   \c clang_getOverloadedDecl() can be used to retrieve the definitions
   #   referenced by this cursor.
-  # :first_invalid::
+  # :first_invalid ::
   #   Error conditions
-  # :invalid_file::
+  # :invalid_file ::
   #   
-  # :no_decl_found::
+  # :no_decl_found ::
   #   
-  # :not_implemented::
+  # :not_implemented ::
   #   
-  # :invalid_code::
+  # :invalid_code ::
   #   
-  # :first_expr::
+  # :first_expr ::
   #   Expressions
-  # :unexposed_expr::
+  # :unexposed_expr ::
   #   An expression whose specific kind is not exposed via this
   #   interface.
   #   
@@ -1218,61 +1307,61 @@ module Clang
   #   of expression; one can extract their location information,
   #   spelling, children, etc. However, the specific kind of the
   #   expression is not reported.
-  # :decl_ref_expr::
+  # :decl_ref_expr ::
   #   An expression that refers to some value declaration, such
   #   as a function, varible, or enumerator.
-  # :member_ref_expr::
+  # :member_ref_expr ::
   #   An expression that refers to a member of a struct, union,
   #   class, Objective-C class, etc.
-  # :call_expr::
+  # :call_expr ::
   #   An expression that calls a function.
-  # :obj_c_message_expr::
+  # :obj_c_message_expr ::
   #   An expression that sends a message to an Objective-C
   #      object or class.
-  # :block_expr::
+  # :block_expr ::
   #   An expression that represents a block literal.
-  # :integer_literal::
+  # :integer_literal ::
   #   An integer literal.
-  # :floating_literal::
+  # :floating_literal ::
   #   A floating point number literal.
-  # :imaginary_literal::
+  # :imaginary_literal ::
   #   An imaginary number literal.
-  # :string_literal::
+  # :string_literal ::
   #   A string literal.
-  # :character_literal::
+  # :character_literal ::
   #   A character literal.
-  # :paren_expr::
+  # :paren_expr ::
   #   A parenthesized expression, e.g. "(1)".
   #   
   #   This AST node is only formed if full location information is requested.
-  # :unary_operator::
+  # :unary_operator ::
   #   This represents the unary-expression's (except sizeof and
   #   alignof).
-  # :array_subscript_expr::
+  # :array_subscript_expr ::
   #   (C99 6.5.2.1) Array Subscripting.
-  # :binary_operator::
+  # :binary_operator ::
   #   A builtin binary operation expression such as "x + y" or
   #   "x <= y".
-  # :compound_assign_operator::
+  # :compound_assign_operator ::
   #   Compound assignment such as "+=".
-  # :conditional_operator::
+  # :conditional_operator ::
   #   The ?: ternary operator.
-  # :c_style_cast_expr::
+  # :c_style_cast_expr ::
   #   An explicit cast in C (C99 6.5.4) or a C-style cast in C++
   #   (C++ (expr.cast)), which uses the syntax (Type)expr.
   #   
   #   For example: (int)f.
-  # :compound_literal_expr::
+  # :compound_literal_expr ::
   #   (C99 6.5.2.5)
-  # :init_list_expr::
+  # :init_list_expr ::
   #   Describes an C or C++ initializer list.
-  # :addr_label_expr::
+  # :addr_label_expr ::
   #   The GNU address of label extension, representing &&label.
-  # :stmt_expr::
+  # :stmt_expr ::
   #   This is the GNU Statement Expression extension: ({int X=4; X;})
-  # :generic_selection_expr::
+  # :generic_selection_expr ::
   #   Represents a C1X generic selection.
-  # :gnu_null_expr::
+  # :gnu_null_expr ::
   #   Implements the GNU __null extension, which is a name for a null
   #   pointer constant that has integral type (e.g., int or long) and is the same
   #   size and alignment as a pointer.
@@ -1280,15 +1369,15 @@ module Clang
   #   The __null extension is typically only used by system headers, which define
   #   NULL as __null in C++ rather than using 0 (which is an integer that may not
   #   match the size of a pointer).
-  # :x_static_cast_expr::
+  # :x_static_cast_expr ::
   #   C++'s static_cast<> expression.
-  # :x_dynamic_cast_expr::
+  # :x_dynamic_cast_expr ::
   #   C++'s dynamic_cast<> expression.
-  # :x_reinterpret_cast_expr::
+  # :x_reinterpret_cast_expr ::
   #   C++'s reinterpret_cast<> expression.
-  # :x_const_cast_expr::
+  # :x_const_cast_expr ::
   #   C++'s const_cast<> expression.
-  # :x_functional_cast_expr::
+  # :x_functional_cast_expr ::
   #   Represents an explicit C++ type conversion that uses "functional"
   #   notion (C++ (expr.type.conv)).
   #   
@@ -1296,43 +1385,43 @@ module Clang
   #   \code
   #     x = int(0.5);
   #   \endcode
-  # :x_typeid_expr::
+  # :x_typeid_expr ::
   #   A C++ typeid expression (C++ (expr.typeid)).
-  # :x_bool_literal_expr::
+  # :x_bool_literal_expr ::
   #   (C++ 2.13.5) C++ Boolean Literal.
-  # :x_null_ptr_literal_expr::
+  # :x_null_ptr_literal_expr ::
   #   (C++0x 2.14.7) C++ Pointer Literal.
-  # :x_this_expr::
+  # :x_this_expr ::
   #   Represents the "this" expression in C++
-  # :x_throw_expr::
+  # :x_throw_expr ::
   #   (C++ 15) C++ Throw Expression.
   #   
   #   This handles 'throw' and 'throw' assignment-expression. When
   #   assignment-expression isn't present, Op will be null.
-  # :x_new_expr::
+  # :x_new_expr ::
   #   A new expression for memory allocation and constructor calls, e.g:
   #   "new CXXNewExpr(foo)".
-  # :x_delete_expr::
+  # :x_delete_expr ::
   #   A delete expression for memory deallocation and destructor calls,
   #   e.g. "delete() pArray".
-  # :unary_expr::
+  # :unary_expr ::
   #   A unary expression.
-  # :obj_c_string_literal::
+  # :obj_c_string_literal ::
   #   ObjCStringLiteral, used for Objective-C string literals i.e. "foo".
-  # :obj_c_encode_expr::
+  # :obj_c_encode_expr ::
   #   ObjCEncodeExpr, used for in Objective-C.
-  # :obj_c_selector_expr::
+  # :obj_c_selector_expr ::
   #   ObjCSelectorExpr used for in Objective-C.
-  # :obj_c_protocol_expr::
+  # :obj_c_protocol_expr ::
   #   Objective-C's protocol expression.
-  # :obj_c_bridged_cast_expr::
+  # :obj_c_bridged_cast_expr ::
   #   An Objective-C "bridged" cast expression, which casts between
   #   Objective-C pointers and C pointers, transferring ownership in the process.
   #   
   #   \code
   #     NSString *str = (__bridge_transfer NSString *)CFCreateString();
   #   \endcode
-  # :pack_expansion_expr::
+  # :pack_expansion_expr ::
   #   Represents a C++0x pack expansion that produces a sequence of
   #   expressions.
   #   
@@ -1345,7 +1434,7 @@ module Clang
   #    f(static_cast<Types&&>(args)...);
   #   }
   #   \endcode
-  # :size_of_pack_expr::
+  # :size_of_pack_expr ::
   #   Represents an expression that computes the length of a parameter
   #   pack.
   #   
@@ -1355,9 +1444,9 @@ module Clang
   #     static const unsigned value = sizeof...(Types);
   #   };
   #   \endcode
-  # :first_stmt::
+  # :first_stmt ::
   #   Statements
-  # :unexposed_stmt::
+  # :unexposed_stmt ::
   #   A statement whose specific kind is not exposed via this
   #   interface.
   #   
@@ -1365,7 +1454,7 @@ module Clang
   #   statement; one can extract their location information, spelling,
   #   children, etc. However, the specific kind of the statement is not
   #   reported.
-  # :label_stmt::
+  # :label_stmt ::
   #   A labelled statement in a function. 
   #   
   #   This cursor kind is used to describe the "start_over:" label statement in 
@@ -1375,102 +1464,102 @@ module Clang
   #     start_over:
   #       ++counter;
   #   \endcode
-  # :compound_stmt::
+  # :compound_stmt ::
   #   A group of statements like { stmt stmt }.
   #   
   #   This cursor kind is used to describe compound statements, e.g. function
   #   bodies.
-  # :case_stmt::
+  # :case_stmt ::
   #   A case statment.
-  # :default_stmt::
+  # :default_stmt ::
   #   A default statement.
-  # :if_stmt::
+  # :if_stmt ::
   #   An if statement
-  # :switch_stmt::
+  # :switch_stmt ::
   #   A switch statement.
-  # :while_stmt::
+  # :while_stmt ::
   #   A while statement.
-  # :do_stmt::
+  # :do_stmt ::
   #   A do statement.
-  # :for_stmt::
+  # :for_stmt ::
   #   A for statement.
-  # :goto_stmt::
+  # :goto_stmt ::
   #   A goto statement.
-  # :indirect_goto_stmt::
+  # :indirect_goto_stmt ::
   #   An indirect goto statement.
-  # :continue_stmt::
+  # :continue_stmt ::
   #   A continue statement.
-  # :break_stmt::
+  # :break_stmt ::
   #   A break statement.
-  # :return_stmt::
+  # :return_stmt ::
   #   A return statement.
-  # :asm_stmt::
+  # :asm_stmt ::
   #   A GNU inline assembly statement extension.
-  # :obj_c_at_try_stmt::
+  # :obj_c_at_try_stmt ::
   #   Objective-C's overall @try-@catc-@finall statement.
-  # :obj_c_at_catch_stmt::
+  # :obj_c_at_catch_stmt ::
   #   Objective-C's @catch statement.
-  # :obj_c_at_finally_stmt::
+  # :obj_c_at_finally_stmt ::
   #   Objective-C's @finally statement.
-  # :obj_c_at_throw_stmt::
+  # :obj_c_at_throw_stmt ::
   #   Objective-C's @throw statement.
-  # :obj_c_at_synchronized_stmt::
+  # :obj_c_at_synchronized_stmt ::
   #   Objective-C's @synchronized statement.
-  # :obj_c_autorelease_pool_stmt::
+  # :obj_c_autorelease_pool_stmt ::
   #   Objective-C's autorelease pool statement.
-  # :obj_c_for_collection_stmt::
+  # :obj_c_for_collection_stmt ::
   #   Objective-C's collection statement.
-  # :x_catch_stmt::
+  # :x_catch_stmt ::
   #   C++'s catch statement.
-  # :x_try_stmt::
+  # :x_try_stmt ::
   #   C++'s try statement.
-  # :x_for_range_stmt::
+  # :x_for_range_stmt ::
   #   C++'s for (* : *) statement.
-  # :seh_try_stmt::
+  # :seh_try_stmt ::
   #   Windows Structured Exception Handling's try statement.
-  # :seh_except_stmt::
+  # :seh_except_stmt ::
   #   Windows Structured Exception Handling's except statement.
-  # :seh_finally_stmt::
+  # :seh_finally_stmt ::
   #   Windows Structured Exception Handling's finally statement.
-  # :null_stmt::
+  # :null_stmt ::
   #   The null satement ";": C99 6.8.3p3.
   #   
   #   This cursor kind is used to describe the null statement.
-  # :decl_stmt::
+  # :decl_stmt ::
   #   Adaptor class for mixing declarations with statements and
   #   expressions.
-  # :translation_unit::
+  # :translation_unit ::
   #   Cursor that represents the translation unit itself.
   #   
   #   The translation unit cursor exists primarily to act as the root
   #   cursor for traversing the contents of a translation unit.
-  # :first_attr::
+  # :first_attr ::
   #   Attributes
-  # :unexposed_attr::
+  # :unexposed_attr ::
   #   An attribute whose specific kind is not exposed via this
   #   interface.
-  # :ib_action_attr::
+  # :ib_action_attr ::
   #   
-  # :ib_outlet_attr::
+  # :ib_outlet_attr ::
   #   
-  # :ib_outlet_collection_attr::
+  # :ib_outlet_collection_attr ::
   #   
-  # :x_final_attr::
+  # :x_final_attr ::
   #   
-  # :x_override_attr::
+  # :x_override_attr ::
   #   
-  # :annotate_attr::
+  # :annotate_attr ::
   #   
-  # :preprocessing_directive::
+  # :preprocessing_directive ::
   #   Preprocessing
-  # :macro_definition::
+  # :macro_definition ::
   #   
-  # :macro_expansion::
+  # :macro_expansion ::
   #   
-  # :inclusion_directive::
+  # :inclusion_directive ::
   #   
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.cursor_kind_enum
     [:unexposed_decl, :struct_decl, :union_decl, :class_decl, :enum_decl, :field_decl, :enum_constant_decl, :function_decl, :var_decl, :parm_decl, :obj_c_interface_decl, :obj_c_category_decl, :obj_c_protocol_decl, :obj_c_property_decl, :obj_c_ivar_decl, :obj_c_instance_method_decl, :obj_c_class_method_decl, :obj_c_implementation_decl, :obj_c_category_impl_decl, :typedef_decl, :x_method, :namespace, :linkage_spec, :constructor, :destructor, :conversion_function, :template_type_parameter, :non_type_template_parameter, :template_template_parameter, :function_template, :class_template, :class_template_partial_specialization, :namespace_alias, :using_directive, :using_declaration, :type_alias_decl, :obj_c_synthesize_decl, :obj_c_dynamic_decl, :x_access_specifier, :first_ref, :obj_c_super_class_ref, :obj_c_protocol_ref, :obj_c_class_ref, :type_ref, :x_base_specifier, :template_ref, :namespace_ref, :member_ref, :label_ref, :overloaded_decl_ref, :first_invalid, :invalid_file, :no_decl_found, :not_implemented, :invalid_code, :first_expr, :unexposed_expr, :decl_ref_expr, :member_ref_expr, :call_expr, :obj_c_message_expr, :block_expr, :integer_literal, :floating_literal, :imaginary_literal, :string_literal, :character_literal, :paren_expr, :unary_operator, :array_subscript_expr, :binary_operator, :compound_assign_operator, :conditional_operator, :c_style_cast_expr, :compound_literal_expr, :init_list_expr, :addr_label_expr, :stmt_expr, :generic_selection_expr, :gnu_null_expr, :x_static_cast_expr, :x_dynamic_cast_expr, :x_reinterpret_cast_expr, :x_const_cast_expr, :x_functional_cast_expr, :x_typeid_expr, :x_bool_literal_expr, :x_null_ptr_literal_expr, :x_this_expr, :x_throw_expr, :x_new_expr, :x_delete_expr, :unary_expr, :obj_c_string_literal, :obj_c_encode_expr, :obj_c_selector_expr, :obj_c_protocol_expr, :obj_c_bridged_cast_expr, :pack_expansion_expr, :size_of_pack_expr, :first_stmt, :unexposed_stmt, :label_stmt, :compound_stmt, :case_stmt, :default_stmt, :if_stmt, :switch_stmt, :while_stmt, :do_stmt, :for_stmt, :goto_stmt, :indirect_goto_stmt, :continue_stmt, :break_stmt, :return_stmt, :asm_stmt, :obj_c_at_try_stmt, :obj_c_at_catch_stmt, :obj_c_at_finally_stmt, :obj_c_at_throw_stmt, :obj_c_at_synchronized_stmt, :obj_c_autorelease_pool_stmt, :obj_c_for_collection_stmt, :x_catch_stmt, :x_try_stmt, :x_for_range_stmt, :seh_try_stmt, :seh_except_stmt, :seh_finally_stmt, :null_stmt, :decl_stmt, :translation_unit, :first_attr, :unexposed_attr, :ib_action_attr, :ib_outlet_attr, :ib_outlet_collection_attr, :x_final_attr, :x_override_attr, :annotate_attr, :preprocessing_directive, :macro_definition, :macro_expansion, :inclusion_directive]
   end
@@ -1622,6 +1711,31 @@ module Clang
     :inclusion_directive, 503
   ]
 
+  # A cursor representing some element in the abstract syntax tree for
+  # a translation unit.
+  # 
+  # The cursor abstraction unifies the different kinds of entities in a
+  # program--declaration, statements, expressions, references to declarations,
+  # etc.--under a single "cursor" abstraction with a common set of operations.
+  # Common operation for a cursor include: getting the physical location in
+  # a source file where the cursor points, getting the name associated with a
+  # cursor, and retrieving cursors for any child nodes of a particular cursor.
+  # 
+  # Cursors can be produced in two specific ways.
+  # clang_getTranslationUnitCursor() produces a cursor for a translation unit,
+  # from which one can use clang_visitChildren() to explore the rest of the
+  # translation unit. clang_getCursor() maps from a physical source location
+  # to the entity that resides at that location, allowing one to map from the
+  # source code into the AST.
+  # 
+  # = Fields:
+  # :kind ::
+  #   (Symbol from cursor_kind_enum) 
+  # :xdata ::
+  #   (Integer) 
+  # :data ::
+  #   (Array<FFI::Pointer(*Void)>) 
+  #
   class Cursor < FFI::Struct
     layout :kind, :cursor_kind,
            :xdata, :int,
@@ -1641,7 +1755,7 @@ module Clang
   # various declarations within the given translation unit.
   # 
   # @method get_translation_unit_cursor(translation_unit)
-  # @param [FFI::Pointer of TranslationUnit] translation_unit 
+  # @param [FFI::Pointer(TranslationUnit)] translation_unit 
   # @return [Cursor] 
   # @scope class
   attach_function :get_translation_unit_cursor, :clang_getTranslationUnitCursor, [:pointer], Cursor.by_value
@@ -1681,8 +1795,8 @@ module Clang
 
   # Determine whether the given cursor kind represents a declaration.
   # 
-  # @method is_declaration(cursor_kind_enum)
-  # @param [Symbol from cursor_kind_enum] cursor_kind_enum 
+  # @method is_declaration(cursor_kind)
+  # @param [Symbol from cursor_kind_enum] cursor_kind 
   # @return [Integer] 
   # @scope class
   attach_function :is_declaration, :clang_isDeclaration, [:cursor_kind], :uint
@@ -1694,32 +1808,32 @@ module Clang
   # other cursors. Use clang_getCursorReferenced() to determine whether a
   # particular cursor refers to another entity.
   # 
-  # @method is_reference(cursor_kind_enum)
-  # @param [Symbol from cursor_kind_enum] cursor_kind_enum 
+  # @method is_reference(cursor_kind)
+  # @param [Symbol from cursor_kind_enum] cursor_kind 
   # @return [Integer] 
   # @scope class
   attach_function :is_reference, :clang_isReference, [:cursor_kind], :uint
 
   # Determine whether the given cursor kind represents an expression.
   # 
-  # @method is_expression(cursor_kind_enum)
-  # @param [Symbol from cursor_kind_enum] cursor_kind_enum 
+  # @method is_expression(cursor_kind)
+  # @param [Symbol from cursor_kind_enum] cursor_kind 
   # @return [Integer] 
   # @scope class
   attach_function :is_expression, :clang_isExpression, [:cursor_kind], :uint
 
   # Determine whether the given cursor kind represents a statement.
   # 
-  # @method is_statement(cursor_kind_enum)
-  # @param [Symbol from cursor_kind_enum] cursor_kind_enum 
+  # @method is_statement(cursor_kind)
+  # @param [Symbol from cursor_kind_enum] cursor_kind 
   # @return [Integer] 
   # @scope class
   attach_function :is_statement, :clang_isStatement, [:cursor_kind], :uint
 
   # Determine whether the given cursor kind represents an attribute.
   # 
-  # @method is_attribute(cursor_kind_enum)
-  # @param [Symbol from cursor_kind_enum] cursor_kind_enum 
+  # @method is_attribute(cursor_kind)
+  # @param [Symbol from cursor_kind_enum] cursor_kind 
   # @return [Integer] 
   # @scope class
   attach_function :is_attribute, :clang_isAttribute, [:cursor_kind], :uint
@@ -1727,8 +1841,8 @@ module Clang
   # Determine whether the given cursor kind represents an invalid
   # cursor.
   # 
-  # @method is_invalid(cursor_kind_enum)
-  # @param [Symbol from cursor_kind_enum] cursor_kind_enum 
+  # @method is_invalid(cursor_kind)
+  # @param [Symbol from cursor_kind_enum] cursor_kind 
   # @return [Integer] 
   # @scope class
   attach_function :is_invalid, :clang_isInvalid, [:cursor_kind], :uint
@@ -1736,8 +1850,8 @@ module Clang
   # Determine whether the given cursor kind represents a translation
   # unit.
   # 
-  # @method is_translation_unit(cursor_kind_enum)
-  # @param [Symbol from cursor_kind_enum] cursor_kind_enum 
+  # @method is_translation_unit(cursor_kind)
+  # @param [Symbol from cursor_kind_enum] cursor_kind 
   # @return [Integer] 
   # @scope class
   attach_function :is_translation_unit, :clang_isTranslationUnit, [:cursor_kind], :uint
@@ -1745,8 +1859,8 @@ module Clang
   # Determine whether the given cursor represents a preprocessing
   # element, such as a preprocessor directive or macro instantiation.
   # 
-  # @method is_preprocessing(cursor_kind_enum)
-  # @param [Symbol from cursor_kind_enum] cursor_kind_enum 
+  # @method is_preprocessing(cursor_kind)
+  # @param [Symbol from cursor_kind_enum] cursor_kind 
   # @return [Integer] 
   # @scope class
   attach_function :is_preprocessing, :clang_isPreprocessing, [:cursor_kind], :uint
@@ -1754,8 +1868,8 @@ module Clang
   # Determine whether the given cursor represents a currently
   #  unexposed piece of the AST (e.g., CXCursor_UnexposedStmt).
   # 
-  # @method is_unexposed(cursor_kind_enum)
-  # @param [Symbol from cursor_kind_enum] cursor_kind_enum 
+  # @method is_unexposed(cursor_kind)
+  # @param [Symbol from cursor_kind_enum] cursor_kind 
   # @return [Integer] 
   # @scope class
   attach_function :is_unexposed, :clang_isUnexposed, [:cursor_kind], :uint
@@ -1763,21 +1877,21 @@ module Clang
   # Describe the linkage of the entity referred to by a cursor.
   # 
   # === Options:
-  # :invalid::
+  # :invalid ::
   #   This value indicates that no linkage information is available
   #   for a provided CXCursor.
-  # :no_linkage::
+  # :no_linkage ::
   #   This is the linkage for variables, parameters, and so on that
   #    have automatic storage.  This covers normal (non-extern) local variables.
-  # :internal::
+  # :internal ::
   #   This is the linkage for static variables and static functions.
-  # :unique_external::
+  # :unique_external ::
   #   This is the linkage for entities with external linkage that live
   #   in C++ anonymous namespaces.
-  # :external::
+  # :external ::
   #   This is the linkage for entities with true, external linkage.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.linkage_kind_enum
     [:invalid, :no_linkage, :internal, :unique_external, :external]
   end
@@ -1808,16 +1922,16 @@ module Clang
   # Describe the "language" of the entity referred to by a cursor.
   # 
   # === Options:
-  # :invalid::
+  # :invalid ::
   #   
-  # :c::
+  # :c ::
   #   
-  # :obj_c::
+  # :obj_c ::
   #   
-  # :c_plus_plus::
+  # :c_plus_plus ::
   #   
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.language_kind_enum
     [:invalid, :c, :obj_c, :c_plus_plus]
   end
@@ -1840,21 +1954,28 @@ module Clang
   # 
   # @method cursor_get_translation_unit(cursor)
   # @param [Cursor] cursor 
-  # @return [FFI::Pointer of TranslationUnit] 
+  # @return [FFI::Pointer(TranslationUnit)] 
   # @scope class
   attach_function :cursor_get_translation_unit, :clang_Cursor_getTranslationUnit, [Cursor.by_value], :pointer
 
+  # A fast container representing a set of CXCursors.
+  # 
+  # = Fields:
+  #
+  class CursorSetImpl < FFI::Struct
+  end
+
   # Creates an empty CXCursorSet.
   # 
   # @method create_cx_cursor_set()
-  # @return [FFI::Pointer of CursorSet] 
+  # @return [FFI::Pointer(CursorSet)] 
   # @scope class
   attach_function :create_cx_cursor_set, :clang_createCXCursorSet, [], :pointer
 
   # Disposes a CXCursorSet and releases its associated memory.
   # 
   # @method dispose_cx_cursor_set(cset)
-  # @param [FFI::Pointer of CursorSet] cset 
+  # @param [FFI::Pointer(CursorSet)] cset 
   # @return [nil] 
   # @scope class
   attach_function :dispose_cx_cursor_set, :clang_disposeCXCursorSet, [:pointer], :void
@@ -1862,7 +1983,7 @@ module Clang
   # Queries a CXCursorSet to see if it contains a specific CXCursor.
   # 
   # @method cx_cursor_set_contains(cset, cursor)
-  # @param [FFI::Pointer of CursorSet] cset 
+  # @param [FFI::Pointer(CursorSet)] cset 
   # @param [Cursor] cursor 
   # @return [Integer] non-zero if the set contains the specified cursor.
   # @scope class
@@ -1871,7 +1992,7 @@ module Clang
   # Inserts a CXCursor into a CXCursorSet.
   # 
   # @method cx_cursor_set_insert(cset, cursor)
-  # @param [FFI::Pointer of CursorSet] cset 
+  # @param [FFI::Pointer(CursorSet)] cset 
   # @param [Cursor] cursor 
   # @return [Integer] zero if the CXCursor was already in the set, and non-zero otherwise.
   # @scope class
@@ -1985,12 +2106,12 @@ module Clang
   # @param [Cursor] cursor A cursor representing an Objective-C or C++
   #   method. This routine will compute the set of methods that this
   #   method overrides.
-  # @param [FFI::Pointer to ] overridden A pointer whose pointee will be replaced with a
+  # @param [FFI::Pointer(**Cursor)] overridden A pointer whose pointee will be replaced with a
   #   pointer to an array of cursors, representing the set of overridden
   #   methods. If there are no overridden methods, the pointee will be
   #   set to NULL. The pointee must be freed via a call to 
   #   \c clang_disposeOverriddenCursors().
-  # @param [FFI::Pointer to ] num_overridden A pointer to the number of overridden
+  # @param [FFI::Pointer(*UInt)] num_overridden A pointer to the number of overridden
   #   functions, will be set to the number of overridden functions in the
   #   array pointed to by \p overridden.
   # @return [nil] 
@@ -2001,7 +2122,7 @@ module Clang
   # clang_getOverriddenCursors().
   # 
   # @method dispose_overridden_cursors(overridden)
-  # @param [FFI::Pointer to ] overridden 
+  # @param [FFI::Pointer(*Cursor)] overridden 
   # @return [nil] 
   # @scope class
   attach_function :dispose_overridden_cursors, :clang_disposeOverriddenCursors, [:pointer], :void
@@ -2011,7 +2132,7 @@ module Clang
   # 
   # @method get_included_file(cursor)
   # @param [Cursor] cursor 
-  # @return [FFI::Pointer of File] 
+  # @return [FFI::Pointer(File)] 
   # @scope class
   attach_function :get_included_file, :clang_getIncludedFile, [Cursor.by_value], :pointer
 
@@ -2027,7 +2148,7 @@ module Clang
   # will return a cursor referring to the "+" expression.
   # 
   # @method get_cursor(translation_unit, source_location)
-  # @param [FFI::Pointer of TranslationUnit] translation_unit 
+  # @param [FFI::Pointer(TranslationUnit)] translation_unit 
   # @param [SourceLocation] source_location 
   # @return [Cursor] a cursor representing the entity at the given source location, or
   #   a NULL cursor if no such entity can be found.
@@ -2068,95 +2189,95 @@ module Clang
   # Describes the kind of type
   # 
   # === Options:
-  # :invalid::
+  # :invalid ::
   #   Reprents an invalid type (e.g., where no type is available).
-  # :unexposed::
+  # :unexposed ::
   #   A type whose specific kind is not exposed via this
   #   interface.
-  # :void::
+  # :void ::
   #   Builtin types
-  # :bool::
+  # :bool ::
   #   
-  # :char_u::
+  # :char_u ::
   #   
-  # :u_char::
+  # :u_char ::
   #   
-  # :char16::
+  # :char16 ::
   #   
-  # :char32::
+  # :char32 ::
   #   
-  # :u_short::
+  # :u_short ::
   #   
-  # :u_int::
+  # :u_int ::
   #   
-  # :u_long::
+  # :u_long ::
   #   
-  # :u_long_long::
+  # :u_long_long ::
   #   
-  # :u_int128::
+  # :u_int128 ::
   #   
-  # :char_s::
+  # :char_s ::
   #   
-  # :s_char::
+  # :s_char ::
   #   
-  # :w_char::
+  # :w_char ::
   #   
-  # :short::
+  # :short ::
   #   
-  # :int::
+  # :int ::
   #   
-  # :long::
+  # :long ::
   #   
-  # :long_long::
+  # :long_long ::
   #   
-  # :int128::
+  # :int128 ::
   #   
-  # :float::
+  # :float ::
   #   
-  # :double::
+  # :double ::
   #   
-  # :long_double::
+  # :long_double ::
   #   
-  # :null_ptr::
+  # :null_ptr ::
   #   
-  # :overload::
+  # :overload ::
   #   
-  # :dependent::
+  # :dependent ::
   #   
-  # :obj_c_id::
+  # :obj_c_id ::
   #   
-  # :obj_c_class::
+  # :obj_c_class ::
   #   
-  # :obj_c_sel::
+  # :obj_c_sel ::
   #   
-  # :complex::
+  # :complex ::
   #   
-  # :pointer::
+  # :pointer ::
   #   
-  # :block_pointer::
+  # :block_pointer ::
   #   
-  # :l_value_reference::
+  # :l_value_reference ::
   #   
-  # :r_value_reference::
+  # :r_value_reference ::
   #   
-  # :record::
+  # :record ::
   #   
-  # :enum::
+  # :enum ::
   #   
-  # :typedef::
+  # :typedef ::
   #   
-  # :obj_c_interface::
+  # :obj_c_interface ::
   #   
-  # :obj_c_object_pointer::
+  # :obj_c_object_pointer ::
   #   
-  # :function_no_proto::
+  # :function_no_proto ::
   #   
-  # :function_proto::
+  # :function_proto ::
   #   
-  # :constant_array::
+  # :constant_array ::
   #   
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.type_kind_enum
     [:invalid, :unexposed, :void, :bool, :char_u, :u_char, :char16, :char32, :u_short, :u_int, :u_long, :u_long_long, :u_int128, :char_s, :s_char, :w_char, :short, :int, :long, :long_long, :int128, :float, :double, :long_double, :null_ptr, :overload, :dependent, :obj_c_id, :obj_c_class, :obj_c_sel, :complex, :pointer, :block_pointer, :l_value_reference, :r_value_reference, :record, :enum, :typedef, :obj_c_interface, :obj_c_object_pointer, :function_no_proto, :function_proto, :constant_array]
   end
@@ -2206,6 +2327,14 @@ module Clang
     :constant_array, 112
   ]
 
+  # The type of an element in the abstract syntax tree.
+  # 
+  # = Fields:
+  # :kind ::
+  #   (Symbol from type_kind_enum) 
+  # :data ::
+  #   (Array<FFI::Pointer(*Void)>) 
+  #
   class Type < FFI::Struct
     layout :kind, :type_kind,
            :data, [:pointer, 2]
@@ -2360,16 +2489,16 @@ module Clang
   # cursor with kind CX_CXXBaseSpecifier.
   # 
   # === Options:
-  # :x_invalid_access_specifier::
+  # :x_invalid_access_specifier ::
   #   
-  # :x_public::
+  # :x_public ::
   #   
-  # :x_protected::
+  # :x_protected ::
   #   
-  # :x_private::
+  # :x_private ::
   #   
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.cxx_access_specifier_enum
     [:x_invalid_access_specifier, :x_public, :x_protected, :x_private]
   end
@@ -2430,16 +2559,16 @@ module Clang
   # \c CXCursorVisitor to indicate how clang_visitChildren() proceed.
   # 
   # === Options:
-  # :break::
+  # :break ::
   #   Terminates the cursor traversal.
-  # :continue::
+  # :continue ::
   #   Continues the cursor traversal with the next sibling of
   #   the cursor just visited, without visiting its children.
-  # :recurse::
+  # :recurse ::
   #   Recursively traverse the children of this cursor, using
   #   the same visitor and client data.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.child_visit_result_enum
     [:break, :continue, :recurse]
   end
@@ -2449,6 +2578,25 @@ module Clang
     :recurse
   ]
 
+  # <em>This is no real method. This entry is only for documentation of the callback.</em>
+  # 
+  # Visitor invoked for each cursor found by a traversal.
+  # 
+  # This visitor function will be invoked for each cursor found by
+  # clang_visitCursorChildren(). Its first argument is the cursor being
+  # visited, its second argument is the parent visitor for that cursor,
+  # and its third argument is the client data provided to
+  # clang_visitCursorChildren().
+  # 
+  # The visitor should return one of the \c CXChildVisitResult values
+  # to direct clang_visitCursorChildren().
+  # 
+  # @method cursor_visitor_callback(cursor, parent, client_data)
+  # @param [Cursor] cursor 
+  # @param [Cursor] parent 
+  # @param [FFI::Pointer(ClientData)] client_data 
+  # @return [Symbol from child_visit_result_enum] 
+  # @scope class
   callback :cursor_visitor, [Cursor.by_value, Cursor.by_value, :pointer], :child_visit_result
 
   # Visit the children of a particular cursor.
@@ -2463,9 +2611,9 @@ module Clang
   # @param [Cursor] parent the cursor whose child may be visited. All kinds of
   #   cursors can be visited, including invalid cursors (which, by
   #   definition, have no children).
-  # @param [Callback] visitor the visitor function that will be invoked for each
+  # @param [Proc(cursor_visitor_callback)] visitor the visitor function that will be invoked for each
   #   child of \p parent.
-  # @param [FFI::Pointer of ClientData] client_data pointer data supplied by the client, which will
+  # @param [FFI::Pointer(ClientData)] client_data pointer data supplied by the client, which will
   #   be passed to the visitor each time it is invoked.
   # @return [Integer] a non-zero value if the traversal was terminated
   #   prematurely by the visitor returning \c CXChildVisit_Break.
@@ -2732,14 +2880,16 @@ module Clang
   # @scope class
   attach_function :get_cursor_reference_name_range, :clang_getCursorReferenceNameRange, [Cursor.by_value, :uint, :uint], SourceRange.by_value
 
+  # (Not documented)
+  # 
   # === Options:
-  # :want_qualifier::
+  # :want_qualifier ::
   #   Include the nested-name-specifier, e.g. Foo:: in x.Foo::y, in the
   #   range.
-  # :want_template_args::
+  # :want_template_args ::
   #   Include the explicit template arguments, e.g. <int> in x.f<int>, in 
   #   the range.
-  # :want_single_piece::
+  # :want_single_piece ::
   #   If the name is non-contiguous, return the full spanning range.
   #   
   #   Non-contiguous names occur in Objective-C when a selector with two or more
@@ -2749,7 +2899,7 @@ module Clang
   #   return some_vector(1); // C++
   #   \endcode
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.name_ref_flags_enum
     [:want_qualifier, :want_template_args, :want_single_piece]
   end
@@ -2762,18 +2912,18 @@ module Clang
   # Describes a kind of token.
   # 
   # === Options:
-  # :punctuation::
+  # :punctuation ::
   #   A token that contains some kind of punctuation.
-  # :keyword::
+  # :keyword ::
   #   A language keyword.
-  # :identifier::
+  # :identifier ::
   #   An identifier (that is not a keyword).
-  # :literal::
+  # :literal ::
   #   A numeric, string, or character literal.
-  # :comment::
+  # :comment ::
   #   A comment.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.token_kind_enum
     [:punctuation, :keyword, :identifier, :literal, :comment]
   end
@@ -2785,6 +2935,14 @@ module Clang
     :comment
   ]
 
+  # Describes a single preprocessing token.
+  # 
+  # = Fields:
+  # :int_data ::
+  #   (Array<Integer>) 
+  # :ptr_data ::
+  #   (FFI::Pointer(*Void)) 
+  #
   class Token < FFI::Struct
     layout :int_data, [:uint, 4],
            :ptr_data, :pointer
@@ -2804,7 +2962,7 @@ module Clang
   # the text of an identifier or keyword.
   # 
   # @method get_token_spelling(translation_unit, token)
-  # @param [FFI::Pointer of TranslationUnit] translation_unit 
+  # @param [FFI::Pointer(TranslationUnit)] translation_unit 
   # @param [Token] token 
   # @return [String] 
   # @scope class
@@ -2813,7 +2971,7 @@ module Clang
   # Retrieve the source location of the given token.
   # 
   # @method get_token_location(translation_unit, token)
-  # @param [FFI::Pointer of TranslationUnit] translation_unit 
+  # @param [FFI::Pointer(TranslationUnit)] translation_unit 
   # @param [Token] token 
   # @return [SourceLocation] 
   # @scope class
@@ -2822,7 +2980,7 @@ module Clang
   # Retrieve a source range that covers the given token.
   # 
   # @method get_token_extent(translation_unit, token)
-  # @param [FFI::Pointer of TranslationUnit] translation_unit 
+  # @param [FFI::Pointer(TranslationUnit)] translation_unit 
   # @param [Token] token 
   # @return [SourceRange] 
   # @scope class
@@ -2832,13 +2990,13 @@ module Clang
   # lexical tokens.
   # 
   # @method tokenize(tu, range, tokens, num_tokens)
-  # @param [FFI::Pointer of TranslationUnit] tu the translation unit whose text is being tokenized.
+  # @param [FFI::Pointer(TranslationUnit)] tu the translation unit whose text is being tokenized.
   # @param [SourceRange] range the source range in which text should be tokenized. All of the
   #   tokens produced by tokenization will fall within this source range,
-  # @param [FFI::Pointer to ] tokens this pointer will be set to point to the array of tokens
+  # @param [FFI::Pointer(**Token)] tokens this pointer will be set to point to the array of tokens
   #   that occur within the given source range. The returned pointer must be
   #   freed with clang_disposeTokens() before the translation unit is destroyed.
-  # @param [FFI::Pointer to ] num_tokens will be set to the number of tokens in the \c *Tokens
+  # @param [FFI::Pointer(*UInt)] num_tokens will be set to the number of tokens in the \c *Tokens
   #   array.
   # @return [nil] 
   # @scope class
@@ -2865,10 +3023,10 @@ module Clang
   # not provided as an annotation.
   # 
   # @method annotate_tokens(tu, tokens, num_tokens, cursors)
-  # @param [FFI::Pointer of TranslationUnit] tu the translation unit that owns the given tokens.
-  # @param [FFI::Pointer to ] tokens the set of tokens to annotate.
+  # @param [FFI::Pointer(TranslationUnit)] tu the translation unit that owns the given tokens.
+  # @param [FFI::Pointer(*Token)] tokens the set of tokens to annotate.
   # @param [Integer] num_tokens the number of tokens in \p Tokens.
-  # @param [FFI::Pointer to ] cursors an array of \p NumTokens cursors, whose contents will be
+  # @param [FFI::Pointer(*Cursor)] cursors an array of \p NumTokens cursors, whose contents will be
   #   replaced with the cursors corresponding to each token.
   # @return [nil] 
   # @scope class
@@ -2877,8 +3035,8 @@ module Clang
   # Free the given set of tokens.
   # 
   # @method dispose_tokens(tu, tokens, num_tokens)
-  # @param [FFI::Pointer of TranslationUnit] tu 
-  # @param [FFI::Pointer to ] tokens 
+  # @param [FFI::Pointer(TranslationUnit)] tu 
+  # @param [FFI::Pointer(*Token)] tokens 
   # @param [Integer] num_tokens 
   # @return [nil] 
   # @scope class
@@ -2892,31 +3050,53 @@ module Clang
   # @scope class
   attach_function :get_cursor_kind_spelling, :clang_getCursorKindSpelling, [:cursor_kind], String.by_value
 
+  # (Not documented)
+  # 
   # @method get_definition_spelling_and_extent(cursor, start_buf, end_buf, start_line, start_column, end_line, end_column)
   # @param [Cursor] cursor 
-  # @param [FFI::Pointer to ] start_buf 
-  # @param [FFI::Pointer to ] end_buf 
-  # @param [FFI::Pointer to ] start_line 
-  # @param [FFI::Pointer to ] start_column 
-  # @param [FFI::Pointer to ] end_line 
-  # @param [FFI::Pointer to ] end_column 
+  # @param [FFI::Pointer(**Char_S)] start_buf 
+  # @param [FFI::Pointer(**Char_S)] end_buf 
+  # @param [FFI::Pointer(*UInt)] start_line 
+  # @param [FFI::Pointer(*UInt)] start_column 
+  # @param [FFI::Pointer(*UInt)] end_line 
+  # @param [FFI::Pointer(*UInt)] end_column 
   # @return [nil] 
   # @scope class
   attach_function :get_definition_spelling_and_extent, :clang_getDefinitionSpellingAndExtent, [Cursor.by_value, :pointer, :pointer, :pointer, :pointer, :pointer, :pointer], :void
 
+  # (Not documented)
+  # 
   # @method enable_stack_traces()
   # @return [nil] 
   # @scope class
   attach_function :enable_stack_traces, :clang_enableStackTraces, [], :void
 
+  # (Not documented)
+  # 
   # @method execute_on_thread(fn, user_data, stack_size)
-  # @param [FFI::Pointer to ] fn 
-  # @param [FFI::Pointer to ] user_data 
+  # @param [FFI::Pointer(*)] fn 
+  # @param [FFI::Pointer(*Void)] user_data 
   # @param [Integer] stack_size 
   # @return [nil] 
   # @scope class
   attach_function :execute_on_thread, :clang_executeOnThread, [:pointer, :pointer, :uint], :void
 
+  # A single result of code completion.
+  # 
+  # = Fields:
+  # :cursor_kind ::
+  #   (Symbol from cursor_kind_enum) The kind of entity that this completion refers to.
+  #   
+  #   The cursor kind will be a macro, keyword, or a declaration (one of the
+  #   *Decl cursor kinds), describing the entity that the completion is
+  #   referring to.
+  #   
+  #   \todo In the future, we would like to provide a full cursor, to allow
+  #   the client to extract additional information from declaration.
+  # :completion_string ::
+  #   (FFI::Pointer(CompletionString)) The code-completion string that describes how to insert this
+  #   code-completion result into the editing buffer.
+  #
   class CompletionResult < FFI::Struct
     layout :cursor_kind, :cursor_kind,
            :completion_string, :pointer
@@ -2929,7 +3109,7 @@ module Clang
   # should be interpreted by the client or is another completion string.
   # 
   # === Options:
-  # :optional::
+  # :optional ::
   #   A code-completion string that describes "optional" text that
   #   could be a part of the template (but is not required).
   #   
@@ -2961,7 +3141,7 @@ module Clang
   #       function "f" would only include the first parameter ("int x").
   #     - Fully expand all optional chunks, in which case the template for the
   #       function "f" would have all of the parameters.
-  # :typed_text::
+  # :typed_text ::
   #   Text that a user would be expected to type to get this
   #   code-completion result.
   #   
@@ -2970,13 +3150,13 @@ module Clang
   #   declaration that could be used at the current code point. Clients are
   #   expected to filter the code-completion results based on the text in this
   #   chunk.
-  # :text::
+  # :text ::
   #   Text that should be inserted as part of a code-completion result.
   #   
   #   A "text" chunk represents text that is part of the template to be
   #   inserted into user code should this particular code-completion result
   #   be selected.
-  # :placeholder::
+  # :placeholder ::
   #   Placeholder text that should be replaced by the user.
   #   
   #   A "placeholder" chunk marks a place where the user should insert text
@@ -2985,7 +3165,7 @@ module Clang
   #   user should provide arguments for each of those parameters. The actual
   #   text in a placeholder is a suggestion for the text to display before
   #   the user replaces the placeholder with real code.
-  # :informative::
+  # :informative ::
   #   Informative text that should be displayed but never inserted as
   #   part of the template.
   #   
@@ -2993,7 +3173,7 @@ module Clang
   #   help the user decide whether a particular code-completion result is the
   #   right option, but which is not part of the actual template to be inserted
   #   by code completion.
-  # :current_parameter::
+  # :current_parameter ::
   #   Text that describes the current parameter when code-completion is
   #   referring to function call, message send, or template specialization.
   #   
@@ -3011,45 +3191,45 @@ module Clang
   #   parameter. After typing further, to \c add(17, (where the code-completion
   #   point is after the ","), the code-completion string will contain a
   #   "current paremeter" chunk to "int y".
-  # :left_paren::
+  # :left_paren ::
   #   A left parenthesis ('('), used to initiate a function call or
   #   signal the beginning of a function parameter list.
-  # :right_paren::
+  # :right_paren ::
   #   A right parenthesis (')'), used to finish a function call or
   #   signal the end of a function parameter list.
-  # :left_bracket::
+  # :left_bracket ::
   #   A left bracket ('(').
-  # :right_bracket::
+  # :right_bracket ::
   #   A right bracket (')').
-  # :left_brace::
+  # :left_brace ::
   #   A left brace ('{').
-  # :right_brace::
+  # :right_brace ::
   #   A right brace ('}').
-  # :left_angle::
+  # :left_angle ::
   #   A left angle bracket ('<').
-  # :right_angle::
+  # :right_angle ::
   #   A right angle bracket ('>').
-  # :comma::
+  # :comma ::
   #   A comma separator (',').
-  # :result_type::
+  # :result_type ::
   #   Text that specifies the result type of a given result.
   #   
   #   This special kind of informative chunk is not meant to be inserted into
   #   the text buffer. Rather, it is meant to illustrate the type that an
   #   expression using the given completion string would have.
-  # :colon::
+  # :colon ::
   #   A colon (':').
-  # :semi_colon::
+  # :semi_colon ::
   #   A semicolon (';').
-  # :equal::
+  # :equal ::
   #   An '=' sign.
-  # :horizontal_space::
+  # :horizontal_space ::
   #   Horizontal space (' ').
-  # :vertical_space::
+  # :vertical_space ::
   #   Vertical space ('\n'), after which it is generally a good idea to
   #   perform indentation.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.completion_chunk_kind_enum
     [: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]
   end
@@ -3080,7 +3260,7 @@ module Clang
   # Determine the kind of a particular chunk within a completion string.
   # 
   # @method get_completion_chunk_kind(completion_string, chunk_number)
-  # @param [FFI::Pointer of CompletionString] completion_string the completion string to query.
+  # @param [FFI::Pointer(CompletionString)] completion_string the completion string to query.
   # @param [Integer] chunk_number the 0-based index of the chunk in the completion string.
   # @return [Symbol from completion_chunk_kind_enum] the kind of the chunk at the index \c chunk_number.
   # @scope class
@@ -3090,7 +3270,7 @@ module Clang
   # completion string.
   # 
   # @method get_completion_chunk_text(completion_string, chunk_number)
-  # @param [FFI::Pointer of CompletionString] completion_string the completion string to query.
+  # @param [FFI::Pointer(CompletionString)] completion_string the completion string to query.
   # @param [Integer] chunk_number the 0-based index of the chunk in the completion string.
   # @return [String] the text associated with the chunk at index \c chunk_number.
   # @scope class
@@ -3100,9 +3280,9 @@ module Clang
   # within a completion string.
   # 
   # @method get_completion_chunk_completion_string(completion_string, chunk_number)
-  # @param [FFI::Pointer of CompletionString] completion_string the completion string to query.
+  # @param [FFI::Pointer(CompletionString)] completion_string the completion string to query.
   # @param [Integer] chunk_number the 0-based index of the chunk in the completion string.
-  # @return [FFI::Pointer of CompletionString] the completion string associated with the chunk at index
+  # @return [FFI::Pointer(CompletionString)] the completion string associated with the chunk at index
   #   \c chunk_number.
   # @scope class
   attach_function :get_completion_chunk_completion_string, :clang_getCompletionChunkCompletionString, [:pointer, :uint], :pointer
@@ -3110,7 +3290,7 @@ module Clang
   # Retrieve the number of chunks in the given code-completion string.
   # 
   # @method get_num_completion_chunks(completion_string)
-  # @param [FFI::Pointer of CompletionString] completion_string 
+  # @param [FFI::Pointer(CompletionString)] completion_string 
   # @return [Integer] 
   # @scope class
   attach_function :get_num_completion_chunks, :clang_getNumCompletionChunks, [:pointer], :uint
@@ -3122,7 +3302,7 @@ module Clang
   # priority is selected by various internal heuristics.
   # 
   # @method get_completion_priority(completion_string)
-  # @param [FFI::Pointer of CompletionString] completion_string The completion string to query.
+  # @param [FFI::Pointer(CompletionString)] completion_string The completion string to query.
   # @return [Integer] The priority of this completion string. Smaller values indicate
   #   higher-priority (more likely) completions.
   # @scope class
@@ -3132,7 +3312,7 @@ module Clang
   # string refers to.
   # 
   # @method get_completion_availability(completion_string)
-  # @param [FFI::Pointer of CompletionString] completion_string The completion string to query.
+  # @param [FFI::Pointer(CompletionString)] completion_string The completion string to query.
   # @return [Symbol from availability_kind_enum] The availability of the completion string.
   # @scope class
   attach_function :get_completion_availability, :clang_getCompletionAvailability, [:pointer], :availability_kind
@@ -3141,7 +3321,7 @@ module Clang
   # completion string.
   # 
   # @method get_completion_num_annotations(completion_string)
-  # @param [FFI::Pointer of CompletionString] completion_string the completion string to query.
+  # @param [FFI::Pointer(CompletionString)] completion_string the completion string to query.
   # @return [Integer] the number of annotations associated with the given completion
   #   string.
   # @scope class
@@ -3150,7 +3330,7 @@ module Clang
   # Retrieve the annotation associated with the given completion string.
   # 
   # @method get_completion_annotation(completion_string, annotation_number)
-  # @param [FFI::Pointer of CompletionString] completion_string the completion string to query.
+  # @param [FFI::Pointer(CompletionString)] completion_string the completion string to query.
   # @param [Integer] annotation_number the 0-based index of the annotation of the
   #   completion string.
   # @return [String] annotation string associated with the completion at index
@@ -3163,11 +3343,24 @@ module Clang
   # 
   # @method get_cursor_completion_string(cursor)
   # @param [Cursor] cursor The cursor to query.
-  # @return [FFI::Pointer of CompletionString] A non-context-sensitive completion string for declaration and macro
+  # @return [FFI::Pointer(CompletionString)] A non-context-sensitive completion string for declaration and macro
   #   definition cursors, or NULL for other kinds of cursors.
   # @scope class
   attach_function :get_cursor_completion_string, :clang_getCursorCompletionString, [Cursor.by_value], :pointer
 
+  # Contains the results of code-completion.
+  # 
+  # This data structure contains the results of code completion, as
+  # produced by \c clang_codeCompleteAt(). Its contents must be freed by
+  # \c clang_disposeCodeCompleteResults.
+  # 
+  # = Fields:
+  # :results ::
+  #   (FFI::Pointer(*CompletionResult)) The code-completion results.
+  # :num_results ::
+  #   (Integer) The number of code-completion results stored in the
+  #   \c Results array.
+  #
   class CodeCompleteResults < FFI::Struct
     layout :results, :pointer,
            :num_results, :uint
@@ -3180,14 +3373,14 @@ module Clang
   # provide multiple options to \c clang_codeCompleteAt().
   # 
   # === Options:
-  # :include_macros::
+  # :include_macros ::
   #   Whether to include macros within the set of code
   #   completions returned.
-  # :include_code_patterns::
+  # :include_code_patterns ::
   #   Whether to include code patterns for language constructs
   #   within the set of code completions, e.g., for loops.
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.code_complete_flags_enum
     [:include_macros, :include_code_patterns]
   end
@@ -3202,11 +3395,11 @@ module Clang
   # contexts are occurring simultaneously.
   # 
   # === Options:
-  # :completion_context_unexposed::
+  # :completion_context_unexposed ::
   #   The context for completions is unexposed, as only Clang results
   #   should be included. (This is equivalent to having no context bits set.)
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.completion_context_enum
     [:completion_context_unexposed]
   end
@@ -3253,7 +3446,7 @@ module Clang
   # have a lower latency.
   # 
   # @method code_complete_at(tu, complete_filename, complete_line, complete_column, unsaved_files, num_unsaved_files, options)
-  # @param [FFI::Pointer of TranslationUnit] tu The translation unit in which code-completion should
+  # @param [FFI::Pointer(TranslationUnit)] tu The translation unit in which code-completion should
   #   occur. The source files for this translation unit need not be
   #   completely up-to-date (and the contents of those source files may
   #   be overridden via \p unsaved_files). Cursors referring into the
@@ -3265,7 +3458,7 @@ module Clang
   # @param [Integer] complete_column The column at which code-completion should occur.
   #   Note that the column should point just after the syntactic construct that
   #   initiated code completion, and not in the middle of a lexical token.
-  # @param [FFI::Pointer to ] unsaved_files the Tiles that have not yet been saved to disk
+  # @param [FFI::Pointer(*UnsavedFile)] unsaved_files the Tiles that have not yet been saved to disk
   #   but may be required for parsing or code completion, including the
   #   contents of those files.  The contents and name of these files (as
   #   specified by CXUnsavedFile) are copied when necessary, so the
@@ -3278,7 +3471,7 @@ module Clang
   #   CXCodeComplete_Flags enumeration. The 
   #   \c clang_defaultCodeCompleteOptions() function returns a default set
   #   of code-completion options.
-  # @return [FFI::Pointer to ] If successful, a new \c CXCodeCompleteResults structure
+  # @return [FFI::Pointer(*CodeCompleteResults)] If successful, a new \c CXCodeCompleteResults structure
   #   containing code-completion results, which should eventually be
   #   freed with \c clang_disposeCodeCompleteResults(). If code
   #   completion fails, returns NULL.
@@ -3289,7 +3482,7 @@ module Clang
   # order.
   # 
   # @method sort_code_completion_results(results, num_results)
-  # @param [FFI::Pointer to ] results The set of results to sort.
+  # @param [FFI::Pointer(*CompletionResult)] results The set of results to sort.
   # @param [Integer] num_results The number of results in \p Results.
   # @return [nil] 
   # @scope class
@@ -3298,7 +3491,7 @@ module Clang
   # Free the given set of code-completion results.
   # 
   # @method dispose_code_complete_results(results)
-  # @param [FFI::Pointer to ] results 
+  # @param [FFI::Pointer(*CodeCompleteResults)] results 
   # @return [nil] 
   # @scope class
   attach_function :dispose_code_complete_results, :clang_disposeCodeCompleteResults, [:pointer], :void
@@ -3307,7 +3500,7 @@ module Clang
   # location where code completion was performed.
   # 
   # @method code_complete_get_num_diagnostics(results)
-  # @param [FFI::Pointer to ] results 
+  # @param [FFI::Pointer(*CodeCompleteResults)] results 
   # @return [Integer] 
   # @scope class
   attach_function :code_complete_get_num_diagnostics, :clang_codeCompleteGetNumDiagnostics, [:pointer], :uint
@@ -3318,9 +3511,9 @@ module Clang
   # the code completion results to query.
   # 
   # @method code_complete_get_diagnostic(results, index)
-  # @param [FFI::Pointer to ] results 
+  # @param [FFI::Pointer(*CodeCompleteResults)] results 
   # @param [Integer] index the zero-based diagnostic number to retrieve.
-  # @return [FFI::Pointer of Diagnostic] the requested diagnostic. This diagnostic must be freed
+  # @return [FFI::Pointer(Diagnostic)] the requested diagnostic. This diagnostic must be freed
   #   via a call to \c clang_disposeDiagnostic().
   # @scope class
   attach_function :code_complete_get_diagnostic, :clang_codeCompleteGetDiagnostic, [:pointer, :uint], :pointer
@@ -3329,7 +3522,7 @@ module Clang
   # the given code completion.
   # 
   # @method code_complete_get_contexts(results)
-  # @param [FFI::Pointer to ] results the code completion results to query
+  # @param [FFI::Pointer(*CodeCompleteResults)] results the code completion results to query
   # @return [Integer] the kinds of completions that are appropriate for use
   #   along with the given code completion results.
   # @scope class
@@ -3342,8 +3535,8 @@ module Clang
   # CXCursor_InvalidCode.
   # 
   # @method code_complete_get_container_kind(results, is_incomplete)
-  # @param [FFI::Pointer to ] results the code completion results to query
-  # @param [FFI::Pointer to ] is_incomplete on return, this value will be false if Clang has complete
+  # @param [FFI::Pointer(*CodeCompleteResults)] results the code completion results to query
+  # @param [FFI::Pointer(*UInt)] is_incomplete on return, this value will be false if Clang has complete
   #   information about the container. If Clang does not have complete
   #   information, this value will be true.
   # @return [Symbol from cursor_kind_enum] the container kind, or CXCursor_InvalidCode if there is not a
@@ -3356,7 +3549,7 @@ module Clang
   # function will return the empty string.
   # 
   # @method code_complete_get_container_usr(results)
-  # @param [FFI::Pointer to ] results the code completion results to query
+  # @param [FFI::Pointer(*CodeCompleteResults)] results the code completion results to query
   # @return [String] the USR for the container
   # @scope class
   attach_function :code_complete_get_container_usr, :clang_codeCompleteGetContainerUSR, [:pointer], String.by_value
@@ -3367,7 +3560,7 @@ module Clang
   # CXCompletionContext_ObjCClassMessage.
   # 
   # @method code_complete_get_obj_c_selector(results)
-  # @param [FFI::Pointer to ] results the code completion results to query
+  # @param [FFI::Pointer(*CodeCompleteResults)] results the code completion results to query
   # @return [String] the selector (or partial selector) that has been entered thus far
   #   for an Objective-C message send.
   # @scope class
@@ -3393,6 +3586,24 @@ module Clang
   # @scope class
   attach_function :toggle_crash_recovery, :clang_toggleCrashRecovery, [:uint], :void
 
+  # <em>This is no real method. This entry is only for documentation of the callback.</em>
+  # 
+  # Visitor invoked for each file in a translation unit
+  #        (used with clang_getInclusions()).
+  # 
+  # This visitor function will be invoked by clang_getInclusions() for each
+  # file included (either at the top-level or by #include directives) within
+  # a translation unit.  The first argument is the file being included, and
+  # the second and third arguments provide the inclusion stack.  The
+  # array is sorted in order of immediate inclusion.  For example,
+  # the first element refers to the location that included 'included_file'.
+  # 
+  # @method inclusion_visitor_callback(inclusion_stack, include_len, client_data)
+  # @param [FFI::Pointer(*SourceLocation)] inclusion_stack 
+  # @param [Integer] include_len 
+  # @param [FFI::Pointer(ClientData)] client_data 
+  # @return [FFI::Pointer(File)] 
+  # @scope class
   callback :inclusion_visitor, [:pointer, :uint, :pointer], :pointer
 
   # Visit the set of preprocessor inclusions in a translation unit.
@@ -3401,9 +3612,9 @@ module Clang
   #   is inspecting the inclusions in the PCH file itself).
   # 
   # @method get_inclusions(tu, visitor, client_data)
-  # @param [FFI::Pointer of TranslationUnit] tu 
-  # @param [Callback] visitor 
-  # @param [FFI::Pointer of ClientData] client_data 
+  # @param [FFI::Pointer(TranslationUnit)] tu 
+  # @param [Proc(inclusion_visitor_callback)] visitor 
+  # @param [FFI::Pointer(ClientData)] client_data 
   # @return [nil] 
   # @scope class
   attach_function :get_inclusions, :clang_getInclusions, [:pointer, :inclusion_visitor, :pointer], :void
@@ -3412,7 +3623,7 @@ module Clang
   # 
   # @method get_remappings(path)
   # @param [String] path the path that contains metadata about remappings.
-  # @return [FFI::Pointer of Remapping] the requested remapping. This remapping must be freed
+  # @return [FFI::Pointer(Remapping)] the requested remapping. This remapping must be freed
   #   via a call to \c clang_remap_dispose(). Can return NULL if an error occurred.
   # @scope class
   attach_function :get_remappings, :clang_getRemappings, [:string], :pointer
@@ -3420,7 +3631,7 @@ module Clang
   # Determine the number of remappings.
   # 
   # @method remap_get_num_files(remapping)
-  # @param [FFI::Pointer of Remapping] remapping 
+  # @param [FFI::Pointer(Remapping)] remapping 
   # @return [Integer] 
   # @scope class
   attach_function :remap_get_num_files, :clang_remap_getNumFiles, [:pointer], :uint
@@ -3428,10 +3639,10 @@ module Clang
   # Get the original and the associated filename from the remapping.
   # 
   # @method remap_get_filenames(remapping, index, original, transformed)
-  # @param [FFI::Pointer of Remapping] remapping 
+  # @param [FFI::Pointer(Remapping)] remapping 
   # @param [Integer] index 
-  # @param [FFI::Pointer to ] original If non-NULL, will be set to the original filename.
-  # @param [FFI::Pointer to ] transformed If non-NULL, will be set to the filename that the original
+  # @param [FFI::Pointer(*String)] original If non-NULL, will be set to the original filename.
+  # @param [FFI::Pointer(*String)] transformed If non-NULL, will be set to the filename that the original
   #   is associated with.
   # @return [nil] 
   # @scope class
@@ -3440,7 +3651,7 @@ module Clang
   # Dispose the remapping.
   # 
   # @method remap_dispose(remapping)
-  # @param [FFI::Pointer of Remapping] remapping 
+  # @param [FFI::Pointer(Remapping)] remapping 
   # @return [nil] 
   # @scope class
   attach_function :remap_dispose, :clang_remap_dispose, [:pointer], :void
@@ -3450,12 +3661,12 @@ module Clang
   # @{
   # 
   # === Options:
-  # :break::
+  # :break ::
   #   
-  # :continue::
+  # :continue ::
   #   
   #
-  # @return [Array of Symbols]
+  # @return [Array<Symbol>]
   def self.visitor_result_enum
     [:break, :continue]
   end
@@ -3464,6 +3675,16 @@ module Clang
     :continue
   ]
 
+  # \defgroup CINDEX_HIGH Higher level API functions
+  # 
+  # @{
+  # 
+  # = Fields:
+  # :context ::
+  #   (FFI::Pointer(*Void)) 
+  # :visit ::
+  #   (FFI::Pointer(*)) 
+  #
   class CursorAndRangeVisitor < FFI::Struct
     layout :context, :pointer,
            :visit, :pointer
@@ -3473,7 +3694,7 @@ module Clang
   # 
   # @method find_references_in_file(cursor, file, visitor)
   # @param [Cursor] cursor pointing to a declaration or a reference of one.
-  # @param [FFI::Pointer of File] file to search for references.
+  # @param [FFI::Pointer(File)] file to search for references.
   # @param [CursorAndRangeVisitor] visitor callback that will receive pairs of CXCursor/CXSourceRange for
   #   each reference found.
   #   The CXSourceRange will point inside the file; if the reference is inside