[cfe-commits] r39148 - in /cfe/cfe/trunk: Parse/ParseObjc.cpp Parse/Parser.cpp include/clang/Parse/Parser.h

[sabre at cs.uiuc.edu]

Author: sabre
Date: Wed Jul 11 11:39:54 2007
New Revision: 39148

URL: http://llvm.org/viewvc/llvm-project?rev=39148&view=rev
Log:
rename these methods so that they read correctly.

Modified:
    cfe/cfe/trunk/Parse/ParseObjc.cpp
    cfe/cfe/trunk/Parse/Parser.cpp
    cfe/cfe/trunk/include/clang/Parse/Parser.h

Modified: cfe/cfe/trunk/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Parse/ParseObjc.cpp?rev=39148&r1=39147&r2=39148&view=diff

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

Modified: cfe/cfe/trunk/Parse/Parser.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Parse/Parser.cpp?rev=39148&r1=39147&r2=39148&view=diff

==============================================================================
--- cfe/cfe/trunk/Parse/Parser.cpp (original)
+++ cfe/cfe/trunk/Parse/Parser.cpp Wed Jul 11 11:39:54 2007
@@ -322,13 +322,13 @@
     // TODO: Invoke action for top-level asm.
     return 0;
   case tok::at:
-    ObjCParseAtDirectives();
+    ParseObjCAtDirectives();
     return 0;
   case tok::minus:
-    ObjCParseInstanceMethodDeclaration();
+    ParseObjCInstanceMethodDeclaration();
     return 0;
   case tok::plus:
-    ObjCParseClassMethodDeclaration();
+    ParseObjCClassMethodDeclaration();
     return 0;
   default:
     // We can't tell whether this is a function-definition or declaration yet.

Modified: cfe/cfe/trunk/include/clang/Parse/Parser.h
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/include/clang/Parse/Parser.h?rev=39148&r1=39147&r2=39148&view=diff

==============================================================================
--- cfe/cfe/trunk/include/clang/Parse/Parser.h (original)
+++ cfe/cfe/trunk/include/clang/Parse/Parser.h Wed Jul 11 11:39:54 2007
@@ -250,16 +250,16 @@
   void ParseAsmStringLiteral();
 
   // Objective-C External Declarations 
-  void ObjCParseAtDirectives(); 
-  void ObjCParseAtClassDeclaration(SourceLocation atLoc);
-  void ObjCParseAtInterfaceDeclaration();
-  void ObjCParseAtProtocolDeclaration();
-  void ObjCParseAtImplementationDeclaration();
-  void ObjCParseAtEndDeclaration();
-  void ObjCParseAtAliasDeclaration();
+  void ParseObjCAtDirectives(); 
+  void ParseObjCAtClassDeclaration(SourceLocation atLoc);
+  void ParseObjCAtInterfaceDeclaration();
+  void ParseObjCAtProtocolDeclaration();
+  void ParseObjCAtImplementationDeclaration();
+  void ParseObjCAtEndDeclaration();
+  void ParseObjCAtAliasDeclaration();
   
-  void ObjCParseInstanceMethodDeclaration();
-  void ObjCParseClassMethodDeclaration();
+  void ParseObjCInstanceMethodDeclaration();
+  void ParseObjCClassMethodDeclaration();
 
   //===--------------------------------------------------------------------===//
   // C99 6.5: Expressions.