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

objc refactoring - minor clean up. 

llvm-svn: 138276
This commit is contained in:
Fariborz Jahanian 2011-08-22 21:44:58 +00:00
parent fd5148b45d
commit b66de9f37b
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1073,7 +1073,8 @@ private:
SourceLocation &LAngleLoc,
SourceLocation &EndProtoLoc);
bool ParseObjCProtocolQualifiers(DeclSpec &DS);
void ParseObjCInterfaceDeclList(tok::ObjCKeywordKind contextKey);
void ParseObjCInterfaceDeclList(tok::ObjCKeywordKind contextKey,
Decl *CDecl);
Decl *ParseObjCAtProtocolDeclaration(SourceLocation atLoc,
ParsedAttributes &prefixAttrs);

20
clang/lib/Parse/ParseObjc.cpp
View File

@ -199,9 +199,7 @@ Decl *Parser::ParseObjCAtInterfaceDeclaration(SourceLocation atLoc,
if (Tok.is(tok::l_brace))
ParseObjCClassInstanceVariables(CategoryType, tok::objc_private, atLoc);
Actions.ActOnObjCContainerStartDefinition(CategoryType);
ParseObjCInterfaceDeclList(tok::objc_not_keyword);
Actions.ActOnObjCContainerFinishDefinition(CategoryType);
ParseObjCInterfaceDeclList(tok::objc_not_keyword, CategoryType);
return CategoryType;
}
// Parse a class interface.
@ -243,9 +241,7 @@ Decl *Parser::ParseObjCAtInterfaceDeclaration(SourceLocation atLoc,
if (Tok.is(tok::l_brace))
ParseObjCClassInstanceVariables(ClsType, tok::objc_protected, atLoc);
Actions.ActOnObjCContainerStartDefinition(ClsType);
ParseObjCInterfaceDeclList(tok::objc_interface);
Actions.ActOnObjCContainerFinishDefinition(ClsType);
ParseObjCInterfaceDeclList(tok::objc_interface, ClsType);
return ClsType;
}
@ -317,14 +313,16 @@ struct Parser::ObjCPropertyCallback : FieldCallback {
/// @required
/// @optional
///
void Parser::ParseObjCInterfaceDeclList(tok::ObjCKeywordKind contextKey) {
void Parser::ParseObjCInterfaceDeclList(tok::ObjCKeywordKind contextKey,
Decl *CDecl) {
SmallVector<Decl *, 32> allMethods;
SmallVector<Decl *, 16> allProperties;
SmallVector<DeclGroupPtrTy, 8> allTUVariables;
tok::ObjCKeywordKind MethodImplKind = tok::objc_not_keyword;
SourceRange AtEnd;
Actions.ActOnObjCContainerStartDefinition(CDecl);
while (1) {
// If this is a method prototype, parse it.
if (Tok.is(tok::minus) || Tok.is(tok::plus)) {
@ -461,6 +459,7 @@ void Parser::ParseObjCInterfaceDeclList(tok::ObjCKeywordKind contextKey) {
allMethods.data(), allMethods.size(),
allProperties.data(), allProperties.size(),
allTUVariables.data(), allTUVariables.size());
Actions.ActOnObjCContainerFinishDefinition(CDecl);
}
/// Parse property attribute declarations.
@ -1292,10 +1291,7 @@ Decl *Parser::ParseObjCAtProtocolDeclaration(SourceLocation AtLoc,
ProtocolLocs.data(),
EndProtoLoc, attrs.getList());
Actions.ActOnObjCContainerStartDefinition(ProtoType);
ParseObjCInterfaceDeclList(tok::objc_protocol);
Actions.ActOnObjCContainerFinishDefinition(ProtoType);
ParseObjCInterfaceDeclList(tok::objc_protocol, ProtoType);
return ProtoType;
}