[cfe-commits] r52249 - in /cfe/trunk/Driver: DiagChecker.cpp clang.cpp clang.h

[Argiris Kirtzidis]

Author: akirtzidis
Date: Fri Jun 13 07:15:34 2008
New Revision: 52249

URL: http://llvm.org/viewvc/llvm-project?rev=52249&view=rev
Log:
Allow -parse-noop -verify options to be used together.

Modified:
    cfe/trunk/Driver/DiagChecker.cpp
    cfe/trunk/Driver/clang.cpp
    cfe/trunk/Driver/clang.h

Modified: cfe/trunk/Driver/DiagChecker.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/DiagChecker.cpp?rev=52249&r1=52248&r2=52249&view=diff

==============================================================================
--- cfe/trunk/Driver/DiagChecker.cpp (original)
+++ cfe/trunk/Driver/DiagChecker.cpp Fri Jun 13 07:15:34 2008
@@ -229,7 +229,11 @@
   
   // Parse the AST and run the consumer, ultimately deleting C.
   ParseAST(PP, C);
-  
+  return CheckDiagnostics(PP);
+}
+
+/// CheckDiagnostics - Gather the expected diagnostics and check them.
+bool clang::CheckDiagnostics(Preprocessor &PP) {
   // Gather the set of expected diagnostics.
   DiagList ExpectedErrors, ExpectedWarnings;
   FindExpectedDiags(PP, ExpectedErrors, ExpectedWarnings);

Modified: cfe/trunk/Driver/clang.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/clang.cpp?rev=52249&r1=52248&r2=52249&view=diff

==============================================================================
--- cfe/trunk/Driver/clang.cpp (original)
+++ cfe/trunk/Driver/clang.cpp Fri Jun 13 07:15:34 2008
@@ -1134,6 +1134,9 @@
   // Parsing the specified input file.
   P.ParseTranslationUnit();
   delete PA;
+
+  if (VerifyDiagnostics)
+    exit(CheckDiagnostics(PP));
 }
 
 //===----------------------------------------------------------------------===//

Modified: cfe/trunk/Driver/clang.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/clang.h?rev=52249&r1=52248&r2=52249&view=diff

==============================================================================
--- cfe/trunk/Driver/clang.h (original)
+++ cfe/trunk/Driver/clang.h Fri Jun 13 07:15:34 2008
@@ -43,6 +43,9 @@
 /// CheckASTConsumer - Implement diagnostic checking for AST consumers.
 bool CheckASTConsumer(Preprocessor &PP, ASTConsumer* C);
 
+/// CheckDiagnostics - Gather the expected diagnostics and check them.
+bool CheckDiagnostics(Preprocessor &PP);
+
 
 }  // end namespace clang