Changeset 1e1e15b

Timestamp:

Jun 23, 2016, 12:16:45 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

0caaa6a

Parents:

51fcaf8d

git-author:

Rob Schluntz <rschlunt@…> (06/23/16 11:29:38)

git-committer:

Rob Schluntz <rschlunt@…> (06/23/16 12:16:45)

Message:

rename non-virtual visit functions in Visitor base class which prevents using Visitor::visit statement

Location:

src

Files:

• SymTab/Indexer.h (modified) (6 diffs)
• SynTree/Visitor.cc (modified) (5 diffs)
• SynTree/Visitor.h (modified) (1 diff)

src/SymTab/Indexer.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Indexer.h -- 
+// Indexer.h --
 //
 // Author           : Richard C. Bilson
@@ -33 +33 @@
                 Indexer& operator= ( Indexer &&that );
 
-                //using Visitor::visit;
+                using Visitor::visit;
                 virtual void visit( ObjectDecl *objectDecl );
                 virtual void visit( FunctionDecl *functionDecl );
@@ -54 +54 @@
                 virtual void visit( MemberExpr *memberExpr );
                 virtual void visit( VariableExpr *variableExpr );
-                virtual void visit( ConstantExpr *constantExpr ); 
+                virtual void visit( ConstantExpr *constantExpr );
                 virtual void visit( SizeofExpr *sizeofExpr );
                 virtual void visit( AlignofExpr *alignofExpr );
@@ -93 +93 @@
                 /// Gets the top-most trait declaration with the given ID
                 TraitDecl *lookupTrait( const std::string &id ) const;
-  
+
                 void print( std::ostream &os, int indent = 0 ) const;
           private:
@@ -106 +106 @@
                 UnionDecl *lookupUnionAtScope( const std::string &id, unsigned long scope ) const;
                 TraitDecl *lookupTraitAtScope( const std::string &id, unsigned long scope ) const;
-                
+
                 void addId( DeclarationWithType *decl );
                 void addType( NamedTypeDecl *decl );
@@ -115 +115 @@
                 void addUnion( UnionDecl *decl );
                 void addTrait( TraitDecl *decl );
-                
+
                 struct Impl;
                 Impl *tables;         ///< Copy-on-write instance of table data structure

src/SynTree/Visitor.cc

@@ -39 +39 @@
 }
 
-void Visitor::visit( AggregateDecl *aggregateDecl ) {
+void Visitor::handleAggregateDecl( AggregateDecl *aggregateDecl ) {
         acceptAll( aggregateDecl->get_parameters(), *this );
         acceptAll( aggregateDecl->get_members(), *this );
@@ -45 +45 @@
 
 void Visitor::visit( StructDecl *aggregateDecl ) {
-        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( UnionDecl *aggregateDecl ) {
-        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( EnumDecl *aggregateDecl ) {
-        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( TraitDecl *aggregateDecl ) {
-        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
-}
-
-void Visitor::visit( NamedTypeDecl *typeDecl ) {
+        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
+}
+
+void Visitor::handleNamedTypeDecl( NamedTypeDecl *typeDecl ) {
         acceptAll( typeDecl->get_parameters(), *this );
         acceptAll( typeDecl->get_assertions(), *this );
@@ -67 +67 @@
 
 void Visitor::visit( TypeDecl *typeDecl ) {
-        visit( static_cast< NamedTypeDecl* >( typeDecl ) );
+        handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
 }
 
 void Visitor::visit( TypedefDecl *typeDecl ) {
-        visit( static_cast< NamedTypeDecl* >( typeDecl ) );
+        handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
 }
 
@@ -330 +330 @@
 }
 
-void Visitor::visit( ReferenceToType *aggregateUseType ) {
+void Visitor::handleReferenceToType( ReferenceToType *aggregateUseType ) {
         acceptAll( aggregateUseType->get_forall(), *this );
         acceptAll( aggregateUseType->get_parameters(), *this );
@@ -336 +336 @@
 
 void Visitor::visit( StructInstType *aggregateUseType ) {
-        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( UnionInstType *aggregateUseType ) {
-        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( EnumInstType *aggregateUseType ) {
-        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( TraitInstType *aggregateUseType ) {
-        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
         acceptAll( aggregateUseType->get_members(), *this );
 }
 
 void Visitor::visit( TypeInstType *aggregateUseType ) {
-        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 

src/SynTree/Visitor.h

@@ -104 +104 @@
         virtual void visit( Constant *constant );
   private:
-        virtual void visit( AggregateDecl *aggregateDecl );
-        virtual void visit( NamedTypeDecl *typeDecl );
-        virtual void visit( ReferenceToType *aggregateUseType );
+        virtual void handleAggregateDecl( AggregateDecl *aggregateDecl );
+        virtual void handleNamedTypeDecl( NamedTypeDecl *typeDecl );
+        virtual void handleReferenceToType( ReferenceToType *aggregateUseType );
 };