diff options
| author | Arnaud A. de Grandmaison <arnaud.adegm@gmail.com> | 2012-07-10 00:00:05 +0000 |
|---|---|---|
| committer | Arnaud A. de Grandmaison <arnaud.adegm@gmail.com> | 2012-07-10 00:00:05 +0000 |
| commit | cdccafa53cdba40a7474d8df9dba6424048fc53e (patch) | |
| tree | 1427880e084eefbb5616ce10b12db5922ffd5cc3 | |
| parent | 3d1512384f9a86c50345d380a7a0a4324abc2979 (diff) | |
| download | bcm5719-llvm-cdccafa53cdba40a7474d8df9dba6424048fc53e.tar.gz bcm5719-llvm-cdccafa53cdba40a7474d8df9dba6424048fc53e.zip | |
[cindex.py] Make CompileCommand.arguments usage consistent with CompileCommand.directory and the rest of the python binding
Patch by David Röthlisberger
llvm-svn: 159970
| -rw-r--r-- | clang/bindings/python/clang/cindex.py | 4 | ||||
| -rw-r--r-- | clang/bindings/python/tests/cindex/test_cdb.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/clang/bindings/python/clang/cindex.py b/clang/bindings/python/clang/cindex.py index 0aea4669e89..5bee974fb2b 100644 --- a/clang/bindings/python/clang/cindex.py +++ b/clang/bindings/python/clang/cindex.py @@ -2132,7 +2132,7 @@ class CompileCommand(object): @property def directory(self): """Get the working directory for this CompileCommand""" - return CompileCommand_getDirectory(self.cmd).spelling + return CompileCommand_getDirectory(self.cmd) @property def arguments(self): @@ -2603,6 +2603,7 @@ CompileCommands_getCommand.restype = c_object_p CompileCommand_getDirectory = lib.clang_CompileCommand_getDirectory CompileCommand_getDirectory.argtypes = [c_object_p] CompileCommand_getDirectory.restype = _CXString +CompileCommand_getDirectory.errcheck = _CXString.from_result CompileCommand_getNumArgs = lib.clang_CompileCommand_getNumArgs CompileCommand_getNumArgs.argtypes = [c_object_p] @@ -2611,6 +2612,7 @@ CompileCommand_getNumArgs.restype = c_uint CompileCommand_getArg = lib.clang_CompileCommand_getArg CompileCommand_getArg.argtypes = [c_object_p, c_uint] CompileCommand_getArg.restype = _CXString +CompileCommand_getArg.errcheck = _CXString.from_result __all__ = [ 'CodeCompletionResults', diff --git a/clang/bindings/python/tests/cindex/test_cdb.py b/clang/bindings/python/tests/cindex/test_cdb.py index 374f99bcbf6..d0f580ea9f4 100644 --- a/clang/bindings/python/tests/cindex/test_cdb.py +++ b/clang/bindings/python/tests/cindex/test_cdb.py @@ -41,7 +41,7 @@ def test_1_compilecommand(): expected = [ 'clang++', '-o', 'project.o', '-c', '/home/john.doe/MyProject/project.cpp'] for arg, exp in zip(cmds[0].arguments, expected): - assert arg.spelling == exp + assert arg == exp def test_2_compilecommand(): """Check file with 2 compile commands""" @@ -59,7 +59,7 @@ def test_2_compilecommand(): for i in range(len(cmds)): assert cmds[i].directory == expected[i]['wd'] for arg, exp in zip(cmds[i].arguments, expected[i]['line']): - assert arg.spelling == exp + assert arg == exp def test_compilecommand_iterator_stops(): """Check that iterator stops after the correct number of elements""" |
