python binding: expose compile command filename

[compnerd]

bindings/python/tests/cindex/test_cdb.py

67 ↗

(On Diff #48016)

Cant we use expected[0]['file'] here rather than duplicating the filename?

[Sarcasm]

bindings/python/tests/cindex/test_cdb.py

67 ↗

(On Diff #48016)

We can't because the expected array in this test is just the command line, it is different from the one in test_all_compilecommand where it represents the command line + file + directory.

I'm fine making a local variable to hold this filename so that we can have:

file = '/home/john.doe/MyProject/project.cpp'
cmds = cdb.getCompileCommands(file)
assert len(cmds) == 1
assert cmds[0].directory == '/home/john.doe/MyProject'
assert cmds[0].filename == file

Do you think it's better?

[compnerd]

Right, I mixed up the scope. Actually, I like the suggestion. You can change the other assert to use 'os.path.dirname' and avoid that being duplicated as well.

[Sarcasm]

remove some duplication in a test

[compnerd]

LGTM; do you have commit rights or do you need help to get this merged?

cfe/trunk/bindings/python/clang/cindex.py

def __init__(self, cmd, ccmds):
         self.ccmds = ccmds
 
     @property
     def directory(self):
         """Get the working directory for this CompileCommand"""
         return conf.lib.clang_CompileCommand_getDirectory(self.cmd)
 
     @property
+    def filename(self):
+        """Get the working filename for this CompileCommand"""
+        return conf.lib.clang_CompileCommand_getFilename(self.cmd)
+
+    @property
     def arguments(self):
         """
         Get an iterable object providing each argument in the
         command line for the compiler invocation as a _CXString.
 
         Invariant : the first argument is the compiler executable
         """
         length = conf.lib.clang_CompileCommand_getNumArgs(self.cmd)
functionList = [
    _CXString,
    _CXString.from_result),
 
   ("clang_CompileCommand_getDirectory",
    [c_object_p],
    _CXString,
    _CXString.from_result),
 
+  ("clang_CompileCommand_getFilename",
+   [c_object_p],
+   _CXString,
+   _CXString.from_result),
+
   ("clang_CompileCommand_getNumArgs",
    [c_object_p],
    c_uint),
 
   ("clang_codeCompleteAt",
    [TranslationUnit, c_char_p, c_int, c_int, c_void_p, c_int, c_int],
    POINTER(CCRStructure)),
 

cfe/trunk/bindings/python/tests/cindex/test_cdb.py

def test_lookup_succeed():
     assert len(cmds) != 0
 
 def test_all_compilecommand():
     """Check we get all results from the db"""
     cdb = CompilationDatabase.fromDirectory(kInputsDir)
     cmds = cdb.getAllCompileCommands()
     assert len(cmds) == 3
     expected = [
+        { 'wd': '/home/john.doe/MyProject',
+          'file': '/home/john.doe/MyProject/project.cpp',
+          'line': ['clang++', '-o', 'project.o', '-c',
+                   '/home/john.doe/MyProject/project.cpp']},
         { 'wd': '/home/john.doe/MyProjectA',
+          'file': '/home/john.doe/MyProject/project2.cpp',
           'line': ['clang++', '-o', 'project2.o', '-c',
                    '/home/john.doe/MyProject/project2.cpp']},
         { 'wd': '/home/john.doe/MyProjectB',
+          'file': '/home/john.doe/MyProject/project2.cpp',
           'line': ['clang++', '-DFEATURE=1', '-o', 'project2-feature.o', '-c',
                    '/home/john.doe/MyProject/project2.cpp']},
-        { 'wd': '/home/john.doe/MyProject',
-          'line': ['clang++', '-o', 'project.o', '-c',
-                   '/home/john.doe/MyProject/project.cpp']}
+
         ]
     for i in range(len(cmds)):
         assert cmds[i].directory == expected[i]['wd']
+        assert cmds[i].filename == expected[i]['file']
         for arg, exp in zip(cmds[i].arguments, expected[i]['line']):
             assert arg == exp
 
 def test_1_compilecommand():
     """Check file with single compile command"""
     cdb = CompilationDatabase.fromDirectory(kInputsDir)
-    cmds = cdb.getCompileCommands('/home/john.doe/MyProject/project.cpp')
+    file = '/home/john.doe/MyProject/project.cpp'
+    cmds = cdb.getCompileCommands(file)
     assert len(cmds) == 1
-    assert cmds[0].directory == '/home/john.doe/MyProject'
+    assert cmds[0].directory == os.path.dirname(file)
+    assert cmds[0].filename == file
     expected = [ 'clang++', '-o', 'project.o', '-c',
                  '/home/john.doe/MyProject/project.cpp']
     for arg, exp in zip(cmds[0].arguments, expected):
         assert arg == exp
 
 def test_2_compilecommand():
     """Check file with 2 compile commands"""
     cdb = CompilationDatabase.fromDirectory(kInputsDir)