Changes in src/Common/PassVisitor.impl.h [73367a8:d8893ca]

File:

• src/Common/PassVisitor.impl.h (modified) (5 diffs)

src/Common/PassVisitor.impl.h

@@ -55 +55 @@
                 it,
                 [](Declaration * decl) -> auto {
-                        return new DeclStmt( decl );
+                        return new DeclStmt( noLabels, decl );
                 }
         );
@@ -62 +62 @@
 
 template< typename pass_type >
-inline void acceptAll( std::list< Declaration* > &decls, PassVisitor< pass_type >& visitor ) {
+static inline void acceptAll( std::list< Declaration* > &decls, PassVisitor< pass_type >& visitor ) {
         DeclList_t* beforeDecls = visitor.get_beforeDecls();
         DeclList_t* afterDecls  = visitor.get_afterDecls();
@@ -90 +90 @@
 
 template< typename pass_type >
-inline void mutateAll( std::list< Declaration* > &decls, PassVisitor< pass_type >& mutator ) {
+static inline void mutateAll( std::list< Declaration* > &decls, PassVisitor< pass_type >& mutator ) {
         DeclList_t* beforeDecls = mutator.get_beforeDecls();
         DeclList_t* afterDecls  = mutator.get_afterDecls();
@@ -251 +251 @@
             || ( empty( beforeDecls ) && empty( afterDecls )) );
 
-        CompoundStmt *compound = new CompoundStmt();
+        CompoundStmt *compound = new CompoundStmt( noLabels );
         if( !empty(beforeDecls) ) { splice( std::back_inserter( compound->get_kids() ), beforeDecls ); }
         if( !empty(beforeStmts) ) { compound->get_kids().splice( compound->get_kids().end(), *beforeStmts ); }
@@ -1853 +1853 @@
 }
 
-//--------------------------------------------------------------------------
-// UntypedInitExpr
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( UntypedInitExpr * node ) {
-        VISIT_START( node );
-
-        indexerScopedAccept( node->result, *this );
-        maybeAccept_impl   ( node->expr  , *this );
-        // not currently visiting initAlts, but this doesn't matter since this node is only used in the resolver.
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-Expression * PassVisitor< pass_type >::mutate( UntypedInitExpr * node ) {
-        MUTATE_START( node );
-
-        indexerScopedMutate( node->env   , *this );
-        indexerScopedMutate( node->result, *this );
-        maybeMutate_impl   ( node->expr  , *this );
-        // not currently visiting initAlts, but this doesn't matter since this node is only used in the resolver.
-
-        MUTATE_END( Expression, node );
-}
-
-//--------------------------------------------------------------------------
-// InitExpr
-template< typename pass_type >
-void PassVisitor< pass_type >::visit( InitExpr * node ) {
-        VISIT_START( node );
-
-        indexerScopedAccept( node->result, *this );
-        maybeAccept_impl   ( node->expr  , *this );
-        maybeAccept_impl   ( node->designation, *this );
-
-        VISIT_END( node );
-}
-
-template< typename pass_type >
-Expression * PassVisitor< pass_type >::mutate( InitExpr * node ) {
-        MUTATE_START( node );
-
-        indexerScopedMutate( node->env   , *this );
-        indexerScopedMutate( node->result, *this );
-        maybeMutate_impl   ( node->expr  , *this );
-        maybeMutate_impl   ( node->designation, *this );
-
-        MUTATE_END( Expression, node );
-}
-
 template< typename pass_type >
 void PassVisitor< pass_type >::visit( VoidType * node ) {