Changeset e491159 for src/GenPoly

Timestamp:

Aug 31, 2016, 11:20:03 AM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1f75e2d

Parents:

bda58ad

Message:

Moved ScopedMap? to Common folder

Location:

src/GenPoly

Files:

• Box.cc (modified) (2 diffs)
• InstantiateGeneric.cc (modified) (10 diffs)
• ScopedMap.h (deleted)

src/GenPoly/Box.cc ¶

@@ -29 +29 @@
 #include "PolyMutator.h"
 #include "FindFunction.h"
-#include "ScopedMap.h"
 #include "ScopedSet.h"
 #include "ScrubTyVars.h"
@@ -51 +50 @@
 #include "SymTab/Mangler.h"
 
+#include "Common/ScopedMap.h"
 #include "Common/SemanticError.h"
 #include "Common/UniqueName.h"

src/GenPoly/InstantiateGeneric.cc ¶

@@ -23 +23 @@
 #include "DeclMutator.h"
 #include "GenPoly.h"
-#include "ScopedMap.h"
 #include "ScopedSet.h"
 
@@ -32 +31 @@
 #include "SynTree/Type.h"
 
+#include "Common/ScopedMap.h"
 #include "Common/UniqueName.h"
 #include "Common/utility.h"
@@ -84 +84 @@
                 std::list< Type* > params;  ///< Instantiation parameters
         };
-        
+
         /// Maps a key and a TypeList to the some value, accounting for scope
         template< typename Key, typename Value >
@@ -145 +145 @@
                 return gt;
         }
-        
+
         /// Mutator pass that replaces concrete instantiations of generic types with actual struct declarations, scoped appropriately
         class GenericInstantiator : public DeclMutator {
@@ -193 +193 @@
                         TypeExpr *paramType = dynamic_cast< TypeExpr* >( *param );
                         assert(paramType && "Aggregate parameters should be type expressions");
-                        
+
                         switch ( (*baseParam)->get_kind() ) {
                         case TypeDecl::Any: {
@@ -242 +242 @@
                 inst->get_parameters().clear();
         }
-        
+
         void GenericInstantiator::stripDtypeParams( AggregateDecl *base, std::list< TypeDecl* >& baseParams, const std::list< TypeExpr* >& typeSubs ) {
                 substituteMembers( base->get_members(), baseParams, typeSubs );
@@ -248 +248 @@
                 deleteAll( baseParams );
                 baseParams.clear();
-                
+
                 dtypeStatics.insert( base );
         }
@@ -266 +266 @@
                         return inst;
                 }
-                
+
                 // check if type can be concretely instantiated; put substitutions into typeSubs
                 assert( inst->get_baseParameters() && "Base struct has parameters" );
@@ -276 +276 @@
                         stripInstParams( inst );
                         break;
-                
+
                 case genericType::concrete: {
                         // make concrete instantiation of generic type
@@ -328 +328 @@
                         stripInstParams( inst );
                         break;
-                        
+
                 case genericType::concrete:
                 {