diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticParseKinds.td | 4 | ||||
| -rw-r--r-- | clang/lib/Parse/ParseExpr.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CXX/dcl.dcl/dcl.attr/dcl.align/p7.cpp | 2 | ||||
| -rw-r--r-- | clang/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Parser/expressions.c | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/clang/include/clang/Basic/DiagnosticParseKinds.td b/clang/include/clang/Basic/DiagnosticParseKinds.td index 1ffcd9213e3..61b871d3768 100644 --- a/clang/include/clang/Basic/DiagnosticParseKinds.td +++ b/clang/include/clang/Basic/DiagnosticParseKinds.td @@ -310,8 +310,8 @@ def err_unspecified_vla_size_with_static : Error< 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">; diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp index 35c2aeffc28..c9a718b5278 100644 --- a/clang/lib/Parse/ParseExpr.cpp +++ b/clang/lib/Parse/ParseExpr.cpp @@ -1602,7 +1602,7 @@ Parser::ParseExprAfterUnaryExprOrTypeTrait(const Token &OpTok, 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, ")"); diff --git a/clang/test/CXX/dcl.dcl/dcl.attr/dcl.align/p7.cpp b/clang/test/CXX/dcl.dcl/dcl.attr/dcl.align/p7.cpp index 0f8f5f5e75d..81e2ca5f1e4 100644 --- a/clang/test/CXX/dcl.dcl/dcl.attr/dcl.align/p7.cpp +++ b/clang/test/CXX/dcl.dcl/dcl.attr/dcl.align/p7.cpp @@ -16,5 +16,5 @@ static_assert(alignof(Y<char, int, sizeof(int)>) == alignof(int), ""); 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}} } diff --git a/clang/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp b/clang/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp index c8a91892a93..aa76b3a7346 100644 --- a/clang/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp +++ b/clang/test/CXX/expr/expr.unary/expr.sizeof/p1.cpp @@ -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}} } }; diff --git a/clang/test/Parser/expressions.c b/clang/test/Parser/expressions.c index dfc8f6c712b..95d6fb354f3 100644 --- a/clang/test/Parser/expressions.c +++ b/clang/test/Parser/expressions.c @@ -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}} } |
