Changes in src/SynTree/Visitor.cc [8688ce1:7f5566b]

File:

• src/SynTree/Visitor.cc (modified) (12 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 : Thu Aug  4 11:24:25 2016
-// Update Count     : 21
+// Last Modified On : Fri Jul 24 16:11:05 2015
+// Update Count     : 15
 //
 
@@ -39 +39 @@
 }
 
-void Visitor::handleAggregateDecl( AggregateDecl *aggregateDecl ) {
+void Visitor::visit( AggregateDecl *aggregateDecl ) {
         acceptAll( aggregateDecl->get_parameters(), *this );
         acceptAll( aggregateDecl->get_members(), *this );
@@ -45 +45 @@
 
 void Visitor::visit( StructDecl *aggregateDecl ) {
-        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
+        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( UnionDecl *aggregateDecl ) {
-        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
+        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
 }
 
 void Visitor::visit( EnumDecl *aggregateDecl ) {
-        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
-}
-
-void Visitor::visit( TraitDecl *aggregateDecl ) {
-        handleAggregateDecl( static_cast< AggregateDecl* >( aggregateDecl ) );
-}
-
-void Visitor::handleNamedTypeDecl( NamedTypeDecl *typeDecl ) {
+        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+}
+
+void Visitor::visit( ContextDecl *aggregateDecl ) {
+        visit( static_cast< AggregateDecl* >( aggregateDecl ) );
+}
+
+void Visitor::visit( NamedTypeDecl *typeDecl ) {
         acceptAll( typeDecl->get_parameters(), *this );
         acceptAll( typeDecl->get_assertions(), *this );
@@ -67 +67 @@
 
 void Visitor::visit( TypeDecl *typeDecl ) {
-        handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
+        visit( static_cast< NamedTypeDecl* >( typeDecl ) );
 }
 
 void Visitor::visit( TypedefDecl *typeDecl ) {
-        handleNamedTypeDecl( static_cast< NamedTypeDecl* >( typeDecl ) );
+        visit( static_cast< NamedTypeDecl* >( typeDecl ) );
 }
 
@@ -109 +109 @@
 void Visitor::visit( SwitchStmt *switchStmt ) {
         maybeAccept( switchStmt->get_condition(), *this );
-        acceptAll( switchStmt->get_statements(), *this );
-}
+        acceptAll( switchStmt->get_branches(), *this );
+}
+
+void Visitor::visit( ChooseStmt *switchStmt ) {
+        maybeAccept( switchStmt->get_condition(), *this );
+        acceptAll( switchStmt->get_branches(), *this );
+}
+
+void Visitor::visit( FallthruStmt *fallthruStmt ) {}
 
 void Visitor::visit( CaseStmt *caseStmt ) {
@@ -143 +150 @@
 void Visitor::visit( DeclStmt *declStmt ) {
         maybeAccept( declStmt->get_decl(), *this );
-}
-
-void Visitor::visit( ImplicitCtorDtorStmt *impCtorDtorStmt ) {
-        maybeAccept( impCtorDtorStmt->get_callStmt(), *this );
 }
 
@@ -207 +210 @@
 }
 
-void Visitor::visit( AlignofExpr *alignofExpr ) {
-        acceptAll( alignofExpr->get_results(), *this );
-        if ( alignofExpr->get_isType() ) {
-                maybeAccept( alignofExpr->get_type(), *this );
-        } else {
-                maybeAccept( alignofExpr->get_expr(), *this );
-        }
-}
-
-void Visitor::visit( UntypedOffsetofExpr *offsetofExpr ) {
-        acceptAll( offsetofExpr->get_results(), *this );
-        maybeAccept( offsetofExpr->get_type(), *this );
-}
-
-void Visitor::visit( OffsetofExpr *offsetofExpr ) {
-        acceptAll( offsetofExpr->get_results(), *this );
-        maybeAccept( offsetofExpr->get_type(), *this );
-        maybeAccept( offsetofExpr->get_member(), *this );
-}
-
-void Visitor::visit( OffsetPackExpr *offsetPackExpr ) {
-        acceptAll( offsetPackExpr->get_results(), *this );
-        maybeAccept( offsetPackExpr->get_type(), *this );
-}
-
 void Visitor::visit( AttrExpr *attrExpr ) {
         acceptAll( attrExpr->get_results(), *this );
@@ -281 +259 @@
 }
 
-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 );
         maybeAccept( valofExpr->get_body(), *this );
-}
-
-void Visitor::visit( CompoundLiteralExpr *compLitExpr ) {
-        acceptAll( compLitExpr->get_results(), *this );
-        maybeAccept( compLitExpr->get_type(), *this );
-        maybeAccept( compLitExpr->get_initializer(), *this );
-}
-
-void Visitor::visit( RangeExpr *rangeExpr ) {
-        maybeAccept( rangeExpr->get_low(), *this );
-        maybeAccept( rangeExpr->get_high(), *this );
 }
 
@@ -328 +289 @@
 }
 
-void Visitor::handleReferenceToType( ReferenceToType *aggregateUseType ) {
+void Visitor::visit( ReferenceToType *aggregateUseType ) {
         acceptAll( aggregateUseType->get_forall(), *this );
         acceptAll( aggregateUseType->get_parameters(), *this );
@@ -334 +295 @@
 
 void Visitor::visit( StructInstType *aggregateUseType ) {
-        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
+        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( UnionInstType *aggregateUseType ) {
-        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
+        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
 void Visitor::visit( EnumInstType *aggregateUseType ) {
-        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
-}
-
-void Visitor::visit( TraitInstType *aggregateUseType ) {
-        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
+        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
+}
+
+void Visitor::visit( ContextInstType *aggregateUseType ) {
+        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
         acceptAll( aggregateUseType->get_members(), *this );
 }
 
 void Visitor::visit( TypeInstType *aggregateUseType ) {
-        handleReferenceToType( static_cast< ReferenceToType * >( aggregateUseType ) );
+        visit( static_cast< ReferenceToType * >( aggregateUseType ) );
 }
 
@@ -374 +335 @@
 }
 
-void Visitor::visit( VarArgsType *varArgsType ) {
-        acceptAll( varArgsType->get_forall(), *this );
-}
-
 void Visitor::visit( SingleInit *singleInit ) {
         singleInit->get_value()->accept( *this );
@@ -385 +342 @@
         acceptAll( listInit->get_designators(), *this );
         acceptAll( listInit->get_initializers(), *this );
-}
-
-void Visitor::visit( ConstructorInit *ctorInit ) {
-        maybeAccept( ctorInit->get_ctor(), *this );
-        maybeAccept( ctorInit->get_init(), *this );
 }