Changeset f80e0218 for src/SynTree/Visitor.cc

Timestamp:

Jun 30, 2016, 4:32:56 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

ea29e73

Parents:

1b5c81ed (diff), 84d4d6f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:

• src/SynTree/Visitor.cc (modified) (9 diffs)

src/SynTree/Visitor.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Visitor.cc -- 
+// Visitor.cc --
 //
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr  1 18:05:13 2016
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Apr 27 17:07:40 2016
 // Update Count     : 18
 //
@@ -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 ) );
 }
 
@@ -150 +150 @@
 void Visitor::visit( DeclStmt *declStmt ) {
         maybeAccept( declStmt->get_decl(), *this );
+}
+
+void Visitor::visit( ImplicitCtorDtorStmt *impCtorDtorStmt ) {
+        maybeAccept( impCtorDtorStmt->get_callStmt(), *this );
 }
 
@@ -284 +288 @@
 }
 
+void Visitor::visit( ImplicitCopyCtorExpr *impCpCtorExpr ) {
+        maybeAccept( impCpCtorExpr->get_callExpr(), *this );
+        acceptAll( impCpCtorExpr->get_tempDecls(), *this );
+        acceptAll( impCpCtorExpr->get_returnDecls(), *this );
+}
+
 void Visitor::visit( UntypedValofExpr *valofExpr ) {
         acceptAll( valofExpr->get_results(), *this );
@@ -320 +330 @@
 }
 
-void Visitor::visit( ReferenceToType *aggregateUseType ) {
+void Visitor::handleReferenceToType( ReferenceToType *aggregateUseType ) {
         acceptAll( aggregateUseType->get_forall(), *this );
         acceptAll( aggregateUseType->get_parameters(), *this );
@@ -326 +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 ) );
 }
 
@@ -379 +389 @@
 }
 
+void Visitor::visit( ConstructorInit *ctorInit ) {
+        maybeAccept( ctorInit->get_ctor(), *this );
+        maybeAccept( ctorInit->get_init(), *this );
+}
+
 void Visitor::visit( Subrange *subrange ) {}