Changeset b0abc8a0 for src/AST/Pass.impl.hpp

Timestamp:

May 22, 2019, 3:18:34 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

e9b44489

Parents:

09ab71a

Message:

Fixed errors in the pass visitor

File:

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

src/AST/Pass.impl.hpp

@@ -841 +841 @@
                 for( const auto & clause : node->clauses ) {
 
-                        Expr * func = clause.target.func ? clause.target.func->accept(*this) : nullptr;
+                        const Expr * func = clause.target.func ? clause.target.func->accept(*this) : nullptr;
                         if(func != clause.target.func) mutated = true;
 
@@ -852 +852 @@
                         }
 
-                        Stmt * stmt = clause.stmt ? clause.stmt->accept(*this) : nullptr;
+                        const Stmt * stmt = clause.stmt ? clause.stmt->accept(*this) : nullptr;
                         if(stmt != clause.stmt) mutated = true;
 
-                        Expr * cond = clause.cond ? clause.cond->accept(*this) : nullptr;
+                        const Expr * cond = clause.cond ? clause.cond->accept(*this) : nullptr;
                         if(cond != clause.cond) mutated = true;
 
@@ -1567 +1567 @@
                 bool mutated = false;
                 for( const auto & assoc : node->associations ) {
-                        Type * type = nullptr;
+                        const Type * type = nullptr;
                         if( assoc.type ) {
                                 guard_indexer guard { *this };
@@ -1573 +1573 @@
                                 if( type != assoc.type ) mutated = true;
                         }
-                        Expr * expr = nullptr;
+                        const Expr * expr = nullptr;
                         if( assoc.expr ) {
                                 expr = assoc.expr->accept( *this );
@@ -1685 +1685 @@
         VISIT_START( node );
 
-        __pass::indexer::addStruct( node->name, 0, pass );
+        __pass::indexer::addStruct( pass, 0, node->name );
 
         VISIT({
@@ -1702 +1702 @@
         VISIT_START( node );
 
-        __pass::indexer::addStruct( node->name, 0, pass );
+        __pass::indexer::addStruct( pass, 0, node->name );
 
         {
@@ -1885 +1885 @@
 }
 
-// //--------------------------------------------------------------------------
-// // TypeSubstitution
-// template< typename pass_t >
-// const ast::TypeSubstitution * ast::Pass< pass_t >::visit( const ast::TypeSubstitution * node ) {
-//      VISIT_START( node );
-
-//      VISIT(
-//              {
-//                      bool mutated = false;
-//                      std::unordered_map< std::string, ast::ptr< ast::Type > > new_map;
-//                      for ( const auto & p : node->typeEnv ) {
-//                              guard_indexer guard { *this };
-//                              auto new_node = p.second->accept( *this );
-//                              if (new_node != p.second) mutated = false;
-//                              new_map.insert({ p.first, new_node });
-//                      }
-//                      if (mutated) {
-//                              auto new_node = mutate( node );
-//                              new_node->typeEnv.swap( new_map );
-//                              node = new_node;
-//                      }
-//              }
-
-//              {
-//                      bool mutated = false;
-//                      std::unordered_map< std::string, ast::ptr< ast::Expr > > new_map;
-//                      for ( const auto & p : node->varEnv ) {
-//                              guard_indexer guard { *this };
-//                              auto new_node = p.second->accept( *this );
-//                              if (new_node != p.second) mutated = false;
-//                              new_map.insert({ p.first, new_node });
-//                      }
-//                      if (mutated) {
-//                              auto new_node = mutate( node );
-//                              new_node->varEnv.swap( new_map );
-//                              node = new_node;
-//                      }
-//              }
-//      )
-
-//      VISIT_END( TypeSubstitution, node );
-// }
+//--------------------------------------------------------------------------
+// TypeSubstitution
+template< typename pass_t >
+const ast::TypeSubstitution * ast::Pass< pass_t >::visit( const ast::TypeSubstitution * node ) {
+        VISIT_START( node );
+
+        VISIT(
+                {
+                        bool mutated = false;
+                        std::unordered_map< std::string, ast::ptr< ast::Type > > new_map;
+                        for ( const auto & p : node->typeEnv ) {
+                                guard_indexer guard { *this };
+                                auto new_node = p.second->accept( *this );
+                                if (new_node != p.second) mutated = false;
+                                new_map.insert({ p.first, new_node });
+                        }
+                        if (mutated) {
+                                auto new_node = mutate( node );
+                                new_node->typeEnv.swap( new_map );
+                                node = new_node;
+                        }
+                }
+
+                {
+                        bool mutated = false;
+                        std::unordered_map< std::string, ast::ptr< ast::Expr > > new_map;
+                        for ( const auto & p : node->varEnv ) {
+                                guard_indexer guard { *this };
+                                auto new_node = p.second->accept( *this );
+                                if (new_node != p.second) mutated = false;
+                                new_map.insert({ p.first, new_node });
+                        }
+                        if (mutated) {
+                                auto new_node = mutate( node );
+                                new_node->varEnv.swap( new_map );
+                                node = new_node;
+                        }
+                }
+        )
+
+        VISIT_END( TypeSubstitution, node );
+}
 
 #undef VISIT_START