[cfe-commits] r42829 - in /cfe/trunk: Driver/PrintParserCallbacks.cpp Parse/MinimalAction.cpp include/clang/Parse/Action.h

[Steve Naroff]

Author: snaroff
Date: Wed Oct 10 12:45:44 2007
New Revision: 42829

URL: http://llvm.org/viewvc/llvm-project?rev=42829&view=rev
Log:

Fix a latent bug in MinimalActions (created by a recent name change).

Modified:
    cfe/trunk/Driver/PrintParserCallbacks.cpp
    cfe/trunk/Parse/MinimalAction.cpp
    cfe/trunk/include/clang/Parse/Action.h

Modified: cfe/trunk/Driver/PrintParserCallbacks.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/PrintParserCallbacks.cpp?rev=42829&r1=42828&r2=42829&view=diff

==============================================================================
--- cfe/trunk/Driver/PrintParserCallbacks.cpp (original)
+++ cfe/trunk/Driver/PrintParserCallbacks.cpp Wed Oct 10 12:45:44 2007
@@ -38,13 +38,13 @@
       return MinimalAction::ActOnDeclarator(S, D, LastInGroup);
     }
     
-    /// PopScope - This callback is called immediately before the specified scope
-    /// is popped and deleted.
-    virtual void PopScope(SourceLocation Loc, Scope *S) {
-      std::cout << "PopScope\n";
+    /// ActOnPopScope - This callback is called immediately before the specified
+    /// scope is popped and deleted.
+    virtual void ActOnPopScope(SourceLocation Loc, Scope *S) {
+      std::cout << "ActOnPopScope\n";
       
       // Pass up to EmptyActions so that the symbol table is maintained right.
-      MinimalAction::PopScope(Loc, S);
+      MinimalAction::ActOnPopScope(Loc, S);
     }
   };
 }

Modified: cfe/trunk/Parse/MinimalAction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/Parse/MinimalAction.cpp?rev=42829&r1=42828&r2=42829&view=diff

==============================================================================
--- cfe/trunk/Parse/MinimalAction.cpp (original)
+++ cfe/trunk/Parse/MinimalAction.cpp Wed Oct 10 12:45:44 2007
@@ -97,9 +97,9 @@
   return 0;
 }
 
-/// PopScope - When a scope is popped, if any typedefs are now out-of-scope,
+/// ActOnPopScope - When a scope is popped, if any typedefs are now out-of-scope,
 /// they are removed from the IdentifierInfo::FETokenInfo field.
-void MinimalAction::PopScope(SourceLocation Loc, Scope *S) {
+void MinimalAction::ActOnPopScope(SourceLocation Loc, Scope *S) {
   for (Scope::decl_iterator I = S->decl_begin(), E = S->decl_end();
        I != E; ++I) {
     IdentifierInfo &II = *static_cast<IdentifierInfo*>(*I);

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

==============================================================================
--- cfe/trunk/include/clang/Parse/Action.h (original)
+++ cfe/trunk/include/clang/Parse/Action.h Wed Oct 10 12:45:44 2007
@@ -597,9 +597,9 @@
   /// popped.
   virtual DeclTy *ActOnDeclarator(Scope *S, Declarator &D, DeclTy *LastInGroup);
   
-  /// PopScope - When a scope is popped, if any typedefs are now out-of-scope,
-  /// they are removed from the IdentifierInfo::FETokenInfo field.
-  virtual void PopScope(SourceLocation Loc, Scope *S);
+  /// ActOnPopScope - When a scope is popped, if any typedefs are now 
+  /// out-of-scope, they are removed from the IdentifierInfo::FETokenInfo field.
+  virtual void ActOnPopScope(SourceLocation Loc, Scope *S);
   virtual void ActOnTranslationUnitScope(SourceLocation Loc, Scope *S) {
     TUScope = S;
   }