r192258 - Make wording for certain invalid unary expressions more consistent.

[David Majnemer]

Author: majnemer
Date: Tue Oct  8 19:22:23 2013
New Revision: 192258

URL: http://llvm.org/viewvc/llvm-project?rev=192258&view=rev
Log:
Make wording for certain invalid unary expressions more consistent.

An invalid decltype expression like 'decltype int' gives:
error: expected '(' after 'decltype'

This makes it so 'sizeof int' gives a similar one:
error: expected parentheses around type name in sizeof expression

Modified:
    cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
    cfe/trunk/lib/Parse/ParseExpr.cpp
    cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.align/p7.cpp
    cfe/trunk/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp
    cfe/trunk/test/Parser/expressions.c

Modified: cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td?rev=192258&r1=192257&r2=192258&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td (original)
+++ cfe/trunk/include/clang/Basic/DiagnosticParseKinds.td Tue Oct  8 19:22:23 2013
@@ -310,8 +310,8 @@ def err_unspecified_vla_size_with_static
 def warn_deprecated_register : Warning<
   "'register' storage class specifier is deprecated">,
   InGroup<DeprecatedRegister>;
-def err_missed_parentheses_around_typename : Error<
-  "missed parentheses around type name in %0">;
+def err_expected_parentheses_around_typename : Error<
+  "expected parentheses around type name in %0 expression">;
 
 def err_expected_case_before_expression: Error<
   "expected 'case' keyword before expression">;

Modified: cfe/trunk/lib/Parse/ParseExpr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExpr.cpp?rev=192258&r1=192257&r2=192258&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseExpr.cpp (original)
+++ cfe/trunk/lib/Parse/ParseExpr.cpp Tue Oct  8 19:22:23 2013
@@ -1602,7 +1602,7 @@ Parser::ParseExprAfterUnaryExprOrTypeTra
 
         SourceLocation LParenLoc = PP.getLocForEndOfToken(OpTok.getLocation());
         SourceLocation RParenLoc = PP.getLocForEndOfToken(PrevTokLocation);
-        Diag(LParenLoc, diag::err_missed_parentheses_around_typename)
+        Diag(LParenLoc, diag::err_expected_parentheses_around_typename)
           << OpTok.getName()
           << FixItHint::CreateInsertion(LParenLoc, "(")
           << FixItHint::CreateInsertion(RParenLoc, ")");

Modified: cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.align/p7.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.align/p7.cpp?rev=192258&r1=192257&r2=192258&view=diff
==============================================================================
--- cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.align/p7.cpp (original)
+++ cfe/trunk/test/CXX/dcl.dcl/dcl.attr/dcl.align/p7.cpp Tue Oct  8 19:22:23 2013
@@ -16,5 +16,5 @@ static_assert(alignof(Y<char, int, sizeo
 static_assert(alignof(Y<int, char, 1>) == alignof(int), ""); // expected-note {{in instantiation of}}
 
 void pr16992 () {
-  int x = alignof int;  // expected-error{{missed parentheses around type name in alignof}}
+  int x = alignof int;  // expected-error {{expected parentheses around type name in alignof expression}}
 }

Modified: cfe/trunk/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp?rev=192258&r1=192257&r2=192258&view=diff
==============================================================================
--- cfe/trunk/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp (original)
+++ cfe/trunk/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp Tue Oct  8 19:22:23 2013
@@ -31,7 +31,7 @@ namespace pr16992 {
 
 template<typename T> struct ABC {
   int func () {
-    return sizeof T;  //expected-error{{missed parentheses around type name in sizeof}}
+    return sizeof T;  // expected-error {{expected parentheses around type name in sizeof expression}}
   }
 };
 

Modified: cfe/trunk/test/Parser/expressions.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/expressions.c?rev=192258&r1=192257&r2=192258&view=diff
==============================================================================
--- cfe/trunk/test/Parser/expressions.c (original)
+++ cfe/trunk/test/Parser/expressions.c Tue Oct  8 19:22:23 2013
@@ -62,8 +62,8 @@ void test7() {
 struct pr16992 { int x; };
 
 void func_16992 () {
-  int x1 = sizeof int;  // expected-error{{missed parentheses around type name in sizeof}}
-  int x2 = sizeof struct pr16992;  // expected-error{{missed parentheses around type name in sizeof}}
-  int x3 = __alignof int;  // expected-error{{missed parentheses around type name in __alignof}}
-  int x4 = _Alignof int;  // expected-error{{missed parentheses around type name in _Alignof}}
+  int x1 = sizeof int;            // expected-error {{expected parentheses around type name in sizeof expression}}
+  int x2 = sizeof struct pr16992; // expected-error {{expected parentheses around type name in sizeof expression}}
+  int x3 = __alignof int;         // expected-error {{expected parentheses around type name in __alignof expression}}
+  int x4 = _Alignof int;          // expected-error {{expected parentheses around type name in _Alignof expression}}
 }