commit 9f6e097a64d91bbffd8c829783bef8db7e0a1bbe
author John McCall <rjmccall@apple.com> Mon Aug 03 20:12:06 2009 +0000
committer John McCall <rjmccall@apple.com> Mon Aug 03 20:12:06 2009 +0000
tree 296d1773fbdb933456493aefe724350b35eb2227
parent 9fa24ebaebac262b1a46e67fa99c52c9205b1750

Refactor methods on DeclSpec to take a diagnostic& parameter, and reflect this
elsewhere.  Very slightly decouples DeclSpec users from knowing the exact
diagnostics to report, and makes it easier to provide different diagnostics in
some places.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77990 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Parse/ParseDeclCXX.cpp

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 176cb35..c0df8a5 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -410,10 +410,11 @@
     return;
 
   const char *PrevSpec = 0;
+  unsigned DiagID;
   // Check for duplicate type specifiers (e.g. "int decltype(a)").
   if (DS.SetTypeSpecType(DeclSpec::TST_decltype, StartLoc, PrevSpec, 
-                         Result.release()))
-    Diag(StartLoc, diag::err_invalid_decl_spec_combination) << PrevSpec;
+                         DiagID, Result.release()))
+    Diag(StartLoc, DiagID) << PrevSpec;
 }
 
 /// ParseClassName - Parse a C++ class-name, which names a class. Note
@@ -716,15 +717,16 @@
     Diag(Tok, diag::err_expected_lbrace);
   }
 
-  const char *PrevSpec = 0;
   if (TagOrTempResult.isInvalid()) {
     DS.SetTypeSpecError();
     return;
   }
   
-  if (DS.SetTypeSpecType(TagType, StartLoc, PrevSpec, 
+  const char *PrevSpec = 0;
+  unsigned DiagID;
+  if (DS.SetTypeSpecType(TagType, StartLoc, PrevSpec, DiagID,
                          TagOrTempResult.get().getAs<void>(), Owned))
-    Diag(StartLoc, diag::err_invalid_decl_spec_combination) << PrevSpec;
+    Diag(StartLoc, DiagID) << PrevSpec;
   
   if (DS.isFriendSpecified())
     Actions.ActOnFriendDecl(CurScope, DS.getFriendSpecLoc(),