Changes in / [f04a8b81:5fda7143]

Location:

src

Files:

• Common/ScopedMap.h (added)
• Common/utility.h (modified) (2 diffs)
• GenPoly/Box.cc (modified) (2 diffs)
• GenPoly/InstantiateGeneric.cc (modified) (10 diffs)
• GenPoly/ScopedMap.h (deleted)
• SymTab/Validate.cc (modified) (3 diffs)

src/Common/utility.h

@@ -17 +17 @@
 #define _UTILITY_H
 
+#include <cctype>
 #include <iostream>
+#include <iterator>
+#include <list>
+#include <memory>
 #include <sstream>
-#include <iterator>
 #include <string>
-#include <cctype>
-#include <list>
 
 template< typename T >
@@ -246 +247 @@
 }
 
+template< typename ThisType >
+class RefCountSingleton {
+  public:
+        static std::shared_ptr<ThisType> get() {
+                if( global_instance.expired() ) {
+                        std::shared_ptr<ThisType> new_instance = std::make_shared<ThisType>();
+                        global_instance = new_instance;
+                        return std::move(new_instance);
+                }
+                return global_instance.lock();
+        }
+  private:
+        static std::weak_ptr<ThisType> global_instance;
+};
+
+template< typename ThisType >
+std::weak_ptr<ThisType> RefCountSingleton<ThisType>::global_instance;
+
 // RAII object to regulate "save and restore" behaviour, e.g.
 // void Foo::bar() {

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:
                 {

src/SymTab/Validate.cc

@@ -40 +40 @@
 #include <list>
 #include <iterator>
+#include "Common/ScopedMap.h"
 #include "Common/utility.h"
 #include "Common/UniqueName.h"
@@ -49 +50 @@
 #include "SynTree/Statement.h"
 #include "SynTree/TypeSubstitution.h"
-#include "GenPoly/ScopedMap.h"
 #include "Indexer.h"
 #include "FixFunction.h"
@@ -164 +164 @@
 
                 typedef std::unique_ptr<TypedefDecl> TypedefDeclPtr;
-                typedef GenPoly::ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
+                typedef ScopedMap< std::string, std::pair< TypedefDeclPtr, int > > TypedefMap;
                 typedef std::map< std::string, TypeDecl * > TypeDeclMap;
                 TypedefMap typedefNames;