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

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@42829 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Driver/PrintParserCallbacks.cpp b/Driver/PrintParserCallbacks.cpp
index e3bfdf57f1de9c7f670541a3da44c8e16a7163ad..d7deb43f87ace8c49593cddfcc84a99e751dd488 100644 (file)
--- a/Driver/PrintParserCallbacks.cpp
+++ b/Driver/PrintParserCallbacks.cpp
@@ -38,13 +38,13 @@ namespace {
       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);
     }
   };
 }

diff --git a/Parse/MinimalAction.cpp b/Parse/MinimalAction.cpp
index 932f8ff29e38507f1818b4ccdbc91013a14b8e8f..b0dad9330c62407a1f40452f4b7a370d195270af 100644 (file)
--- a/Parse/MinimalAction.cpp
+++ b/Parse/MinimalAction.cpp
@@ -97,9 +97,9 @@ MinimalAction::ActOnForwardClassDeclaration(SourceLocation AtClassLoc,
   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);

diff --git a/include/clang/Parse/Action.h b/include/clang/Parse/Action.h
index 89ed0c6e9977c41882076a2bda4bbae75de28bf5..b5142f016839daf345023504bb9b979545f92792 100644 (file)
--- a/include/clang/Parse/Action.h
+++ b/include/clang/Parse/Action.h
@@ -597,9 +597,9 @@ public:
   /// 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;
   }