[llvm-branch-commits] [cfe-tag] r86736 - in /cfe/tags/Apple/clang/clang/tools/clang: include/clang/Basic/DiagnosticGroups.td include/clang/Basic/DiagnosticParseKinds.td lib/Parse/ParseObjc.cpp test/SemaObjC/objc-string-constant.m

[Ted Kremenek]

Author: kremenek
Date: Tue Nov 10 16:31:53 2009
New Revision: 86736

URL: http://llvm.org/viewvc/llvm-project?rev=86736&view=rev
Log:
Merge in 86731.

Modified:
    cfe/tags/Apple/clang/clang/tools/clang/include/clang/Basic/DiagnosticGroups.td
    cfe/tags/Apple/clang/clang/tools/clang/include/clang/Basic/DiagnosticParseKinds.td
    cfe/tags/Apple/clang/clang/tools/clang/lib/Parse/ParseObjc.cpp
    cfe/tags/Apple/clang/clang/tools/clang/test/SemaObjC/objc-string-constant.m

Modified: cfe/tags/Apple/clang/clang/tools/clang/include/clang/Basic/DiagnosticGroups.td
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang/tools/clang/include/clang/Basic/DiagnosticGroups.td?rev=86736&r1=86735&r2=86736&view=diff

==============================================================================
--- cfe/tags/Apple/clang/clang/tools/clang/include/clang/Basic/DiagnosticGroups.td (original)
+++ cfe/tags/Apple/clang/clang/tools/clang/include/clang/Basic/DiagnosticGroups.td Tue Nov 10 16:31:53 2009
@@ -67,6 +67,7 @@
 def : DiagGroup<"pointer-to-int-cast">;
 def : DiagGroup<"redundant-decls">;
 def ReturnType : DiagGroup<"return-type">;
+def SemiBeforeMethodBody : DiagGroup<"semicolon-before-method-body">;
 def : DiagGroup<"sequence-point">;
 def : DiagGroup<"shadow">;
 def : DiagGroup<"shorten-64-to-32">;
@@ -129,6 +130,7 @@
 
 
 def Extra : DiagGroup<"extra", [
+    SemiBeforeMethodBody,
     UnusedParameter
   ]>;
 

Modified: cfe/tags/Apple/clang/clang/tools/clang/include/clang/Basic/DiagnosticParseKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang/tools/clang/include/clang/Basic/DiagnosticParseKinds.td?rev=86736&r1=86735&r2=86736&view=diff

==============================================================================
--- cfe/tags/Apple/clang/clang/tools/clang/include/clang/Basic/DiagnosticParseKinds.td (original)
+++ cfe/tags/Apple/clang/clang/tools/clang/include/clang/Basic/DiagnosticParseKinds.td Tue Nov 10 16:31:53 2009
@@ -201,9 +201,9 @@
   "@end must appear in an @implementation context">;
 def error_property_ivar_decl : Error<
   "property synthesize requires specification of an ivar">;
-def warn_semicolon_before_method_nody : Warning<
+def warn_semicolon_before_method_body : Warning<
   "semicolon before method body is ignored">,
-  InGroup<DiagGroup<"semicolon-before-method-body">>;
+  InGroup<DiagGroup<"semicolon-before-method-body">>, DefaultIgnore;
 
 def err_expected_field_designator : Error<
   "expected a field designator, such as '.field = 4'">;

Modified: cfe/tags/Apple/clang/clang/tools/clang/lib/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang/tools/clang/lib/Parse/ParseObjc.cpp?rev=86736&r1=86735&r2=86736&view=diff

==============================================================================
--- cfe/tags/Apple/clang/clang/tools/clang/lib/Parse/ParseObjc.cpp (original)
+++ cfe/tags/Apple/clang/clang/tools/clang/lib/Parse/ParseObjc.cpp Tue Nov 10 16:31:53 2009
@@ -1407,7 +1407,7 @@
   // parse optional ';'
   if (Tok.is(tok::semi)) {
     if (ObjCImpDecl)
-      Diag(Tok, diag::warn_semicolon_before_method_nody);
+      Diag(Tok, diag::warn_semicolon_before_method_body);
     ConsumeToken();
   }
 

Modified: cfe/tags/Apple/clang/clang/tools/clang/test/SemaObjC/objc-string-constant.m
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/clang/tools/clang/test/SemaObjC/objc-string-constant.m?rev=86736&r1=86735&r2=86736&view=diff

==============================================================================
--- cfe/tags/Apple/clang/clang/tools/clang/test/SemaObjC/objc-string-constant.m (original)
+++ cfe/tags/Apple/clang/clang/tools/clang/test/SemaObjC/objc-string-constant.m Tue Nov 10 16:31:53 2009
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: clang-cc %s -Wsemicolon-before-method-body -verify -fsyntax-only
 
 #define nil 0       /* id of Nil instance */