Changes in src/AST/Pass.impl.hpp [b0abc8a0:112fe04]

File:

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

src/AST/Pass.impl.hpp

@@ -841 +841 @@
                 for( const auto & clause : node->clauses ) {
 
-                        const Expr * func = clause.target.func ? clause.target.func->accept(*this) : nullptr;
+                        Expr * func = clause.target.func ? clause.target.func->accept(*this) : nullptr;
                         if(func != clause.target.func) mutated = true;
 
@@ -852 +852 @@
                         }
 
-                        const Stmt * stmt = clause.stmt ? clause.stmt->accept(*this) : nullptr;
+                        Stmt * stmt = clause.stmt ? clause.stmt->accept(*this) : nullptr;
                         if(stmt != clause.stmt) mutated = true;
 
-                        const Expr * cond = clause.cond ? clause.cond->accept(*this) : nullptr;
+                        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 ) {
-                        const Type * type = nullptr;
+                        Type * type = nullptr;
                         if( assoc.type ) {
                                 guard_indexer guard { *this };
@@ -1573 +1573 @@
                                 if( type != assoc.type ) mutated = true;
                         }
-                        const Expr * expr = nullptr;
+                        Expr * expr = nullptr;
                         if( assoc.expr ) {
                                 expr = assoc.expr->accept( *this );
@@ -1685 +1685 @@
         VISIT_START( node );
 
-        __pass::indexer::addStruct( pass, 0, node->name );
+        __pass::indexer::addStruct( node->name, 0, pass );
 
         VISIT({
@@ -1702 +1702 @@
         VISIT_START( node );
 
-        __pass::indexer::addStruct( pass, 0, node->name );
+        __pass::indexer::addStruct( node->name, 0, pass );
 
         {
@@ -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