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

Do not invoke objc parser actions when a top level +/- is seen, unless objc 

is enabled.

llvm-svn: 39430
This commit is contained in:
Chris Lattner 2007-05-02 23:45:06 +00:00
parent 9eb2465aeb
commit c24278d9a0
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clang/Parse/Parser.cpp
View File

@ -318,13 +318,24 @@ Parser::DeclTy *Parser::ParseExternalDeclaration() {
// TODO: Invoke action for top-level asm. // TODO: Invoke action for top-level asm.
return 0; return 0;
case tok::at: case tok::at:
// @ is not a legal token unless objc is enabled, no need to check.
ParseObjCAtDirectives(); ParseObjCAtDirectives();
return 0; return 0;
case tok::minus: case tok::minus:
ParseObjCInstanceMethodDeclaration(); if (getLang().ObjC1) {
ParseObjCInstanceMethodDeclaration();
} else {
Diag(Tok, diag::err_expected_external_declaration);
ConsumeToken();
}
return 0; return 0;
case tok::plus: case tok::plus:
ParseObjCClassMethodDeclaration(); if (getLang().ObjC1) {
ParseObjCClassMethodDeclaration();
} else {
Diag(Tok, diag::err_expected_external_declaration);
ConsumeToken();
}
return 0; return 0;
case tok::kw_typedef: case tok::kw_typedef:
// A function definition cannot start with a 'typedef' keyword. // A function definition cannot start with a 'typedef' keyword.

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

@ -312,6 +312,8 @@ DIAG(err_parse_error, ERROR,
"parse error") "parse error")
DIAG(err_expected_expression, ERROR, DIAG(err_expected_expression, ERROR,
"expected expression") "expected expression")
DIAG(err_expected_external_declaration, ERROR,
"expected external declaration")
DIAG(err_expected_ident, ERROR, DIAG(err_expected_ident, ERROR,
"expected identifier") "expected identifier")
DIAG(err_expected_ident_lparen, ERROR, DIAG(err_expected_ident_lparen, ERROR,