[cfe-commits] r149825 - in /cfe/trunk/bindings/python: clang/cindex.py tests/cindex/test_diagnostics.py

[Tobias Grosser]

Author: grosser
Date: Sun Feb  5 05:41:58 2012
New Revision: 149825

URL: http://llvm.org/viewvc/llvm-project?rev=149825&view=rev
Log:
[clang.py] Expose diagnostic category and option info to Python binding

Contributed by: Gregory Szorc <gregory.szorc at gmail.com>

Modified:
    cfe/trunk/bindings/python/clang/cindex.py
    cfe/trunk/bindings/python/tests/cindex/test_diagnostics.py

Modified: cfe/trunk/bindings/python/clang/cindex.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/bindings/python/clang/cindex.py?rev=149825&r1=149824&r2=149825&view=diff
==============================================================================
--- cfe/trunk/bindings/python/clang/cindex.py (original)
+++ cfe/trunk/bindings/python/clang/cindex.py Sun Feb  5 05:41:58 2012
@@ -267,6 +267,29 @@
 
         return FixItIterator(self)
 
+    @property
+    def category_number(self):
+        """The category number for this diagnostic."""
+        return _clang_getDiagnosticCategory(self)
+
+    @property
+    def category_name(self):
+        """The string name of the category for this diagnostic."""
+        return _clang_getDiagnosticCategoryName(self.category_number)
+
+    @property
+    def option(self):
+        """The command-line option that enables this diagnostic."""
+        return _clang_getDiagnosticOption(self, None)
+
+    @property
+    def disable_option(self):
+        """The command-line option that disables this diagnostic."""
+        disable = _CXString()
+        _clang_getDiagnosticOption(self, byref(disable))
+
+        return _CXString_getCString(disable)
+
     def __repr__(self):
         return "<Diagnostic severity %r, location %r, spelling %r>" % (
             self.severity, self.location, self.spelling)
@@ -1205,6 +1228,20 @@
 _clang_getDiagnosticFixIt.restype = _CXString
 _clang_getDiagnosticFixIt.errcheck = _CXString.from_result
 
+_clang_getDiagnosticCategory = lib.clang_getDiagnosticCategory
+_clang_getDiagnosticCategory.argtypes = [Diagnostic]
+_clang_getDiagnosticCategory.restype = c_uint
+
+_clang_getDiagnosticCategoryName = lib.clang_getDiagnosticCategoryName
+_clang_getDiagnosticCategoryName.argtypes = [c_uint]
+_clang_getDiagnosticCategoryName.restype = _CXString
+_clang_getDiagnosticCategoryName.errcheck = _CXString.from_result
+
+_clang_getDiagnosticOption = lib.clang_getDiagnosticOption
+_clang_getDiagnosticOption.argtypes = [Diagnostic, POINTER(_CXString)]
+_clang_getDiagnosticOption.restype = _CXString
+_clang_getDiagnosticOption.errcheck = _CXString.from_result
+
 ###
 
 class CompletionChunk:

Modified: cfe/trunk/bindings/python/tests/cindex/test_diagnostics.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/bindings/python/tests/cindex/test_diagnostics.py?rev=149825&r1=149824&r2=149825&view=diff
==============================================================================
--- cfe/trunk/bindings/python/tests/cindex/test_diagnostics.py (original)
+++ cfe/trunk/bindings/python/tests/cindex/test_diagnostics.py Sun Feb  5 05:41:58 2012
@@ -1,8 +1,13 @@
 from clang.cindex import *
 
-def tu_from_source(source):
+def tu_from_source(source, all_warnings=False):
+    args = []
+    if all_warnings:
+        args = ['-Wall', '-Wextra']
+
     index = Index.create()
-    tu = index.parse('INPUT.c', unsaved_files = [('INPUT.c', source)])
+    tu = index.parse('INPUT.c', args=args,
+            unsaved_files = [('INPUT.c', source)])
     return tu
 
 # FIXME: We need support for invalid translation units to test better.
@@ -65,5 +70,28 @@
       assert True
     else:
       assert False
-      
+
+def test_diagnostic_category():
+    # Ensure that category properties work.
+    index = Index.create()
+    tu = tu_from_source("""int f(int i) { return 7; }""", all_warnings=True)
+    assert len(tu.diagnostics) == 1
+    d = tu.diagnostics[0]
+
+    assert d.severity == Diagnostic.Warning
+    assert d.location.line == 1
+    assert d.location.column == 11
+
+    assert d.category_number == 2
+    assert d.category_name == 'Semantic Issue'
+
+def test_diagnostic_option():
+    # Ensure that category option properties work.
+    index = Index.create()
+    tu = tu_from_source("""int f(int i) { return 7; }""", all_warnings=True)
+    assert len(tu.diagnostics) == 1
+    d = tu.diagnostics[0]
+
+    assert d.option == '-Wunused-parameter'
+    assert d.disable_option == '-Wno-unused-parameter'