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

AST for @finally statement. 

llvm-svn: 43629
This commit is contained in:
Fariborz Jahanian 2007-11-02 00:18:53 +00:00
parent 9e63b98de7
commit 71234d8a9e
4 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
clang/Parse/ParseObjc.cpp
View File

@ -1055,9 +1055,10 @@ Parser::StmtResult Parser::ParseObjCTryStmt(SourceLocation atLoc) {
return true;
}
StmtResult CatchStmts;
StmtResult FinallyStmt;
StmtResult TryBody = ParseCompoundStatementBody();
while (Tok.is(tok::at)) {
SourceLocation AtCatchLoc = ConsumeToken();
SourceLocation AtCatchFinallyLoc = ConsumeToken();
if (Tok.getIdentifierInfo()->getObjCKeywordID() == tok::objc_catch) {
StmtTy *FirstPart = 0;
ConsumeToken(); // consume catch
@ -1080,12 +1081,13 @@ Parser::StmtResult Parser::ParseObjCTryStmt(SourceLocation atLoc) {
StmtResult CatchBody = ParseCompoundStatementBody();
if (CatchBody.isInvalid)
CatchBody = Actions.ActOnNullStmt(Tok.getLocation());
CatchStmts = Actions.ActOnObjcAtCatchStmt(AtCatchLoc, RParenLoc,
CatchStmts = Actions.ActOnObjcAtCatchStmt(AtCatchFinallyLoc, RParenLoc,
FirstPart, CatchBody.Val, CatchStmts.Val);
ExitScope();
}
else {
Diag(AtCatchLoc, diag::err_expected_lparen_after, "@catch clause");
Diag(AtCatchFinallyLoc, diag::err_expected_lparen_after,
"@catch clause");
return true;
}
catch_or_finally_seen = true;
@ -1093,6 +1095,10 @@ Parser::StmtResult Parser::ParseObjCTryStmt(SourceLocation atLoc) {
else if (Tok.getIdentifierInfo()->getObjCKeywordID() == tok::objc_finally) {
ConsumeToken(); // consume finally
StmtResult FinallyBody = ParseCompoundStatementBody();
if (FinallyBody.isInvalid)
FinallyBody = Actions.ActOnNullStmt(Tok.getLocation());
FinallyStmt = Actions.ActOnObjcAtFinallyStmt(AtCatchFinallyLoc,
FinallyBody.Val);
catch_or_finally_seen = true;
break;
}

3
clang/Sema/Sema.h
View File

@ -343,6 +343,9 @@ public:
SourceLocation RParen, StmtTy *Parm,
StmtTy *Body, StmtTy *CatchList);
virtual StmtResult ActOnObjcAtFinallyStmt(SourceLocation AtLoc,
StmtTy *Body);
//===--------------------------------------------------------------------===//
// Expression Parsing Callbacks: SemaExpr.cpp.

6
clang/Sema/SemaStmt.cpp
View File

@ -659,3 +659,9 @@ Sema::ActOnObjcAtCatchStmt(SourceLocation AtLoc,
return CatchList ? CatchList : CS;
}
Action::StmtResult
Sema::ActOnObjcAtFinallyStmt(SourceLocation AtLoc, StmtTy *Body) {
ObjcAtFinallyStmt *FS = new ObjcAtFinallyStmt(AtLoc,
static_cast<Stmt*>(Body));
return FS;
}

5
clang/include/clang/Parse/Action.h
View File

@ -295,6 +295,11 @@ public:
return 0;
}
virtual StmtResult ActOnObjcAtFinallyStmt(SourceLocation AtLoc,
StmtTy *Body) {
return 0;
}
//===--------------------------------------------------------------------===//
// Expression Parsing Callbacks.
//===--------------------------------------------------------------------===//