replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Issue a more descriptive diagnostics when mis-declaring 

a destructor.

llvm-svn: 76436
This commit is contained in:
Fariborz Jahanian 2009-07-20 17:43:15 +00:00
parent 02eb6b7e2f
commit 4041dfc360
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clang/include/clang/Basic/DiagnosticParseKinds.td
View File

@ -138,6 +138,8 @@ def err_missing_param : Error<"expected parameter declarator">;
def err_unexpected_typedef_ident : Error<
"unexpected type name %0: expected identifier">;
def err_expected_class_name : Error<"expected class name">;
def err_destructor_class_name : Error<
"destructor name must be same as the class name">;
def err_unspecified_vla_size_with_static : Error<
"'static' may not be used with an unspecified variable length array size">;

3
clang/include/clang/Parse/Parser.h
View File

@ -1129,7 +1129,8 @@ private:
//===--------------------------------------------------------------------===//
// C++ 9: classes [class] and C structs/unions.
TypeResult ParseClassName(SourceLocation &EndLocation,
const CXXScopeSpec *SS = 0);
const CXXScopeSpec *SS = 0,
bool DestrExpected = false);
void ParseClassSpecifier(tok::TokenKind TagTokKind, SourceLocation TagLoc,
DeclSpec &DS,
const ParsedTemplateInfo &TemplateInfo = ParsedTemplateInfo(),

4
clang/lib/Parse/ParseDecl.cpp
View File

@ -2194,13 +2194,13 @@ void Parser::ParseDirectDeclarator(Declarator &D) {
SourceLocation NameLoc = Tok.getLocation();
SourceLocation EndLoc;
CXXScopeSpec *SS = afterCXXScope? &D.getCXXScopeSpec() : 0;
TypeResult Type = ParseClassName(EndLoc, SS);
TypeResult Type = ParseClassName(EndLoc, SS, true);
if (Type.isInvalid())
D.SetIdentifier(0, TildeLoc);
else
D.setDestructor(Type.get(), TildeLoc, NameLoc);
} else {
Diag(Tok, diag::err_expected_class_name);
Diag(Tok, diag::err_destructor_class_name);
D.SetIdentifier(0, TildeLoc);
}
goto PastIdentifier;

6
clang/lib/Parse/ParseDeclCXX.cpp
View File

@ -427,7 +427,8 @@ void Parser::ParseDecltypeSpecifier(DeclSpec &DS) {
/// simple-template-id
///
Parser::TypeResult Parser::ParseClassName(SourceLocation &EndLocation,
const CXXScopeSpec *SS) {
const CXXScopeSpec *SS,
bool DestrExpected) {
// Check whether we have a template-id that names a type.
if (Tok.is(tok::annot_template_id)) {
TemplateIdAnnotation *TemplateId
@ -457,7 +458,8 @@ Parser::TypeResult Parser::ParseClassName(SourceLocation &EndLocation,
TypeTy *Type = Actions.getTypeName(*Tok.getIdentifierInfo(),
Tok.getLocation(), CurScope, SS);
if (!Type) {
Diag(Tok, diag::err_expected_class_name);
Diag(Tok, DestrExpected ? diag::err_destructor_class_name
: diag::err_expected_class_name);
return true;
}

4
clang/test/SemaCXX/destructor.cpp
View File

@ -40,8 +40,8 @@ struct F {
~F(); // expected-error {{destructor cannot be redeclared}}
};
~; // expected-error {{expected class name}}
~undef(); // expected-error {{expected class name}}
~; // expected-error {{destructor name must be same as the class name}}
~undef(); // expected-error {{destructor name must be same as the class name}}
~F(){} // expected-error {{destructor must be a non-static member function}}
struct G {