Changeset 246c245 for src/AST/Pass.impl.hpp

Timestamp:

May 16, 2019, 6:51:18 PM (7 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8ff178d, d66e7b7

Parents:

9b4f329 (diff), 6f8e87d (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/Pass.impl.hpp (modified) (8 diffs)

src/AST/Pass.impl.hpp

@@ -19 +19 @@
 #include <type_traits>
 #include <unordered_map>
+
+#include "AST/TypeSubstitution.hpp"
 
 #define VISIT_START( node ) \
@@ -462 +464 @@
         VISIT({
                 guard_indexer guard { * this };
-                maybe_accept( node, &StructDecl::parameters );
-                maybe_accept( node, &StructDecl::members    );
+                maybe_accept( node, &StructDecl::params  );
+                maybe_accept( node, &StructDecl::members );
         })
 
@@ -483 +485 @@
         VISIT({
                 guard_indexer guard { * this };
-                maybe_accept( node, &UnionDecl::parameters );
-                maybe_accept( node, &UnionDecl::members    );
+                maybe_accept( node, &UnionDecl::params  );
+                maybe_accept( node, &UnionDecl::members );
         })
 
@@ -502 +504 @@
         VISIT(
                 // unlike structs, traits, and unions, enums inject their members into the global scope
-                maybe_accept( node, &EnumDecl::parameters );
-                maybe_accept( node, &EnumDecl::members    );
+                maybe_accept( node, &EnumDecl::params  );
+                maybe_accept( node, &EnumDecl::members );
         )
 
@@ -517 +519 @@
         VISIT({
                 guard_indexer guard { *this };
-                maybe_accept( node, &TraitDecl::parameters );
-                maybe_accept( node, &TraitDecl::members    );
+                maybe_accept( node, &TraitDecl::params  );
+                maybe_accept( node, &TraitDecl::members );
         })
 
@@ -534 +536 @@
         VISIT({
                 guard_indexer guard { *this };
-                maybe_accept( node, &TypeDecl::parameters );
-                maybe_accept( node, &TypeDecl::base       );
+                maybe_accept( node, &TypeDecl::params );
+                maybe_accept( node, &TypeDecl::base   );
         })
 
@@ -563 +565 @@
         VISIT({
                 guard_indexer guard { *this };
-                maybe_accept( node, &TypedefDecl::parameters );
-                maybe_accept( node, &TypedefDecl::base       );
+                maybe_accept( node, &TypedefDecl::params );
+                maybe_accept( node, &TypedefDecl::base   );
         })
 
@@ -688 +690 @@
                 maybe_accept( node, &WhileStmt::body  );
         })
+
+        VISIT_END( Stmt, node );
+}
+
+//--------------------------------------------------------------------------
+// ForStmt
+template< typename pass_t >
+const ast::Stmt * ast::Pass< pass_t >::visit( const ast::ForStmt * node ) {
+        VISIT_START( node );
+
+        VISIT({
+                // for statements introduce a level of scope (for the initialization)
+                guard_indexer guard { *this };
+                maybe_accept( node, &ForStmt::inits );
+                maybe_accept( node, &ForStmt::cond  );
+                maybe_accept( node, &ForStmt::inc   );
+                maybe_accept( node, &ForStmt::body  );
+        })
+
+        VISIT_END( Stmt, node );
+}
+
+//--------------------------------------------------------------------------
+// SwitchStmt
+template< typename pass_t >
+const ast::Stmt * ast::Pass< pass_t >::visit( const ast::SwitchStmt * node ) {
+        VISIT_START( node );
+
+        VISIT(
+                maybe_accept( node, &SwitchStmt::cond  );
+                maybe_accept( node, &SwitchStmt::stmts );
+        )
+
+        VISIT_END( Stmt, node );
+}
+
+//--------------------------------------------------------------------------
+// CaseStmt
+template< typename pass_t >
+const ast::Stmt * ast::Pass< pass_t >::visit( const ast::CaseStmt * node ) {
+        VISIT_START( node );
+
+        VISIT(
+                maybe_accept( node, &CaseStmt::cond  );
+                maybe_accept( node, &CaseStmt::stmts );
+        )
+
+        VISIT_END( Stmt, node );
+}
+
+//--------------------------------------------------------------------------
+// BranchStmt
+template< typename pass_t >
+const ast::Stmt * ast::Pass< pass_t >::visit( const ast::BranchStmt * node ) {
+        VISIT_START( node );
+        VISIT_END( Stmt, node );
+}
+
+//--------------------------------------------------------------------------
+// ReturnStmt
+template< typename pass_t >
+const ast::Stmt * ast::Pass< pass_t >::visit( const ast::ReturnStmt * node ) {
+        VISIT_START( node );
+
+        VISIT(
+                maybe_accept( node, &ReturnStmt::expr );
+        )
+
+        VISIT_END( Stmt, node );
+}
+
+//--------------------------------------------------------------------------
+// ThrowStmt
+template< typename pass_t >
+const ast::Stmt * ast::Pass< pass_t >::visit( const ast::ThrowStmt * node ) {
+        VISIT_START( node );
+
+        VISIT(
+                maybe_accept( node, &ThrowStmt::expr   );
+                maybe_accept( node, &ThrowStmt::target );
+        )
+
+        VISIT_END( Stmt, node );
+}
+
+//--------------------------------------------------------------------------
+// TryStmt
+template< typename pass_t >
+const ast::Stmt * ast::Pass< pass_t >::visit( const ast::TryStmt * node ) {
+        VISIT_START( node );
+
+        VISIT(
+                maybe_accept( node, &TryStmt::body     );
+                maybe_accept( node, &TryStmt::handlers );
+                maybe_accept( node, &TryStmt::finally  );
+        )
 
         VISIT_END( Stmt, node );