From d6d866d6faf2f70860182f1433959999f90ea6f2 Mon Sep 17 00:00:00 2001 From: Fariborz Jahanian Date: Fri, 19 Aug 2011 16:06:57 +0000 Subject: objective-c: Bring objective-c handling of decl context to modernity. Instead of passing down individual context objects from parser to sema, establish decl context in parser and have sema access current context as needed. I still need to take of Doug's comment for minor cleanups. llvm-svn: 138040 --- clang/lib/Parse/Parser.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'clang/lib/Parse/Parser.cpp') diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index 5bb4165fbb5..d7e7d4b0812 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -811,7 +811,16 @@ Parser::ParseDeclarationOrFunctionDefinition(ParsedAttributes &attrs, AccessSpecifier AS) { ParsingDeclSpec DS(*this); DS.takeAttributesFrom(attrs); - return ParseDeclarationOrFunctionDefinition(DS, AS); + Decl *DC = getObjCDeclContext(); + if (DC) + // Must temporarily exit the objective-c container scope for + // parsing c constructs and re-enter objc container scope + // afterwards. + Actions.ActOnObjCContainerFinishDefinition(DC); + DeclGroupPtrTy resPtrTy = ParseDeclarationOrFunctionDefinition(DS, AS); + if (DC) + Actions.ActOnObjCContainerStartDefinition(DC); + return resPtrTy; } /// ParseFunctionDefinition - We parsed and verified that the specified -- cgit v1.2.3