maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Assert that Parser::MaybeParseOperatorFunctionId is called when token is kw_operator, and replace ExpectAndConsume for the 'operator' token with a ConsumeToken. 

llvm-svn: 58855
This commit is contained in:
Argyrios Kyrtzidis 2008-11-07 15:54:02 +00:00
parent 450c75a15f
commit 56fa31bc87
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticKinds.def
View File

@ -1291,8 +1291,6 @@ DIAG(err_ambiguous_derived_to_base_conv, ERROR,
"ambiguous conversion from derived class '%0' to base class '%1':%2")
// C++ operator overloading
DIAG(err_expected_operator, ERROR,
"expected 'operator' keyword")
DIAG(err_operator_overload_needs_class_or_enum, ERROR,
"non-member overloaded operator '%0' must have at least one parameter of class or enumeration type (or reference thereof)")
DIAG(err_operator_overload_variadic, ERROR,

5
clang/lib/Parse/ParseExprCXX.cpp
View File

@ -308,8 +308,7 @@ void Parser::ParseCXXSimpleTypeSpecifier(DeclSpec &DS) {
/// <= >= && || ++ -- , ->* ->
/// () []
IdentifierInfo *Parser::MaybeParseOperatorFunctionId() {
if (Tok.isNot(tok::kw_operator))
return 0;
assert(Tok.is(tok::kw_operator) && "Expected 'operator' keyword");
OverloadedOperatorKind Op = OO_None;
switch (NextToken().getKind()) {
@ -361,7 +360,7 @@ IdentifierInfo *Parser::MaybeParseOperatorFunctionId() {
if (Op == OO_None)
return 0;
else {
ExpectAndConsume(tok::kw_operator, diag::err_expected_operator);
ConsumeToken(); // 'operator'
ConsumeAnyToken(); // the operator itself
return &PP.getIdentifierTable().getOverloadedOperator(Op);
}