Changeset b0b958a for src/GenPoly

Timestamp:

Nov 30, 2015, 1:46:36 PM (9 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

5bf4712, cf16f94

Parents:

ed1065c

Message:

Switched InstantiateGeneric? pass over to use DeclMutator? base

Location:

src/GenPoly

Files:

• DeclMutator.cc (added)
• DeclMutator.h (added)
• InstantiateGeneric.cc (modified) (8 diffs)
• module.mk (modified) (1 diff)

src/GenPoly/InstantiateGeneric.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// InstantiateGeneric.h --
+// InstantiateGeneric.cc --
 //
 // Author           : Aaron B. Moss
@@ -21 +21 @@
 
 #include "InstantiateGeneric.h"
-#include "PolyMutator.h"
+#include "DeclMutator.h"
 
 #include "ResolvExpr/typeops.h"
@@ -138 +138 @@
 
         /// Mutator pass that replaces concrete instantiations of generic types with actual struct declarations, scoped appropriately
-        class Instantiate : public PolyMutator {
+        class Instantiate : public DeclMutator {
                 InstantiationMap instantiations;
                 UniqueName typeNamer;
 
         public:
-                Instantiate() : instantiations(), typeNamer("_conc_") {}
-
-                /// Mutates the whole translation unit, inserting new struct declarations as appropriate
-                void mutateAll( std::list< Declaration* >& translationUnit );
-                
+                Instantiate() : DeclMutator(), instantiations(), typeNamer("_conc_") {}
+
                 virtual Type* mutate( StructInstType *inst );
                 virtual Type* mutate( UnionInstType *inst );
@@ -153 +150 @@
                 virtual void doBeginScope();
                 virtual void doEndScope();
-
-        private:
-                /// Adds a declaration to the current environment and the statements to add
-                void addDeclaration( AggregateDecl *decl ) {
-                        std::list< Label > nolabels;
-                        DeclStmt *stmt = new DeclStmt( nolabels, decl );
-                        PolyMutator::stmtsToAdd.push_back( stmt );
-                }
         };
         
         void instantiateGeneric( std::list< Declaration* >& translationUnit ) {
                 Instantiate instantiator;
-//              mutateAll( translationUnit, instantiator );
-                instantiator.mutateAll( translationUnit );
-        }
-
-        void Instantiate::mutateAll( std::list< Declaration* >& translationUnit ) {
-                // below copied and modified from Mutator.h:mutateAll()
-                SemanticError errors;
-                for ( std::list< Declaration* >::iterator decl = translationUnit.begin(); decl != translationUnit.end(); ++decl ) {
-                        try {
-                                if ( *decl ) {
-                                        *decl = dynamic_cast< Declaration* >( (*decl)->acceptMutator( *this ) );
-                                        assert( *decl );
-                                        // account for missing top-level declarations
-                                        for ( std::list< Statement* >::const_iterator stmt = PolyMutator::stmtsToAdd.begin(); stmt != PolyMutator::stmtsToAdd.end(); ++stmt ) {
-                                                DeclStmt *declStmt = dynamic_cast< DeclStmt* >( *stmt );
-                                                assert( declStmt );
-                                                translationUnit.insert( decl, declStmt->get_decl() );
-                                        }
-                                        PolyMutator::stmtsToAdd.clear();
-                                } // if
-                        } catch( SemanticError &e ) {
-                                errors.append( e );
-                        } // try
-                } // for
-                if ( ! errors.isEmpty() ) {
-                        throw errors;
-                } // if
+                instantiator.mutateDeclarationList( translationUnit );
         }
 
@@ -225 +188 @@
                                                                 *inst->get_baseParameters(), inst->get_parameters(),
                                                                 concDecl->get_members() );
-                        addDeclaration( concDecl );
+                        DeclMutator::addDeclaration( concDecl );
                         instantiations.insert( inst, concDecl );
                 }
@@ -252 +215 @@
                                                                 *inst->get_baseParameters(), inst->get_parameters(),
                                                                 concDecl->get_members() );
-                        addDeclaration( concDecl );
+                        DeclMutator::addDeclaration( concDecl );
                         instantiations.insert( inst, concDecl );
                 }
@@ -262 +225 @@
         
         void Instantiate::doBeginScope() {
+                DeclMutator::doBeginScope();
                 // push a new concrete type scope
                 instantiations.beginScope();
@@ -267 +231 @@
 
         void Instantiate::doEndScope() {
+                DeclMutator::doEndScope();
                 // pop the last concrete type scope
                 instantiations.endScope();

src/GenPoly/module.mk

@@ -23 +23 @@
        GenPoly/CopyParams.cc \
        GenPoly/FindFunction.cc \
-       GenPoly/InstantiateGeneric.cc
+       GenPoly/InstantiateGeneric.cc \
+       GenPoly/DeclMutator.cc