[cfe-commits] [PATCH] [cindex.py] Do not fail when registering non-existing functions
Gregory Szorc
gregory.szorc at gmail.com
Fri Aug 24 23:45:50 PDT 2012
I agree with the sentiment of wanting increased compatibility, but I'm
hesitant that this change is the right answer.
IMO the version compatibility story should be "use the same revision
number for both libclang and the Python bindings." If the revision of
libclang and the Python bindings varies, there is a potential for them
to be out of sync, for backwards incompatibility to cause
unexpected/undefined behavior, etc. This is dangerous. (I would
actually like to have a feature in the Python bindings where they
(optionally) refuse to talk to a libclang that was built from a
different revision of the source tree than the bindings.) If we were
to commit this patch, we are effectively saying that we /think/ the
bindings /might/ be compatible with your version of libclang. But, we
really don't know what features are supported or if they will work
correctly. If we were to take this patch, we'd also need a
compatibility story. What if a user of Clang 2.9 complains about the
current trunk bindings not working? Are we obligated to support them?
What about a 3.0 user? 3.1? Where do you draw the line? We have a
clear line today: use the same version control revision. This patch
removes that and introduces a lot of ambiguity.
I understand that you are trying to enable users of old Clang to reap
the recent performance improvements of the Python bindings without
having to upgrade Clang. This is a noble goal. However, this is risky.
Instead, I think this decision should be left to downstream users.
Backporting individual patches is relatively simple. And, the test
suite does give some peace of mind (although the code complete APIs
don't have tests, sadly). Alternatively, if Clang maintained its
release branches post-release, performance patches like the recent
code complete ones would likely be obvious candidates for backport. If
nothing else, some power user could maintain her own branch of
bindings with backported trunk changes that she guarantees to work
with libclang X.Y. I believe that the trunk bindings should only
provide compatibility with trunk libclang.
Gregory
On Fri, Aug 24, 2012 at 6:15 AM, Tobias Grosser <tobias at grosser.es> wrote:
> To allow the use of the python bindings with older versions of libclang, we do
> not fail when trying to register non-existing libclang functions. This allows
> users to always use the newest python bindings even with older libclang.so
> versions. Users will only get an error if they actually use unsupported
> features. Features that already exist in older libclang.so versions can
> can be used without problems. This means that even if we use an older
> libclang.so installations, we can still take advantage of (performance)
> improvements in the python bindings.
> ---
> bindings/python/clang/cindex.py | 919 +++++++++++++++++++++++----------------
> 1 file changed, 537 insertions(+), 382 deletions(-)
>
> diff --git a/bindings/python/clang/cindex.py b/bindings/python/clang/cindex.py
> index 628ade1..7bb217c 100644
> --- a/bindings/python/clang/cindex.py
> +++ b/bindings/python/clang/cindex.py
> @@ -2423,424 +2423,579 @@ callbacks['translation_unit_includes'] = CFUNCTYPE(None, c_object_p,
> POINTER(SourceLocation), c_uint, py_object)
> callbacks['cursor_visit'] = CFUNCTYPE(c_int, Cursor, Cursor, py_object)
>
> -def register_functions(lib):
> - """Register function prototypes with a libclang library instance.
> -
> - This must be called as part of library instantiation so Python knows how
> - to call out to the shared library.
> - """
> - # Functions are registered in strictly alphabetical order.
> - lib.clang_annotateTokens.argtype = [TranslationUnit, POINTER(Token),
> - c_uint, POINTER(Cursor)]
> -
> - lib.clang_CompilationDatabase_dispose.argtypes = [c_object_p]
> -
> - lib.clang_CompilationDatabase_fromDirectory.argtypes = [c_char_p,
> - POINTER(c_uint)]
> - lib.clang_CompilationDatabase_fromDirectory.restype = c_object_p
> - lib.clang_CompilationDatabase_fromDirectory.errcheck = CompilationDatabase.from_result
> -
> - lib.clang_CompilationDatabase_getCompileCommands.argtypes = [c_object_p, c_char_p]
> - lib.clang_CompilationDatabase_getCompileCommands.restype = c_object_p
> - lib.clang_CompilationDatabase_getCompileCommands.errcheck = CompileCommands.from_result
> -
> - lib.clang_CompileCommands_dispose.argtypes = [c_object_p]
> -
> - lib.clang_CompileCommands_getCommand.argtypes = [c_object_p, c_uint]
> - lib.clang_CompileCommands_getCommand.restype = c_object_p
> -
> - lib.clang_CompileCommands_getSize.argtypes = [c_object_p]
> - lib.clang_CompileCommands_getSize.restype = c_uint
> -
> - lib.clang_CompileCommand_getArg.argtypes = [c_object_p, c_uint]
> - lib.clang_CompileCommand_getArg.restype = _CXString
> - lib.clang_CompileCommand_getArg.errcheck = _CXString.from_result
> -
> - lib.clang_CompileCommand_getDirectory.argtypes = [c_object_p]
> - lib.clang_CompileCommand_getDirectory.restype = _CXString
> - lib.clang_CompileCommand_getDirectory.errcheck = _CXString.from_result
> -
> - lib.clang_CompileCommand_getNumArgs.argtypes = [c_object_p]
> - lib.clang_CompileCommand_getNumArgs.restype = c_uint
> -
> - lib.clang_codeCompleteAt.argtypes = [TranslationUnit, c_char_p, c_int,
> - c_int, c_void_p, c_int, c_int]
> - lib.clang_codeCompleteAt.restype = POINTER(CCRStructure)
> -
> - lib.clang_codeCompleteGetDiagnostic.argtypes = [CodeCompletionResults,
> - c_int]
> - lib.clang_codeCompleteGetDiagnostic.restype = Diagnostic
> -
> - lib.clang_codeCompleteGetNumDiagnostics.argtypes = [CodeCompletionResults]
> - lib.clang_codeCompleteGetNumDiagnostics.restype = c_int
> -
> - lib.clang_createIndex.argtypes = [c_int, c_int]
> - lib.clang_createIndex.restype = c_object_p
> -
> - lib.clang_createTranslationUnit.argtypes = [Index, c_char_p]
> - lib.clang_createTranslationUnit.restype = c_object_p
> -
> - lib.clang_CXXMethod_isStatic.argtypes = [Cursor]
> - lib.clang_CXXMethod_isStatic.restype = bool
> -
> - lib.clang_CXXMethod_isVirtual.argtypes = [Cursor]
> - lib.clang_CXXMethod_isVirtual.restype = bool
> -
> - lib.clang_defaultSaveOptions.argtypes = [TranslationUnit]
> - lib.clang_defaultSaveOptions.restype = c_uint
> -
> - lib.clang_disposeCodeCompleteResults.argtypes = [CodeCompletionResults]
> -
> - #lib.clang_disposeCXTUResourceUsage.argtypes = [CXTUResourceUsage]
> -
> - lib.clang_disposeDiagnostic.argtypes = [Diagnostic]
> -
> - lib.clang_disposeIndex.argtypes = [Index]
> -
> - lib.clang_disposeString.argtypes = [_CXString]
> -
> - lib.clang_disposeTokens.argtype = [TranslationUnit, POINTER(Token), c_uint]
> -
> - lib.clang_disposeTranslationUnit.argtypes = [TranslationUnit]
> -
> - lib.clang_equalCursors.argtypes = [Cursor, Cursor]
> - lib.clang_equalCursors.restype = bool
> -
> - lib.clang_equalLocations.argtypes = [SourceLocation, SourceLocation]
> - lib.clang_equalLocations.restype = bool
> -
> - lib.clang_equalRanges.argtypes = [SourceRange, SourceRange]
> - lib.clang_equalRanges.restype = bool
> -
> - lib.clang_equalTypes.argtypes = [Type, Type]
> - lib.clang_equalTypes.restype = bool
> -
> - lib.clang_getArgType.argtypes = [Type, c_uint]
> - lib.clang_getArgType.restype = Type
> - lib.clang_getArgType.errcheck = Type.from_result
> -
> - lib.clang_getArrayElementType.argtypes = [Type]
> - lib.clang_getArrayElementType.restype = Type
> - lib.clang_getArrayElementType.errcheck = Type.from_result
> -
> - lib.clang_getArraySize.argtypes = [Type]
> - lib.clang_getArraySize.restype = c_longlong
> -
> - lib.clang_getCanonicalCursor.argtypes = [Cursor]
> - lib.clang_getCanonicalCursor.restype = Cursor
> - lib.clang_getCanonicalCursor.errcheck = Cursor.from_cursor_result
> -
> - lib.clang_getCanonicalType.argtypes = [Type]
> - lib.clang_getCanonicalType.restype = Type
> - lib.clang_getCanonicalType.errcheck = Type.from_result
> -
> - lib.clang_getCompletionAvailability.argtypes = [c_void_p]
> - lib.clang_getCompletionAvailability.restype = c_int
> -
> - lib.clang_getCompletionChunkCompletionString.argtypes = [c_void_p, c_int]
> - lib.clang_getCompletionChunkCompletionString.restype = c_object_p
> -
> - lib.clang_getCompletionChunkKind.argtypes = [c_void_p, c_int]
> - lib.clang_getCompletionChunkKind.restype = c_int
> -
> - lib.clang_getCompletionChunkText.argtypes = [c_void_p, c_int]
> - lib.clang_getCompletionChunkText.restype = _CXString
> -
> - lib.clang_getCompletionPriority.argtypes = [c_void_p]
> - lib.clang_getCompletionPriority.restype = c_int
> -
> - lib.clang_getCString.argtypes = [_CXString]
> - lib.clang_getCString.restype = c_char_p
> -
> - lib.clang_getCursor.argtypes = [TranslationUnit, SourceLocation]
> - lib.clang_getCursor.restype = Cursor
> -
> - lib.clang_getCursorDefinition.argtypes = [Cursor]
> - lib.clang_getCursorDefinition.restype = Cursor
> - lib.clang_getCursorDefinition.errcheck = Cursor.from_result
> -
> - lib.clang_getCursorDisplayName.argtypes = [Cursor]
> - lib.clang_getCursorDisplayName.restype = _CXString
> - lib.clang_getCursorDisplayName.errcheck = _CXString.from_result
> -
> - lib.clang_getCursorExtent.argtypes = [Cursor]
> - lib.clang_getCursorExtent.restype = SourceRange
> -
> - lib.clang_getCursorLexicalParent.argtypes = [Cursor]
> - lib.clang_getCursorLexicalParent.restype = Cursor
> - lib.clang_getCursorLexicalParent.errcheck = Cursor.from_cursor_result
> -
> - lib.clang_getCursorLocation.argtypes = [Cursor]
> - lib.clang_getCursorLocation.restype = SourceLocation
> +# Functions strictly alphabetical order.
> +functionList = [
> + ("clang_annotateTokens",
> + [TranslationUnit, POINTER(Token), c_uint, POINTER(Cursor)]),
>
> - lib.clang_getCursorReferenced.argtypes = [Cursor]
> - lib.clang_getCursorReferenced.restype = Cursor
> - lib.clang_getCursorReferenced.errcheck = Cursor.from_result
> + ("clang_CompilationDatabase_dispose",
> + [c_object_p]),
>
> - lib.clang_getCursorReferenceNameRange.argtypes = [Cursor, c_uint, c_uint]
> - lib.clang_getCursorReferenceNameRange.restype = SourceRange
> + ("clang_CompilationDatabase_fromDirectory",
> + [c_char_p, POINTER(c_uint)],
> + c_object_p,
> + CompilationDatabase.from_result),
>
> - lib.clang_getCursorSemanticParent.argtypes = [Cursor]
> - lib.clang_getCursorSemanticParent.restype = Cursor
> - lib.clang_getCursorSemanticParent.errcheck = Cursor.from_cursor_result
> + ("clang_CompilationDatabase_getCompileCommands",
> + [c_object_p, c_char_p],
> + c_object_p,
> + CompileCommands.from_result),
>
> - lib.clang_getCursorSpelling.argtypes = [Cursor]
> - lib.clang_getCursorSpelling.restype = _CXString
> - lib.clang_getCursorSpelling.errcheck = _CXString.from_result
> + ("clang_CompileCommands_dispose",
> + [c_object_p]),
>
> - lib.clang_getCursorType.argtypes = [Cursor]
> - lib.clang_getCursorType.restype = Type
> - lib.clang_getCursorType.errcheck = Type.from_result
> + ("clang_CompileCommands_getCommand",
> + [c_object_p, c_uint],
> + c_object_p),
>
> - lib.clang_getCursorUSR.argtypes = [Cursor]
> - lib.clang_getCursorUSR.restype = _CXString
> - lib.clang_getCursorUSR.errcheck = _CXString.from_result
> + ("clang_CompileCommands_getSize",
> + [c_object_p],
> + c_uint),
>
> - #lib.clang_getCXTUResourceUsage.argtypes = [TranslationUnit]
> - #lib.clang_getCXTUResourceUsage.restype = CXTUResourceUsage
> + ("clang_CompileCommand_getArg",
> + [c_object_p, c_uint],
> + _CXString,
> + _CXString.from_result),
>
> - lib.clang_getCXXAccessSpecifier.argtypes = [Cursor]
> - lib.clang_getCXXAccessSpecifier.restype = c_uint
> + ("clang_CompileCommand_getDirectory",
> + [c_object_p],
> + _CXString,
> + _CXString.from_result),
>
> - lib.clang_getDeclObjCTypeEncoding.argtypes = [Cursor]
> - lib.clang_getDeclObjCTypeEncoding.restype = _CXString
> - lib.clang_getDeclObjCTypeEncoding.errcheck = _CXString.from_result
> + ("clang_CompileCommand_getNumArgs",
> + [c_object_p],
> + c_uint),
>
> - lib.clang_getDiagnostic.argtypes = [c_object_p, c_uint]
> - lib.clang_getDiagnostic.restype = c_object_p
> + ("clang_codeCompleteAt",
> + [TranslationUnit, c_char_p, c_int, c_int, c_void_p, c_int, c_int],
> + POINTER(CCRStructure)),
>
> - lib.clang_getDiagnosticCategory.argtypes = [Diagnostic]
> - lib.clang_getDiagnosticCategory.restype = c_uint
> + ("clang_codeCompleteGetDiagnostic",
> + [CodeCompletionResults, c_int],
> + Diagnostic),
>
> - lib.clang_getDiagnosticCategoryName.argtypes = [c_uint]
> - lib.clang_getDiagnosticCategoryName.restype = _CXString
> - lib.clang_getDiagnosticCategoryName.errcheck = _CXString.from_result
> + ("clang_codeCompleteGetNumDiagnostics",
> + [CodeCompletionResults],
> + c_int),
>
> - lib.clang_getDiagnosticFixIt.argtypes = [Diagnostic, c_uint,
> - POINTER(SourceRange)]
> - lib.clang_getDiagnosticFixIt.restype = _CXString
> - lib.clang_getDiagnosticFixIt.errcheck = _CXString.from_result
> + ("clang_createIndex",
> + [c_int, c_int],
> + c_object_p),
>
> - lib.clang_getDiagnosticLocation.argtypes = [Diagnostic]
> - lib.clang_getDiagnosticLocation.restype = SourceLocation
> + ("clang_createTranslationUnit",
> + [Index, c_char_p],
> + c_object_p),
>
> - lib.clang_getDiagnosticNumFixIts.argtypes = [Diagnostic]
> - lib.clang_getDiagnosticNumFixIts.restype = c_uint
> + ("clang_CXXMethod_isStatic",
> + [Cursor],
> + bool),
>
> - lib.clang_getDiagnosticNumRanges.argtypes = [Diagnostic]
> - lib.clang_getDiagnosticNumRanges.restype = c_uint
> + ("clang_CXXMethod_isVirtual",
> + [Cursor],
> + bool),
>
> - lib.clang_getDiagnosticOption.argtypes = [Diagnostic, POINTER(_CXString)]
> - lib.clang_getDiagnosticOption.restype = _CXString
> - lib.clang_getDiagnosticOption.errcheck = _CXString.from_result
> + ("clang_defaultSaveOptions",
> + [TranslationUnit],
> + c_uint),
>
> - lib.clang_getDiagnosticRange.argtypes = [Diagnostic, c_uint]
> - lib.clang_getDiagnosticRange.restype = SourceRange
> + ("clang_disposeCodeCompleteResults",
> + [CodeCompletionResults]),
>
> - lib.clang_getDiagnosticSeverity.argtypes = [Diagnostic]
> - lib.clang_getDiagnosticSeverity.restype = c_int
> +# ("clang_disposeCXTUResourceUsage",
> +# [CXTUResourceUsage]),
> +
> + ("clang_disposeDiagnostic",
> + [Diagnostic]),
> +
> + ("clang_disposeIndex",
> + [Index]),
>
> - lib.clang_getDiagnosticSpelling.argtypes = [Diagnostic]
> - lib.clang_getDiagnosticSpelling.restype = _CXString
> - lib.clang_getDiagnosticSpelling.errcheck = _CXString.from_result
> + ("clang_disposeString",
> + [_CXString]),
> +
> + ("clang_disposeTokens",
> + [TranslationUnit, POINTER(Token), c_uint]),
> +
> + ("clang_disposeTranslationUnit",
> + [TranslationUnit]),
> +
> + ("clang_equalCursors",
> + [Cursor, Cursor],
> + bool),
> +
> + ("clang_equalLocations",
> + [SourceLocation, SourceLocation],
> + bool),
> +
> + ("clang_equalRanges",
> + [SourceRange, SourceRange],
> + bool),
> +
> + ("clang_equalTypes",
> + [Type, Type],
> + bool),
> +
> + ("clang_getArgType",
> + [Type, c_uint],
> + Type,
> + Type.from_result),
> +
> + ("clang_getArrayElementType",
> + [Type],
> + Type,
> + Type.from_result),
> +
> + ("clang_getArraySize",
> + [Type],
> + c_longlong),
> +
> + ("clang_getCanonicalCursor",
> + [Cursor],
> + Cursor,
> + Cursor.from_cursor_result),
> +
> + ("clang_getCanonicalType",
> + [Type],
> + Type,
> + Type.from_result),
> +
> + ("clang_getCompletionAvailability",
> + [c_void_p],
> + c_int),
> +
> + ("clang_getCompletionChunkCompletionString",
> + [c_void_p, c_int],
> + c_object_p),
> +
> + ("clang_getCompletionChunkKind",
> + [c_void_p, c_int],
> + c_int),
> +
> + ("clang_getCompletionChunkText",
> + [c_void_p, c_int],
> + _CXString),
> +
> + ("clang_getCompletionPriority",
> + [c_void_p],
> + c_int),
> +
> + ("clang_getCString",
> + [_CXString],
> + c_char_p),
> +
> + ("clang_getCursor",
> + [TranslationUnit, SourceLocation],
> + Cursor),
> +
> + ("clang_getCursorDefinition",
> + [Cursor],
> + Cursor,
> + Cursor.from_result),
> +
> + ("clang_getCursorDisplayName",
> + [Cursor],
> + _CXString,
> + _CXString.from_result),
> +
> + ("clang_getCursorExtent",
> + [Cursor],
> + SourceRange),
> +
> + ("clang_getCursorLexicalParent",
> + [Cursor],
> + Cursor,
> + Cursor.from_cursor_result),
> +
> + ("clang_getCursorLocation",
> + [Cursor],
> + SourceLocation),
> +
> + ("clang_getCursorReferenced",
> + [Cursor],
> + Cursor,
> + Cursor.from_result),
> +
> + ("clang_getCursorReferenceNameRange",
> + [Cursor, c_uint, c_uint],
> + SourceRange),
> +
> + ("clang_getCursorSemanticParent",
> + [Cursor],
> + Cursor,
> + Cursor.from_cursor_result),
> +
> + ("clang_getCursorSpelling",
> + [Cursor],
> + _CXString,
> + _CXString.from_result),
> +
> + ("clang_getCursorType",
> + [Cursor],
> + Type,
> + Type.from_result),
> +
> + ("clang_getCursorUSR",
> + [Cursor],
> + _CXString,
> + _CXString.from_result),
> +
> +# ("clang_getCXTUResourceUsage",
> +# [TranslationUnit],
> +# CXTUResourceUsage),
> +
> + ("clang_getCXXAccessSpecifier",
> + [Cursor],
> + c_uint),
> +
> + ("clang_getDeclObjCTypeEncoding",
> + [Cursor],
> + _CXString,
> + _CXString.from_result),
> +
> + ("clang_getDiagnostic",
> + [c_object_p, c_uint],
> + c_object_p),
> +
> + ("clang_getDiagnosticCategory",
> + [Diagnostic],
> + c_uint),
> +
> + ("clang_getDiagnosticCategoryName",
> + [c_uint],
> + _CXString,
> + _CXString.from_result),
> +
> + ("clang_getDiagnosticFixIt",
> + [Diagnostic, c_uint, POINTER(SourceRange)],
> + _CXString,
> + _CXString.from_result),
> +
> + ("clang_getDiagnosticLocation",
> + [Diagnostic],
> + SourceLocation),
> +
> + ("clang_getDiagnosticNumFixIts",
> + [Diagnostic],
> + c_uint),
> +
> + ("clang_getDiagnosticNumRanges",
> + [Diagnostic],
> + c_uint),
> +
> + ("clang_getDiagnosticOption",
> + [Diagnostic, POINTER(_CXString)],
> + _CXString,
> + _CXString.from_result),
> +
> + ("clang_getDiagnosticRange",
> + [Diagnostic, c_uint],
> + SourceRange),
> +
> + ("clang_getDiagnosticSeverity",
> + [Diagnostic],
> + c_int),
> +
> + ("clang_getDiagnosticSpelling",
> + [Diagnostic],
> + _CXString,
> + _CXString.from_result),
> +
> + ("clang_getElementType",
> + [Type],
> + Type,
> + Type.from_result),
> +
> + ("clang_getEnumConstantDeclUnsignedValue",
> + [Cursor],
> + c_ulonglong),
> +
> + ("clang_getEnumConstantDeclValue",
> + [Cursor],
> + c_longlong),
> +
> + ("clang_getEnumDeclIntegerType",
> + [Cursor],
> + Type,
> + Type.from_result),
> +
> + ("clang_getFile",
> + [TranslationUnit, c_char_p],
> + c_object_p),
> +
> + ("clang_getFileName",
> + [File],
> + _CXString), # TODO go through _CXString.from_result?
> +
> + ("clang_getFileTime",
> + [File],
> + c_uint),
> +
> + ("clang_getIBOutletCollectionType",
> + [Cursor],
> + Type,
> + Type.from_result),
> +
> + ("clang_getIncludedFile",
> + [Cursor],
> + File,
> + File.from_cursor_result),
> +
> + ("clang_getInclusions",
> + [TranslationUnit, callbacks['translation_unit_includes'], py_object]),
> +
> + ("clang_getInstantiationLocation",
> + [SourceLocation, POINTER(c_object_p), POINTER(c_uint), POINTER(c_uint),
> + POINTER(c_uint)]),
> +
> + ("clang_getLocation",
> + [TranslationUnit, File, c_uint, c_uint],
> + SourceLocation),
> +
> + ("clang_getLocationForOffset",
> + [TranslationUnit, File, c_uint],
> + SourceLocation),
> +
> + ("clang_getNullCursor",
> + None,
> + Cursor),
> +
> + ("clang_getNumArgTypes",
> + [Type],
> + c_uint),
> +
> + ("clang_getNumCompletionChunks",
> + [c_void_p],
> + c_int),
> +
> + ("clang_getNumDiagnostics",
> + [c_object_p],
> + c_uint),
> +
> + ("clang_getNumElements",
> + [Type],
> + c_longlong),
> +
> + ("clang_getNumOverloadedDecls",
> + [Cursor],
> + c_uint),
> +
> + ("clang_getOverloadedDecl",
> + [Cursor, c_uint],
> + Cursor,
> + Cursor.from_cursor_result),
> +
> + ("clang_getPointeeType",
> + [Type],
> + Type,
> + Type.from_result),
> +
> + ("clang_getRange",
> + [SourceLocation, SourceLocation],
> + SourceRange),
> +
> + ("clang_getRangeEnd",
> + [SourceRange],
> + SourceLocation),
> +
> + ("clang_getRangeStart",
> + [SourceRange],
> + SourceLocation),
> +
> + ("clang_getResultType",
> + [Type],
> + Type,
> + Type.from_result),
> +
> + ("clang_getSpecializedCursorTemplate",
> + [Cursor],
> + Cursor,
> + Cursor.from_cursor_result),
> +
> + ("clang_getTemplateCursorKind",
> + [Cursor],
> + c_uint),
> +
> + ("clang_getTokenExtent",
> + [TranslationUnit, Token],
> + SourceRange),
> +
> + ("clang_getTokenKind",
> + [Token],
> + c_uint),
> +
> + ("clang_getTokenLocation",
> + [TranslationUnit, Token],
> + SourceLocation),
> +
> + ("clang_getTokenSpelling",
> + [TranslationUnit, Token],
> + _CXString,
> + _CXString.from_result),
> +
> + ("clang_getTranslationUnitCursor",
> + [TranslationUnit],
> + Cursor,
> + Cursor.from_result),
> +
> + ("clang_getTranslationUnitSpelling",
> + [TranslationUnit],
> + _CXString,
> + _CXString.from_result),
> +
> + ("clang_getTUResourceUsageName",
> + [c_uint],
> + c_char_p),
> +
> + ("clang_getTypeDeclaration",
> + [Type],
> + Cursor,
> + Cursor.from_result),
> +
> + ("clang_getTypedefDeclUnderlyingType",
> + [Cursor],
> + Type,
> + Type.from_result),
> +
> + ("clang_getTypeKindSpelling",
> + [c_uint],
> + _CXString,
> + _CXString.from_result),
> +
> + ("clang_hashCursor",
> + [Cursor],
> + c_uint),
> +
> + ("clang_isAttribute",
> + [CursorKind],
> + bool),
> +
> + ("clang_isConstQualifiedType",
> + [Type],
> + bool),
> +
> + ("clang_isCursorDefinition",
> + [Cursor],
> + bool),
> +
> + ("clang_isDeclaration",
> + [CursorKind],
> + bool),
> +
> + ("clang_isExpression",
> + [CursorKind],
> + bool),
> +
> + ("clang_isFileMultipleIncludeGuarded",
> + [TranslationUnit, File],
> + bool),
> +
> + ("clang_isFunctionTypeVariadic",
> + [Type],
> + bool),
> +
> + ("clang_isInvalid",
> + [CursorKind],
> + bool),
> +
> + ("clang_isPODType",
> + [Type],
> + bool),
> +
> + ("clang_isPreprocessing",
> + [CursorKind],
> + bool),
> +
> + ("clang_isReference",
> + [CursorKind],
> + bool),
> +
> + ("clang_isRestrictQualifiedType",
> + [Type],
> + bool),
> +
> + ("clang_isStatement",
> + [CursorKind],
> + bool),
> +
> + ("clang_isTranslationUnit",
> + [CursorKind],
> + bool),
> +
> + ("clang_isUnexposed",
> + [CursorKind],
> + bool),
> +
> + ("clang_isVirtualBase",
> + [Cursor],
> + bool),
> +
> + ("clang_isVolatileQualifiedType",
> + [Type],
> + bool),
> +
> + ("clang_parseTranslationUnit",
> + [Index, c_char_p, c_void_p, c_int, c_void_p, c_int, c_int],
> + c_object_p),
>
> - lib.clang_getElementType.argtypes = [Type]
> - lib.clang_getElementType.restype = Type
> - lib.clang_getElementType.errcheck = Type.from_result
> + ("clang_reparseTranslationUnit",
> + [TranslationUnit, c_int, c_void_p, c_int],
> + c_int),
>
> - lib.clang_getEnumConstantDeclUnsignedValue.argtypes = [Cursor]
> - lib.clang_getEnumConstantDeclUnsignedValue.restype = c_ulonglong
> + ("clang_saveTranslationUnit",
> + [TranslationUnit, c_char_p, c_uint],
> + c_int),
>
> - lib.clang_getEnumConstantDeclValue.argtypes = [Cursor]
> - lib.clang_getEnumConstantDeclValue.restype = c_longlong
> -
> - lib.clang_getEnumDeclIntegerType.argtypes = [Cursor]
> - lib.clang_getEnumDeclIntegerType.restype = Type
> - lib.clang_getEnumDeclIntegerType.errcheck = Type.from_result
> -
> - lib.clang_getFile.argtypes = [TranslationUnit, c_char_p]
> - lib.clang_getFile.restype = c_object_p
> -
> - lib.clang_getFileName.argtypes = [File]
> - lib.clang_getFileName.restype = _CXString
> - # TODO go through _CXString.from_result?
> -
> - lib.clang_getFileTime.argtypes = [File]
> - lib.clang_getFileTime.restype = c_uint
> -
> - lib.clang_getIBOutletCollectionType.argtypes = [Cursor]
> - lib.clang_getIBOutletCollectionType.restype = Type
> - lib.clang_getIBOutletCollectionType.errcheck = Type.from_result
> -
> - lib.clang_getIncludedFile.argtypes = [Cursor]
> - lib.clang_getIncludedFile.restype = File
> - lib.clang_getIncludedFile.errcheck = File.from_cursor_result
> -
> - lib.clang_getInclusions.argtypes = [TranslationUnit,
> - callbacks['translation_unit_includes'], py_object]
> -
> - lib.clang_getInstantiationLocation.argtypes = [SourceLocation,
> - POINTER(c_object_p), POINTER(c_uint), POINTER(c_uint), POINTER(c_uint)]
> -
> - lib.clang_getLocation.argtypes = [TranslationUnit, File, c_uint, c_uint]
> - lib.clang_getLocation.restype = SourceLocation
> -
> - lib.clang_getLocationForOffset.argtypes = [TranslationUnit, File, c_uint]
> - lib.clang_getLocationForOffset.restype = SourceLocation
> -
> - lib.clang_getNullCursor.restype = Cursor
> -
> - lib.clang_getNumArgTypes.argtypes = [Type]
> - lib.clang_getNumArgTypes.restype = c_uint
> -
> - lib.clang_getNumCompletionChunks.argtypes = [c_void_p]
> - lib.clang_getNumCompletionChunks.restype = c_int
> -
> - lib.clang_getNumDiagnostics.argtypes = [c_object_p]
> - lib.clang_getNumDiagnostics.restype = c_uint
> -
> - lib.clang_getNumElements.argtypes = [Type]
> - lib.clang_getNumElements.restype = c_longlong
> -
> - lib.clang_getNumOverloadedDecls.argtypes = [Cursor]
> - lib.clang_getNumOverloadedDecls.restyp = c_uint
> -
> - lib.clang_getOverloadedDecl.argtypes = [Cursor, c_uint]
> - lib.clang_getOverloadedDecl.restype = Cursor
> - lib.clang_getOverloadedDecl.errcheck = Cursor.from_cursor_result
> -
> - lib.clang_getPointeeType.argtypes = [Type]
> - lib.clang_getPointeeType.restype = Type
> - lib.clang_getPointeeType.errcheck = Type.from_result
> -
> - lib.clang_getRange.argtypes = [SourceLocation, SourceLocation]
> - lib.clang_getRange.restype = SourceRange
> -
> - lib.clang_getRangeEnd.argtypes = [SourceRange]
> - lib.clang_getRangeEnd.restype = SourceLocation
> -
> - lib.clang_getRangeStart.argtypes = [SourceRange]
> - lib.clang_getRangeStart.restype = SourceLocation
> -
> - lib.clang_getResultType.argtypes = [Type]
> - lib.clang_getResultType.restype = Type
> - lib.clang_getResultType.errcheck = Type.from_result
> -
> - lib.clang_getSpecializedCursorTemplate.argtypes = [Cursor]
> - lib.clang_getSpecializedCursorTemplate.restype = Cursor
> - lib.clang_getSpecializedCursorTemplate.errcheck = Cursor.from_cursor_result
> -
> - lib.clang_getTemplateCursorKind.argtypes = [Cursor]
> - lib.clang_getTemplateCursorKind.restype = c_uint
> -
> - lib.clang_getTokenExtent.argtypes = [TranslationUnit, Token]
> - lib.clang_getTokenExtent.restype = SourceRange
> -
> - lib.clang_getTokenKind.argtypes = [Token]
> - lib.clang_getTokenKind.restype = c_uint
> -
> - lib.clang_getTokenLocation.argtype = [TranslationUnit, Token]
> - lib.clang_getTokenLocation.restype = SourceLocation
> -
> - lib.clang_getTokenSpelling.argtype = [TranslationUnit, Token]
> - lib.clang_getTokenSpelling.restype = _CXString
> - lib.clang_getTokenSpelling.errcheck = _CXString.from_result
> -
> - lib.clang_getTranslationUnitCursor.argtypes = [TranslationUnit]
> - lib.clang_getTranslationUnitCursor.restype = Cursor
> - lib.clang_getTranslationUnitCursor.errcheck = Cursor.from_result
> -
> - lib.clang_getTranslationUnitSpelling.argtypes = [TranslationUnit]
> - lib.clang_getTranslationUnitSpelling.restype = _CXString
> - lib.clang_getTranslationUnitSpelling.errcheck = _CXString.from_result
> -
> - lib.clang_getTUResourceUsageName.argtypes = [c_uint]
> - lib.clang_getTUResourceUsageName.restype = c_char_p
> -
> - lib.clang_getTypeDeclaration.argtypes = [Type]
> - lib.clang_getTypeDeclaration.restype = Cursor
> - lib.clang_getTypeDeclaration.errcheck = Cursor.from_result
> -
> - lib.clang_getTypedefDeclUnderlyingType.argtypes = [Cursor]
> - lib.clang_getTypedefDeclUnderlyingType.restype = Type
> - lib.clang_getTypedefDeclUnderlyingType.errcheck = Type.from_result
> -
> - lib.clang_getTypeKindSpelling.argtypes = [c_uint]
> - lib.clang_getTypeKindSpelling.restype = _CXString
> - lib.clang_getTypeKindSpelling.errcheck = _CXString.from_result
> -
> - lib.clang_hashCursor.argtypes = [Cursor]
> - lib.clang_hashCursor.restype = c_uint
> -
> - lib.clang_isAttribute.argtypes = [CursorKind]
> - lib.clang_isAttribute.restype = bool
> -
> - lib.clang_isConstQualifiedType.argtypes = [Type]
> - lib.clang_isConstQualifiedType.restype = bool
> -
> - lib.clang_isCursorDefinition.argtypes = [Cursor]
> - lib.clang_isCursorDefinition.restype = bool
> -
> - lib.clang_isDeclaration.argtypes = [CursorKind]
> - lib.clang_isDeclaration.restype = bool
> -
> - lib.clang_isExpression.argtypes = [CursorKind]
> - lib.clang_isExpression.restype = bool
> -
> - lib.clang_isFileMultipleIncludeGuarded.argtypes = [TranslationUnit, File]
> - lib.clang_isFileMultipleIncludeGuarded.restype = bool
> -
> - lib.clang_isFunctionTypeVariadic.argtypes = [Type]
> - lib.clang_isFunctionTypeVariadic.restype = bool
> -
> - lib.clang_isInvalid.argtypes = [CursorKind]
> - lib.clang_isInvalid.restype = bool
> -
> - lib.clang_isPODType.argtypes = [Type]
> - lib.clang_isPODType.restype = bool
> + ("clang_tokenize",
> + [TranslationUnit, SourceRange, POINTER(POINTER(Token)), POINTER(c_uint)]),
> +
> + ("clang_visitChildren",
> + [Cursor, callbacks['cursor_visit'], py_object],
> + c_uint),
> +]
>
> - lib.clang_isPreprocessing.argtypes = [CursorKind]
> - lib.clang_isPreprocessing.restype = bool
> +def register_function(lib, item):
> + name = item[0]
> + argtypes = None
> + restype = None
> + errcheck = None
>
> - lib.clang_isReference.argtypes = [CursorKind]
> - lib.clang_isReference.restype = bool
> + if len(item) >= 2:
> + argtypes = item[1]
>
> - lib.clang_isRestrictQualifiedType.argtypes = [Type]
> - lib.clang_isRestrictQualifiedType.restype = bool
> + if len(item) >= 3:
> + restype = item[2]
>
> - lib.clang_isStatement.argtypes = [CursorKind]
> - lib.clang_isStatement.restype = bool
> + if len(item) == 4:
> + errcheck = item[3]
>
> - lib.clang_isTranslationUnit.argtypes = [CursorKind]
> - lib.clang_isTranslationUnit.restype = bool
> + # A function may not exist, if these bindings are used with an older version
> + # of libclang.so. In this case, we just ignore the function.
> + try:
> + func = getattr(lib, name)
> + except AttributeError:
> + return
>
> - lib.clang_isUnexposed.argtypes = [CursorKind]
> - lib.clang_isUnexposed.restype = bool
> + if argtypes:
> + func.argtypes = argtypes
>
> - lib.clang_isVirtualBase.argtypes = [Cursor]
> - lib.clang_isVirtualBase.restype = bool
> + if restype:
> + func.restype = restype
>
> - lib.clang_isVolatileQualifiedType.argtypes = [Type]
> - lib.clang_isVolatileQualifiedType.restype = bool
> + if errcheck:
> + func.errcheck = errcheck
>
> - lib.clang_parseTranslationUnit.argypes = [Index, c_char_p, c_void_p, c_int,
> - c_void_p, c_int, c_int]
> - lib.clang_parseTranslationUnit.restype = c_object_p
>
> - lib.clang_reparseTranslationUnit.argtypes = [TranslationUnit, c_int,
> - c_void_p, c_int]
> - lib.clang_reparseTranslationUnit.restype = c_int
> +def register_functions(lib):
> + """Register function prototypes with a libclang library instance.
>
> - lib.clang_saveTranslationUnit.argtypes = [TranslationUnit, c_char_p,
> - c_uint]
> - lib.clang_saveTranslationUnit.restype = c_int
> + This must be called as part of library instantiation so Python knows how
> + to call out to the shared library.
> + """
>
> - lib.clang_tokenize.argtypes = [TranslationUnit, SourceRange,
> - POINTER(POINTER(Token)), POINTER(c_uint)]
> + def register(item):
> + return register_function(lib, item)
>
> - lib.clang_visitChildren.argtypes = [Cursor, callbacks['cursor_visit'],
> - py_object]
> - lib.clang_visitChildren.restype = c_uint
> + map(register, functionList)
>
> register_functions(lib)
>
> --
> 1.7.9.5
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
More information about the cfe-commits
mailing list