[cfe-commits] r54090 - in /cfe/trunk: include/clang/Basic/DiagnosticKinds.def lib/Sema/SemaDeclObjC.cpp test/SemaObjC/interface-1.m

[Chris Lattner]

Author: lattner
Date: Fri Jul 25 22:40:25 2008
New Revision: 54090

URL: http://llvm.org/viewvc/llvm-project?rev=54090&view=rev
Log:
remove duplicate error message.

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticKinds.def
    cfe/trunk/lib/Sema/SemaDeclObjC.cpp
    cfe/trunk/test/SemaObjC/interface-1.m

Modified: cfe/trunk/include/clang/Basic/DiagnosticKinds.def
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticKinds.def?rev=54090&r1=54089&r2=54090&view=diff

==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticKinds.def (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticKinds.def Fri Jul 25 22:40:25 2008
@@ -424,8 +424,6 @@
      "cannot find interface declaration for '%0', superclass of '%1'")
 DIAG(err_duplicate_class_def, ERROR,
      "duplicate interface declaration for class '%0'")
-DIAG(err_undef_protocolref, ERROR,
-     "cannot find protocol definition for '%0', referenced by '%1'")
 DIAG(warn_undef_protocolref, WARNING,
      "cannot find protocol definition for '%0', referenced by '%1'")
 DIAG(err_duplicate_protocol_def, ERROR,

Modified: cfe/trunk/lib/Sema/SemaDeclObjC.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclObjC.cpp?rev=54090&r1=54089&r2=54090&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclObjC.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclObjC.cpp Fri Jul 25 22:40:25 2008
@@ -139,8 +139,8 @@
     for (unsigned int i = 0; i != NumProtocols; i++) {
       ObjCProtocolDecl* RefPDecl = ObjCProtocols[ProtocolNames[i].first];
       if (!RefPDecl)
-        Diag(ProtocolNames[i].second, diag::err_undef_protocolref,
-             ProtocolNames[i].first->getName(), ClassName->getName());
+        Diag(ProtocolNames[i].second, diag::err_undeclared_protocol,
+             ProtocolNames[i].first->getName());
       else {
         if (RefPDecl->isForwardDecl())
           Diag(ProtocolNames[i].second, diag::warn_undef_protocolref,
@@ -225,8 +225,8 @@
     for (unsigned int i = 0; i != NumProtoRefs; i++) {
       ObjCProtocolDecl *RefPDecl = ObjCProtocols[ProtoRefNames[i].first];
       if (!RefPDecl)
-        Diag(ProtoRefNames[i].second, diag::err_undef_protocolref,
-             ProtoRefNames[i].first->getName(), ProtocolName->getName());
+        Diag(ProtoRefNames[i].second, diag::err_undeclared_protocol,
+             ProtoRefNames[i].first->getName());
       else {
         if (RefPDecl->isForwardDecl())
           Diag(ProtoRefNames[i].second, diag::warn_undef_protocolref,
@@ -439,8 +439,8 @@
     for (unsigned int i = 0; i != NumProtoRefs; i++) {
       ObjCProtocolDecl* RefPDecl = ObjCProtocols[ProtoRefNames[i].first];
       if (!RefPDecl)
-        Diag(ProtoRefNames[i].second, diag::err_undef_protocolref,
-             ProtoRefNames[i].first->getName(), CategoryName->getName());
+        Diag(ProtoRefNames[i].second, diag::err_undeclared_protocol,
+             ProtoRefNames[i].first->getName());
       else {
         if (RefPDecl->isForwardDecl())
           Diag(ProtoRefNames[i].second, diag::warn_undef_protocolref,

Modified: cfe/trunk/test/SemaObjC/interface-1.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/interface-1.m?rev=54090&r1=54089&r2=54090&view=diff

==============================================================================
--- cfe/trunk/test/SemaObjC/interface-1.m (original)
+++ cfe/trunk/test/SemaObjC/interface-1.m Fri Jul 25 22:40:25 2008
@@ -3,7 +3,7 @@
 
 @interface NSWhatever :
 NSObject     // expected-error {{cannot find interface declaration for 'NSObject'}}
-<NSCopying>  // expected-error {{cannot find protocol definition for 'NSCopying'}}
+<NSCopying>  // expected-error {{cannot find protocol declaration for 'NSCopying'}}
 @end