rename these methods so that they read correctly.

llvm-svn: 39148
This commit is contained in:
Chris Lattner 2006-11-08 06:10:32 +00:00
parent 3503cefbba
commit b26b665742
3 changed files with 27 additions and 27 deletions

View File

@ -26,23 +26,23 @@ using namespace clang;
/// [OBJC] objc-protocol-definition [TODO] /// [OBJC] objc-protocol-definition [TODO]
/// [OBJC] objc-method-definition [TODO] /// [OBJC] objc-method-definition [TODO]
/// [OBJC] '@' 'end' [TODO] /// [OBJC] '@' 'end' [TODO]
void Parser::ObjCParseAtDirectives() { void Parser::ParseObjCAtDirectives() {
SourceLocation AtLoc = ConsumeToken(); // the "@" SourceLocation AtLoc = ConsumeToken(); // the "@"
IdentifierInfo *II = Tok.getIdentifierInfo(); IdentifierInfo *II = Tok.getIdentifierInfo();
switch (II ? II->getObjCKeywordID() : tok::objc_not_keyword) { switch (II ? II->getObjCKeywordID() : tok::objc_not_keyword) {
case tok::objc_class: case tok::objc_class:
return ObjCParseAtClassDeclaration(AtLoc); return ParseObjCAtClassDeclaration(AtLoc);
case tok::objc_interface: case tok::objc_interface:
return ObjCParseAtInterfaceDeclaration(); return ParseObjCAtInterfaceDeclaration();
case tok::objc_protocol: case tok::objc_protocol:
return ObjCParseAtProtocolDeclaration(); return ParseObjCAtProtocolDeclaration();
case tok::objc_implementation: case tok::objc_implementation:
return ObjCParseAtImplementationDeclaration(); return ParseObjCAtImplementationDeclaration();
case tok::objc_end: case tok::objc_end:
return ObjCParseAtEndDeclaration(); return ParseObjCAtEndDeclaration();
case tok::objc_compatibility_alias: case tok::objc_compatibility_alias:
return ObjCParseAtAliasDeclaration(); return ParseObjCAtAliasDeclaration();
default: default:
Diag(AtLoc, diag::err_unexpected_at); Diag(AtLoc, diag::err_unexpected_at);
SkipUntil(tok::semi); SkipUntil(tok::semi);
@ -53,7 +53,7 @@ void Parser::ObjCParseAtDirectives() {
/// objc-class-declaration: /// objc-class-declaration:
/// '@' 'class' identifier-list ';' /// '@' 'class' identifier-list ';'
/// ///
void Parser::ObjCParseAtClassDeclaration(SourceLocation atLoc) { void Parser::ParseObjCAtClassDeclaration(SourceLocation atLoc) {
ConsumeToken(); // the identifier "class" ConsumeToken(); // the identifier "class"
SmallVector<IdentifierInfo *, 8> ClassNames; SmallVector<IdentifierInfo *, 8> ClassNames;
@ -80,26 +80,26 @@ void Parser::ObjCParseAtClassDeclaration(SourceLocation atLoc) {
Actions.ParsedClassDeclaration(CurScope, &ClassNames[0], ClassNames.size()); Actions.ParsedClassDeclaration(CurScope, &ClassNames[0], ClassNames.size());
} }
void Parser::ObjCParseAtInterfaceDeclaration() { void Parser::ParseObjCAtInterfaceDeclaration() {
assert(0 && "Unimp"); assert(0 && "Unimp");
} }
void Parser::ObjCParseAtProtocolDeclaration() { void Parser::ParseObjCAtProtocolDeclaration() {
assert(0 && "Unimp"); assert(0 && "Unimp");
} }
void Parser::ObjCParseAtImplementationDeclaration() { void Parser::ParseObjCAtImplementationDeclaration() {
assert(0 && "Unimp"); assert(0 && "Unimp");
} }
void Parser::ObjCParseAtEndDeclaration() { void Parser::ParseObjCAtEndDeclaration() {
assert(0 && "Unimp"); assert(0 && "Unimp");
} }
void Parser::ObjCParseAtAliasDeclaration() { void Parser::ParseObjCAtAliasDeclaration() {
assert(0 && "Unimp"); assert(0 && "Unimp");
} }
void Parser::ObjCParseInstanceMethodDeclaration() { void Parser::ParseObjCInstanceMethodDeclaration() {
assert(0 && "Unimp"); assert(0 && "Unimp");
} }
void Parser::ObjCParseClassMethodDeclaration() { void Parser::ParseObjCClassMethodDeclaration() {
assert(0 && "Unimp"); assert(0 && "Unimp");
} }

View File

@ -322,13 +322,13 @@ 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:
ObjCParseAtDirectives(); ParseObjCAtDirectives();
return 0; return 0;
case tok::minus: case tok::minus:
ObjCParseInstanceMethodDeclaration(); ParseObjCInstanceMethodDeclaration();
return 0; return 0;
case tok::plus: case tok::plus:
ObjCParseClassMethodDeclaration(); ParseObjCClassMethodDeclaration();
return 0; return 0;
default: default:
// We can't tell whether this is a function-definition or declaration yet. // We can't tell whether this is a function-definition or declaration yet.

View File

@ -250,16 +250,16 @@ private:
void ParseAsmStringLiteral(); void ParseAsmStringLiteral();
// Objective-C External Declarations // Objective-C External Declarations
void ObjCParseAtDirectives(); void ParseObjCAtDirectives();
void ObjCParseAtClassDeclaration(SourceLocation atLoc); void ParseObjCAtClassDeclaration(SourceLocation atLoc);
void ObjCParseAtInterfaceDeclaration(); void ParseObjCAtInterfaceDeclaration();
void ObjCParseAtProtocolDeclaration(); void ParseObjCAtProtocolDeclaration();
void ObjCParseAtImplementationDeclaration(); void ParseObjCAtImplementationDeclaration();
void ObjCParseAtEndDeclaration(); void ParseObjCAtEndDeclaration();
void ObjCParseAtAliasDeclaration(); void ParseObjCAtAliasDeclaration();
void ObjCParseInstanceMethodDeclaration(); void ParseObjCInstanceMethodDeclaration();
void ObjCParseClassMethodDeclaration(); void ParseObjCClassMethodDeclaration();
//===--------------------------------------------------------------------===// //===--------------------------------------------------------------------===//
// C99 6.5: Expressions. // C99 6.5: Expressions.